diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2f99fd8..3caa706b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,12 +71,12 @@ if( MSVC )
 
 	# add_library("../zlib-1.2.5" SHARED IMPORTED)
 
-	include_directories( "../zlib-1.2.5" "../expat-2.0.1/lib" )
-	set(EXPAT_INCLUDE_DIR                "../expat-2.0.1/lib" )
-	set(ZLIB_INCLUDE_DIR  "../zlib-1.2.5"                     )
+	#include_directories( "../zlib-1.2.5" "../expat-2.0.1/lib" )
+	#set(EXPAT_INCLUDE_DIR                "../expat-2.0.1/lib" )
+	#set(ZLIB_INCLUDE_DIR  "../zlib-1.2.5"                     )
 	
-	set(EXPAT_LIBRARY "../expat-2.0.1")
-	set(ZLIB_LIBRARY  "../zlib-1.2.5" )
+	#set(EXPAT_LIBRARY "../expat-2.0.1")
+	#set(ZLIB_LIBRARY  "../zlib-1.2.5" )
 	
 	# target_link_libraries("zlibd.lib")
 	# add_subdirectory("../zlib-1.2.5" "../zlib-1.2.5" )
@@ -113,12 +113,12 @@ if( MSVC )
 	
 endif( MSVC )
 
-IF( MINGW OR UNIX )
+#IF( MINGW OR UNIX )
 	IF( EXIV2_ENABLE_XMP )
 		SET( HAVE_XMP_TOOLKIT ON )
 		SET( XMPLIB "do" )
 	ENDIF( EXIV2_ENABLE_XMP )
-ENDIF( MINGW OR UNIX )
+#ENDIF( MINGW OR UNIX )
 
 #IF( MINGW OR UNIX )
 	INCLUDE( config/ConfigureChecks.cmake )
@@ -131,7 +131,7 @@ SET( INSTALL_TARGET_STANDARD_ARGS
    )
 
 # add sources from XMPSDK directory - this needs to be done here
-IF( MINGW OR UNIX )
+#IF( MINGW OR UNIX )
 	SET( XMPSRC ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/ExpatAdapter.cpp
 				${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/MD5.cpp
 				${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/ParseRDF.cpp
@@ -149,7 +149,7 @@ IF( MINGW OR UNIX )
 				${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPUtils-FileInfo.cpp
 				${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/src/XMPUtils.cpp
 	   )
-ENDIF( MINGW OR UNIX )
+#ENDIF( MINGW OR UNIX )
 
 # the following lines need to be added to circumvent the error in xmpsdk\src\MD5.h
 IF( ${EXV_HAVE_STDINT_H} )
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 74c33961..558f8cf0 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -30,6 +30,8 @@
 
 
 SET( SAMPLES addmoddel.cpp
+             convert-test.cpp
+             easyaccess-test.cpp
              exifcomment.cpp
              exifdata-test.cpp
              exifprint.cpp
@@ -39,6 +41,11 @@ SET( SAMPLES addmoddel.cpp
              iptctest.cpp
              key-test.cpp
              largeiptc-test.cpp
+             mmap-test.cpp
+             prevtest.cpp 
+             stringto-test.cpp
+             tiff-test.cpp
+             werror-test.cpp
              write-test.cpp
              write2-test.cpp
              xmpparse.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4805ba62..676e46de 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,7 +46,7 @@ SET( LIBEXIV2_PRIVATE_HDR canonmn_int.hpp
                           samsungmn_int.hpp
                           sigmamn_int.hpp
                           sonymn_int.hpp
-			  tags_int.hpp
+                          tags_int.hpp
                           tiffcomposite_int.hpp
                           tifffwd_int.hpp
                           tiffimage_int.hpp
@@ -75,7 +75,6 @@ SET( LIBEXIV2_HDR         basicio.hpp
                           mrwimage.hpp
                           orfimage.hpp
                           pgfimage.hpp
-                          pngimage.hpp
                           preview.hpp
                           properties.hpp
                           psdimage.hpp
@@ -161,6 +160,7 @@ IF( EXIV2_ENABLE_PNG )
                           pngchunk.cpp
                           pngimage.cpp
            )
+        set( LIBEXIV2_HDR ${LIBEXIV2_HDR} pngimage.hpp )
     ENDIF( ZLIB_FOUND )
 ENDIF( EXIV2_ENABLE_PNG )
 
@@ -199,11 +199,11 @@ TARGET_LINK_LIBRARIES( exiv2 ${EXPAT_LIBRARIES} )
 
 	IF( EXIV2_ENABLE_PNG )
 		IF( ZLIB_FOUND )
-			IF ( MINGW OR UNIX )
+#			IF ( MINGW OR UNIX )
 				TARGET_LINK_LIBRARIES( exiv2 ${ZLIB_LIBRARIES} )
-			ELSE ( MINGW OR UNIX )
-				TARGET_LINK_LIBRARIES( exiv2 zlibd )
-			ENDIF( MINGW OR UNIX )
+#			ELSE ( MINGW OR UNIX )
+#				TARGET_LINK_LIBRARIES( exiv2 zlibd )
+#			ENDIF( MINGW OR UNIX )
 		ENDIF( ZLIB_FOUND )
 	ENDIF( EXIV2_ENABLE_PNG )