diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 7476ea34..211fe9b5 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -20,6 +20,7 @@ SET( SAMPLES addmoddel.cpp
              exifprint.cpp
              exifvalue.cpp
              geotag.cpp
+             ini-test.cpp
              iotest.cpp
              iptceasy.cpp
              iptcprint.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ce6b91fc..976abee7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,6 +17,7 @@ SET( LIBEXIV2_PRIVATE_HDR canonmn_int.hpp
                           cr2image_int.hpp
                           crwimage_int.hpp
                           fujimn_int.hpp
+                          ini_int.hpp
                           makernote_int.hpp
                           minoltamn_int.hpp
                           nikonmn_int.hpp
@@ -102,6 +103,7 @@ SET( LIBEXIV2_SRC         asfvideo.cpp
                           gifimage.cpp
                           http.cpp
                           image.cpp
+                          ini.cpp
                           iptc.cpp
                           jp2image.cpp
                           jpgimage.cpp
diff --git a/src/ini.cpp b/src/ini.cpp
index 7e88c59d..02090a41 100755
--- a/src/ini.cpp
+++ b/src/ini.cpp
@@ -5,16 +5,15 @@
 //
 // https://github.com/benhoyt/inih
 
+#include "ini_int.hpp"
+
 #include <algorithm>
 #include <cctype>
 #include <cstdlib>
 
-#include "ini_int.hpp"
-
 using std::string;
 using namespace Exiv2;
 
-
 /* inih -- simple .INI file parser
 
 inih is released under the New BSD license (see LICENSE.txt). Go to the project
diff --git a/src/ini_int.hpp b/src/ini_int.hpp
index 00f05e87..98edb2d6 100755
--- a/src/ini_int.hpp
+++ b/src/ini_int.hpp
@@ -10,6 +10,7 @@
 
 #include <map>
 #include <string>
+#include <stdio.h>
 
 namespace Exiv2 {
 
@@ -31,7 +32,6 @@ https://github.com/benhoyt/inih
 extern "C" {
 #endif
 
-#include <stdio.h>
 
 /* Typedef for prototype of handler function. */
 typedef int (*ini_handler)(void* user, const char* section,
diff --git a/src/makernote.cpp b/src/makernote.cpp
index e6f39c08..86e237ea 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -42,9 +42,11 @@ EXIV2_RCSID("@(#) $Id$")
 #include <string>
 #include <cstring>
 
+#ifndef _MSC_VER
 #include <unistd.h>
 #include <sys/types.h>
 #include <pwd.h>
+#endif
 
 // *****************************************************************************
 namespace {
@@ -85,9 +87,7 @@ namespace Exiv2 {
 	    	Exiv2::INIReader reader(Exiv2::Internal::getExiv2ConfigPath());
 
 			if (reader.ParseError() == 0) {
-				if ( reader.Get(section,value,def) != def ) {
-					result = reader.Get(section,value,def);
-				}
+				result = reader.Get(section,value,def);
 			}
 			return result;
 		}