diff --git a/common/byte_stream.h b/common/byte_stream.h
index 0b8c967..07b93cd 100644
--- a/common/byte_stream.h
+++ b/common/byte_stream.h
@@ -1,7 +1,7 @@
 /*
  * Byte stream functions
  *
- * Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *
@@ -253,5 +253,5 @@ typedef union byte_stream_float64
 }
 #endif
 
-#endif
+#endif /* !defined( _BYTE_STREAM_H ) */
 
diff --git a/common/common.h b/common/common.h
index 2741e0f..d005b39 100644
--- a/common/common.h
+++ b/common/common.h
@@ -1,7 +1,7 @@
 /*
  * Common include file
  *
- * Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *
@@ -39,5 +39,5 @@
 
 #include <config_winapi.h>
 
-#endif
+#endif /* !defined( _COMMON_H ) */
 
diff --git a/common/config_borlandc.h b/common/config_borlandc.h
index baa1ca2..3176918 100644
--- a/common/config_borlandc.h
+++ b/common/config_borlandc.h
@@ -1,7 +1,7 @@
 /*
  * Configuration for the Borland/CodeGear C++ Builder compiler
  *
- * Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *
@@ -22,5 +22,5 @@
 #if !defined( _CONFIG_BORLANDC_H )
 #define _CONFIG_BORLANDC_H
 
-#endif
+#endif /* !defined( _CONFIG_BORLANDC_H ) */
 
diff --git a/common/config_msc.h b/common/config_msc.h
index 1ce9ce2..342207a 100644
--- a/common/config_msc.h
+++ b/common/config_msc.h
@@ -1,7 +1,7 @@
 /*
  * Configuration for the Microsoft Visual Studio C++ compiler
  *
- * Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *
@@ -30,5 +30,5 @@
  */
 #pragma warning( disable : 4201 )
 
-#endif
+#endif /* !defined( _CONFIG_MSC_H ) */
 
diff --git a/common/config_winapi.h b/common/config_winapi.h
index 56f5082..aa0d8f9 100644
--- a/common/config_winapi.h
+++ b/common/config_winapi.h
@@ -1,7 +1,7 @@
 /*
  * Configuration file for WINAPI
  *
- * Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *
diff --git a/common/file_stream.h b/common/file_stream.h
index a3d0556..6d012e1 100644
--- a/common/file_stream.h
+++ b/common/file_stream.h
@@ -1,7 +1,7 @@
 /*
  * FILE stream functions
  *
- * Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *
@@ -147,5 +147,5 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* !defined( _FILE_STREAM_H ) */
 
diff --git a/common/memory.h b/common/memory.h
index 6b3c32c..4836eb2 100644
--- a/common/memory.h
+++ b/common/memory.h
@@ -1,7 +1,7 @@
 /*
  * Memory functions
  *
- * Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *
@@ -120,5 +120,5 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* !defined( _MEMORY_H ) */
 
diff --git a/common/types.h.in b/common/types.h.in
index f5f6749..5f2ffb5 100644
--- a/common/types.h.in
+++ b/common/types.h.in
@@ -1,7 +1,7 @@
 /*
  * Type and type-support defintions
  *
- * Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *
@@ -304,5 +304,5 @@
 
 #endif /* SSIZE_MAX */
 
-#endif
+#endif /* !defined( _TYPES_H ) */
 
diff --git a/configure.ac b/configure.ac
index d990176..788123c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
 
 AC_INIT(
  [libexe],
- [20160130],
+ [20160226],
  [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(
diff --git a/exetools/exetools_libcerror.h b/exetools/exetools_libcerror.h
index ef51bf9..32cf419 100644
--- a/exetools/exetools_libcerror.h
+++ b/exetools/exetools_libcerror.h
@@ -44,7 +44,7 @@
 
 #include <libcerror.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCERROR ) */
 
-#endif
+#endif /* !defined( _EXETOOLS_LIBCERROR_H ) */
 
diff --git a/exetools/exetools_libclocale.h b/exetools/exetools_libclocale.h
index f2ff57b..efa58cd 100644
--- a/exetools/exetools_libclocale.h
+++ b/exetools/exetools_libclocale.h
@@ -44,7 +44,7 @@
 
 #include <libclocale.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCLOCALE ) */
 
-#endif
+#endif /* !defined( _EXETOOLS_LIBCLOCALE_H ) */
 
diff --git a/exetools/exetools_libcnotify.h b/exetools/exetools_libcnotify.h
index 3e8fc18..61c1790 100644
--- a/exetools/exetools_libcnotify.h
+++ b/exetools/exetools_libcnotify.h
@@ -44,7 +44,7 @@
 
 #include <libcnotify.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCNOTIFY ) */
 
-#endif
+#endif /* !defined( _EXETOOLS_LIBCNOTIFY_H ) */
 
diff --git a/exetools/exetools_libcstring.h b/exetools/exetools_libcstring.h
index cd28cc8..5b89a81 100644
--- a/exetools/exetools_libcstring.h
+++ b/exetools/exetools_libcstring.h
@@ -45,7 +45,7 @@
 
 #include <libcstring.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCSTRING ) */
 
-#endif
+#endif /* !defined( _EXETOOLS_LIBCSTRING_H ) */
 
diff --git a/exetools/exetools_libcsystem.h b/exetools/exetools_libcsystem.h
index aacd5da..d1175b7 100644
--- a/exetools/exetools_libcsystem.h
+++ b/exetools/exetools_libcsystem.h
@@ -48,7 +48,7 @@
 
 #include <libcsystem.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCSYSTEM ) */
 
-#endif
+#endif /* !defined( _EXETOOLS_LIBCSYSTEM_H ) */
 
diff --git a/libexe/libexe_codepage.h b/libexe/libexe_codepage.h
index 96134f7..d62c44e 100644
--- a/libexe/libexe_codepage.h
+++ b/libexe/libexe_codepage.h
@@ -80,11 +80,11 @@ enum LIBEXE_CODEPAGES
 	LIBEXE_CODEPAGE_WINDOWS_1258			= 1258
 };
 
-#endif
+#endif /* !defined( HAVE_LOCAL_LIBEXE ) */
 
 #if defined( __cplusplus )
 }
 #endif
 
-#endif
+#endif /* !defined( _LIBEXE_INTERNAL_CODEPAGE_H ) */
 
diff --git a/libexe/libexe_error.c b/libexe/libexe_error.c
index ff7365f..557ce16 100644
--- a/libexe/libexe_error.c
+++ b/libexe/libexe_error.c
@@ -20,10 +20,9 @@
  */
 
 #include <common.h>
+#include <file_stream.h>
 #include <types.h>
 
-#include <stdio.h>
-
 #include "libexe_error.h"
 #include "libexe_libcerror.h"
 
@@ -92,5 +91,5 @@ int libexe_error_backtrace_sprint(
 	         size ) );
 }
 
-#endif
+#endif /* !defined( HAVE_LOCAL_LIBEXE ) */
 
diff --git a/libexe/libexe_error.h b/libexe/libexe_error.h
index 0aec739..3e91280 100644
--- a/libexe/libexe_error.h
+++ b/libexe/libexe_error.h
@@ -23,10 +23,9 @@
 #define _LIBEXE_INTERNAL_ERROR_H
 
 #include <common.h>
+#include <file_stream.h>
 #include <types.h>
 
-#include <stdio.h>
-
 #if !defined( HAVE_LOCAL_LIBEXE )
 #include <libexe/error.h>
 #endif
@@ -65,11 +64,11 @@ int libexe_error_backtrace_sprint(
      char *string,
      size_t size );
 
-#endif
+#endif /* !defined( HAVE_LOCAL_LIBEXE ) */
 
 #if defined( __cplusplus )
 }
 #endif
 
-#endif
+#endif /* !defined( _LIBEXE_INTERNAL_ERROR_H ) */
 
diff --git a/libexe/libexe_libcerror.h b/libexe/libexe_libcerror.h
index 5bb002f..109c947 100644
--- a/libexe/libexe_libcerror.h
+++ b/libexe/libexe_libcerror.h
@@ -44,7 +44,7 @@
 
 #include <libcerror.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCERROR ) */
 
-#endif
+#endif /* !defined( _LIBEXE_LIBCERROR_H ) */
 
diff --git a/libexe/libexe_libcnotify.h b/libexe/libexe_libcnotify.h
index 86f7927..2597b9d 100644
--- a/libexe/libexe_libcnotify.h
+++ b/libexe/libexe_libcnotify.h
@@ -44,7 +44,7 @@
 
 #include <libcnotify.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCNOTIFY ) */
 
-#endif
+#endif /* !defined( _LIBEXE_LIBCNOTIFY_H ) */
 
diff --git a/libexe/libexe_libcstring.h b/libexe/libexe_libcstring.h
index df2cdcc..b1e0eb4 100644
--- a/libexe/libexe_libcstring.h
+++ b/libexe/libexe_libcstring.h
@@ -45,7 +45,7 @@
 
 #include <libcstring.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCSTRING ) */
 
-#endif
+#endif /* !defined( _LIBEXE_LIBCSTRING_H ) */
 
diff --git a/libexe/libexe_notify.c b/libexe/libexe_notify.c
index 9583dc5..a7d0f77 100644
--- a/libexe/libexe_notify.c
+++ b/libexe/libexe_notify.c
@@ -20,14 +20,13 @@
  */
 
 #include <common.h>
+#include <file_stream.h>
 #include <types.h>
 
 #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
 #include <stdlib.h>
 #endif
 
-#include <stdio.h>
-
 #include "libexe_libcerror.h"
 #include "libexe_libcnotify.h"
 #include "libexe_notify.h"
@@ -117,5 +116,5 @@ int libexe_notify_stream_close(
 	return( 0 );
 }
 
-#endif
+#endif /* !defined( HAVE_LOCAL_LIBEXE ) */
 
diff --git a/libexe/libexe_notify.h b/libexe/libexe_notify.h
index 2fe2767..4e365e0 100644
--- a/libexe/libexe_notify.h
+++ b/libexe/libexe_notify.h
@@ -23,10 +23,9 @@
 #define _LIBEXE_NOTIFY_H
 
 #include <common.h>
+#include <file_stream.h>
 #include <types.h>
 
-#include <stdio.h>
-
 #include "libexe_extern.h"
 #include "libexe_libcerror.h"
 
@@ -54,11 +53,11 @@ LIBEXE_EXTERN \
 int libexe_notify_stream_close(
      libcerror_error_t **error );
 
-#endif
+#endif /* !defined( HAVE_LOCAL_LIBEXE ) */
 
 #if defined( __cplusplus )
 }
 #endif
 
-#endif
+#endif /* !defined( _LIBEXE_NOTIFY_H ) */
 
diff --git a/libexe/libexe_types.h b/libexe/libexe_types.h
index 917eedb..1867e1d 100644
--- a/libexe/libexe_types.h
+++ b/libexe/libexe_types.h
@@ -41,9 +41,9 @@ typedef struct libexe_section {}	libexe_section_t;
 typedef intptr_t libexe_file_t;
 typedef intptr_t libexe_section_t;
 
-#endif
+#endif /* defined( HAVE_DEBUG_OUTPUT ) && !defined( WINAPI ) */
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBEXE ) */
 
-#endif
+#endif /* !defined( _LIBEXE_INTERNAL_TYPES_H ) */
 
diff --git a/libexe/libexe_unused.h b/libexe/libexe_unused.h
index 5813371..5fde0a5 100644
--- a/libexe/libexe_unused.h
+++ b/libexe/libexe_unused.h
@@ -40,5 +40,5 @@
 	/* parameter */
 #endif
 
-#endif
+#endif /* !defined( _LIBEXE_INTERNAL_UNUSED_H ) */
 
diff --git a/manuals/libexe.3 b/manuals/libexe.3
index 5851751..1cbd048 100644
--- a/manuals/libexe.3
+++ b/manuals/libexe.3
@@ -1,4 +1,4 @@
-.Dd January  5, 2015
+.Dd January 30, 2016
 .Dt libexe 3
 .Os libexe
 .Sh NAME
@@ -125,6 +125,7 @@ For the actual return values see "libexe.h".
 None
 .Sh FILES
 None
+.Sh NOTES
 libexe allows to be compiled with wide character support (wchar_t).
 
 To compile libexe with wide character support use:
diff --git a/msvscpp/Makefile.am b/msvscpp/Makefile.am
index 46a0cd4..5dfbb4a 100644
--- a/msvscpp/Makefile.am
+++ b/msvscpp/Makefile.am
@@ -1,4 +1,8 @@
 MSVSCPP_FILES = \
+	exe_test_open_close/exe_test_open_close.vcproj \
+	exe_test_read/exe_test_read.vcproj \
+	exe_test_seek/exe_test_seek.vcproj \
+	exe_test_set_ascii_codepage/exe_test_set_ascii_codepage.vcproj \
 	exeinfo/exeinfo.vcproj \
 	libbfio/libbfio.vcproj \
 	libcdata/libcdata.vcproj \
diff --git a/msvscpp/exe_test_open_close/exe_test_open_close.vcproj b/msvscpp/exe_test_open_close/exe_test_open_close.vcproj
new file mode 100644
index 0000000..4a00702
--- /dev/null
+++ b/msvscpp/exe_test_open_close/exe_test_open_close.vcproj
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="exe_test_open_close"
+	ProjectGUID="{FC5531BE-65B1-4D80-8739-A72C256F5C40}"
+	RootNamespace="exe_test_open_close"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath;..\..\libbfio;..\..\libcsystem"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO;HAVE_LOCAL_LIBCSYSTEM;LIBEXE_DLL_IMPORT"
+				RuntimeLibrary="2"
+				WarningLevel="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="VSDebug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath;..\..\libbfio;..\..\libcsystem"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO;HAVE_LOCAL_LIBCSYSTEM;LIBEXE_DLL_IMPORT"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="4"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\tests\exe_test_open_close.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\tests\exe_test_libcerror.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcstring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcsystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcthreads.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libexe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_unused.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvscpp/exe_test_read/exe_test_read.vcproj b/msvscpp/exe_test_read/exe_test_read.vcproj
new file mode 100644
index 0000000..03990a8
--- /dev/null
+++ b/msvscpp/exe_test_read/exe_test_read.vcproj
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="exe_test_read"
+	ProjectGUID="{0A31ECD7-C4F6-4A5B-A74A-2562A4FA7CD2}"
+	RootNamespace="exe_test_read"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath;..\..\libbfio;..\..\libcsystem"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO;HAVE_LOCAL_LIBCSYSTEM;LIBEXE_DLL_IMPORT"
+				RuntimeLibrary="2"
+				WarningLevel="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="VSDebug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath;..\..\libbfio;..\..\libcsystem"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO;HAVE_LOCAL_LIBCSYSTEM;LIBEXE_DLL_IMPORT"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="4"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\tests\exe_test_read.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\tests\exe_test_libcerror.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcstring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcsystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcthreads.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libexe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_unused.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvscpp/exe_test_seek/exe_test_seek.vcproj b/msvscpp/exe_test_seek/exe_test_seek.vcproj
new file mode 100644
index 0000000..1ca1736
--- /dev/null
+++ b/msvscpp/exe_test_seek/exe_test_seek.vcproj
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="exe_test_seek"
+	ProjectGUID="{0BE8E243-BCB5-4DCE-9A7B-1BF846048C4F}"
+	RootNamespace="exe_test_seek"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath;..\..\libbfio;..\..\libcsystem"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO;HAVE_LOCAL_LIBCSYSTEM;LIBEXE_DLL_IMPORT"
+				RuntimeLibrary="2"
+				WarningLevel="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="VSDebug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath;..\..\libbfio;..\..\libcsystem"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO;HAVE_LOCAL_LIBCSYSTEM;LIBEXE_DLL_IMPORT"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="4"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\tests\exe_test_seek.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\tests\exe_test_libcerror.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcstring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcsystem.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcthreads.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libexe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_unused.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvscpp/exe_test_set_ascii_codepage/exe_test_set_ascii_codepage.vcproj b/msvscpp/exe_test_set_ascii_codepage/exe_test_set_ascii_codepage.vcproj
new file mode 100644
index 0000000..0aff8b0
--- /dev/null
+++ b/msvscpp/exe_test_set_ascii_codepage/exe_test_set_ascii_codepage.vcproj
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="exe_test_set_ascii_codepage"
+	ProjectGUID="{6D172554-B346-4478-908D-915B68768568}"
+	RootNamespace="exe_test_set_ascii_codepage"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath;..\..\libbfio;..\..\libcsystem"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO;HAVE_LOCAL_LIBCSYSTEM;LIBEXE_DLL_IMPORT"
+				RuntimeLibrary="2"
+				WarningLevel="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="VSDebug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\common;..\..\libcstring;..\..\libcerror;..\..\libcthreads;..\..\libcdata;..\..\libclocale;..\..\libcnotify;..\..\libcsplit;..\..\libuna;..\..\libcfile;..\..\libcpath;..\..\libbfio;..\..\libcsystem"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;HAVE_LOCAL_LIBCSTRING;HAVE_LOCAL_LIBCERROR;HAVE_LOCAL_LIBCTHREADS;HAVE_LOCAL_LIBCDATA;HAVE_LOCAL_LIBCLOCALE;HAVE_LOCAL_LIBCNOTIFY;HAVE_LOCAL_LIBCSPLIT;HAVE_LOCAL_LIBUNA;HAVE_LOCAL_LIBCFILE;HAVE_LOCAL_LIBCPATH;HAVE_LOCAL_LIBBFIO;HAVE_LOCAL_LIBCSYSTEM;LIBEXE_DLL_IMPORT"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="4"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\tests\exe_test_set_ascii_codepage.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\tests\exe_test_libcerror.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libclocale.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libcstring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tests\exe_test_libexe.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/msvscpp/libexe.sln b/msvscpp/libexe.sln
index f7f63cc..c9dbf01 100644
--- a/msvscpp/libexe.sln
+++ b/msvscpp/libexe.sln
@@ -27,6 +27,41 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libexe", "libexe\libexe.vcp
 		{25C60507-39C6-4564-912D-DA2E7482A00F} = {25C60507-39C6-4564-912D-DA2E7482A00F}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exe_test_open_close", "exe_test_open_close\exe_test_open_close.vcproj", "{FC5531BE-65B1-4D80-8739-A72C256F5C40}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A2B861D5-6751-43A9-B085-8D48F8754AC5} = {A2B861D5-6751-43A9-B085-8D48F8754AC5}
+		{4AAE05A4-4409-479A-8EBE-E6143142F5F2} = {4AAE05A4-4409-479A-8EBE-E6143142F5F2}
+		{8AFAA2C6-E025-4B45-B96F-A27D04C6115A} = {8AFAA2C6-E025-4B45-B96F-A27D04C6115A}
+		{BD3A95FA-A3DE-4B79-A889-A7E5ECA4B69C} = {BD3A95FA-A3DE-4B79-A889-A7E5ECA4B69C}
+		{20FFC4C9-F44C-45F6-A827-4819B4DF3C9F} = {20FFC4C9-F44C-45F6-A827-4819B4DF3C9F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exe_test_read", "exe_test_read\exe_test_read.vcproj", "{0A31ECD7-C4F6-4A5B-A74A-2562A4FA7CD2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A2B861D5-6751-43A9-B085-8D48F8754AC5} = {A2B861D5-6751-43A9-B085-8D48F8754AC5}
+		{4AAE05A4-4409-479A-8EBE-E6143142F5F2} = {4AAE05A4-4409-479A-8EBE-E6143142F5F2}
+		{8AFAA2C6-E025-4B45-B96F-A27D04C6115A} = {8AFAA2C6-E025-4B45-B96F-A27D04C6115A}
+		{BD3A95FA-A3DE-4B79-A889-A7E5ECA4B69C} = {BD3A95FA-A3DE-4B79-A889-A7E5ECA4B69C}
+		{20FFC4C9-F44C-45F6-A827-4819B4DF3C9F} = {20FFC4C9-F44C-45F6-A827-4819B4DF3C9F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exe_test_seek", "exe_test_seek\exe_test_seek.vcproj", "{0BE8E243-BCB5-4DCE-9A7B-1BF846048C4F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A2B861D5-6751-43A9-B085-8D48F8754AC5} = {A2B861D5-6751-43A9-B085-8D48F8754AC5}
+		{4AAE05A4-4409-479A-8EBE-E6143142F5F2} = {4AAE05A4-4409-479A-8EBE-E6143142F5F2}
+		{8AFAA2C6-E025-4B45-B96F-A27D04C6115A} = {8AFAA2C6-E025-4B45-B96F-A27D04C6115A}
+		{BD3A95FA-A3DE-4B79-A889-A7E5ECA4B69C} = {BD3A95FA-A3DE-4B79-A889-A7E5ECA4B69C}
+		{20FFC4C9-F44C-45F6-A827-4819B4DF3C9F} = {20FFC4C9-F44C-45F6-A827-4819B4DF3C9F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exe_test_set_ascii_codepage", "exe_test_set_ascii_codepage\exe_test_set_ascii_codepage.vcproj", "{6D172554-B346-4478-908D-915B68768568}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4AAE05A4-4409-479A-8EBE-E6143142F5F2} = {4AAE05A4-4409-479A-8EBE-E6143142F5F2}
+		{CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89} = {CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89}
+		{BD3A95FA-A3DE-4B79-A889-A7E5ECA4B69C} = {BD3A95FA-A3DE-4B79-A889-A7E5ECA4B69C}
+		{20FFC4C9-F44C-45F6-A827-4819B4DF3C9F} = {20FFC4C9-F44C-45F6-A827-4819B4DF3C9F}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclocale", "libclocale\libclocale.vcproj", "{CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89}"
 	ProjectSection(ProjectDependencies) = postProject
 		{20FFC4C9-F44C-45F6-A827-4819B4DF3C9F} = {20FFC4C9-F44C-45F6-A827-4819B4DF3C9F}
@@ -164,6 +199,22 @@ Global
 		{4AAE05A4-4409-479A-8EBE-E6143142F5F2}.Release|Win32.Build.0 = Release|Win32
 		{4AAE05A4-4409-479A-8EBE-E6143142F5F2}.VSDebug|Win32.ActiveCfg = VSDebug|Win32
 		{4AAE05A4-4409-479A-8EBE-E6143142F5F2}.VSDebug|Win32.Build.0 = VSDebug|Win32
+		{FC5531BE-65B1-4D80-8739-A72C256F5C40}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5531BE-65B1-4D80-8739-A72C256F5C40}.Release|Win32.Build.0 = Release|Win32
+		{FC5531BE-65B1-4D80-8739-A72C256F5C40}.VSDebug|Win32.ActiveCfg = VSDebug|Win32
+		{FC5531BE-65B1-4D80-8739-A72C256F5C40}.VSDebug|Win32.Build.0 = VSDebug|Win32
+		{0A31ECD7-C4F6-4A5B-A74A-2562A4FA7CD2}.Release|Win32.ActiveCfg = Release|Win32
+		{0A31ECD7-C4F6-4A5B-A74A-2562A4FA7CD2}.Release|Win32.Build.0 = Release|Win32
+		{0A31ECD7-C4F6-4A5B-A74A-2562A4FA7CD2}.VSDebug|Win32.ActiveCfg = VSDebug|Win32
+		{0A31ECD7-C4F6-4A5B-A74A-2562A4FA7CD2}.VSDebug|Win32.Build.0 = VSDebug|Win32
+		{0BE8E243-BCB5-4DCE-9A7B-1BF846048C4F}.Release|Win32.ActiveCfg = Release|Win32
+		{0BE8E243-BCB5-4DCE-9A7B-1BF846048C4F}.Release|Win32.Build.0 = Release|Win32
+		{0BE8E243-BCB5-4DCE-9A7B-1BF846048C4F}.VSDebug|Win32.ActiveCfg = VSDebug|Win32
+		{0BE8E243-BCB5-4DCE-9A7B-1BF846048C4F}.VSDebug|Win32.Build.0 = VSDebug|Win32
+		{6D172554-B346-4478-908D-915B68768568}.Release|Win32.ActiveCfg = Release|Win32
+		{6D172554-B346-4478-908D-915B68768568}.Release|Win32.Build.0 = Release|Win32
+		{6D172554-B346-4478-908D-915B68768568}.VSDebug|Win32.ActiveCfg = VSDebug|Win32
+		{6D172554-B346-4478-908D-915B68768568}.VSDebug|Win32.Build.0 = VSDebug|Win32
 		{CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89}.Release|Win32.ActiveCfg = Release|Win32
 		{CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89}.Release|Win32.Build.0 = Release|Win32
 		{CEDF8919-00B2-4D8A-88CC-84ADB2D2FF89}.VSDebug|Win32.ActiveCfg = VSDebug|Win32
diff --git a/pyexe/pyexe_codepage.h b/pyexe/pyexe_codepage.h
index 8bd8e1e..a00ac75 100644
--- a/pyexe/pyexe_codepage.h
+++ b/pyexe/pyexe_codepage.h
@@ -38,5 +38,5 @@ const char *pyexe_codepage_to_string(
 }
 #endif
 
-#endif
+#endif /* !defined( _PYEXE_CODEPAGE_H */
 
diff --git a/pyexe/pyexe_error.h b/pyexe/pyexe_error.h
index 5fe518d..babc91d 100644
--- a/pyexe/pyexe_error.h
+++ b/pyexe/pyexe_error.h
@@ -28,7 +28,7 @@
 #include "pyexe_libcerror.h"
 #include "pyexe_python.h"
 
-#define PYEXE_ERROR_STRING_SIZE		2048
+#define PYEXE_ERROR_STRING_SIZE	2048
 
 #if defined( __cplusplus )
 extern "C" {
@@ -56,5 +56,5 @@ void pyexe_error_raise(
 }
 #endif
 
-#endif
+#endif /* !defined( _PYEXE_ERROR_H ) */
 
diff --git a/pyexe/pyexe_file_object_io_handle.h b/pyexe/pyexe_file_object_io_handle.h
index 7598096..3f4c197 100644
--- a/pyexe/pyexe_file_object_io_handle.h
+++ b/pyexe/pyexe_file_object_io_handle.h
@@ -138,5 +138,5 @@ int pyexe_file_object_io_handle_get_size(
 }
 #endif
 
-#endif
+#endif /* !defined( _PYEXE_FILE_OBJECT_IO_HANDLE_H ) */
 
diff --git a/pyexe/pyexe_integer.h b/pyexe/pyexe_integer.h
index 0b1cf4b..ae0a129 100644
--- a/pyexe/pyexe_integer.h
+++ b/pyexe/pyexe_integer.h
@@ -52,5 +52,5 @@ int pyexe_integer_unsigned_copy_to_64bit(
 }
 #endif
 
-#endif
+#endif /* !defined( _PYEXE_INTEGER_H ) */
 
diff --git a/pyexe/pyexe_libcerror.h b/pyexe/pyexe_libcerror.h
index 01d8330..7d4618e 100644
--- a/pyexe/pyexe_libcerror.h
+++ b/pyexe/pyexe_libcerror.h
@@ -44,7 +44,7 @@
 
 #include <libcerror.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCERROR ) */
 
-#endif
+#endif /* !defined( _PYEXE_LIBCERROR_H ) */
 
diff --git a/pyexe/pyexe_libclocale.h b/pyexe/pyexe_libclocale.h
index 9208f36..0981753 100644
--- a/pyexe/pyexe_libclocale.h
+++ b/pyexe/pyexe_libclocale.h
@@ -44,7 +44,7 @@
 
 #include <libclocale.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCLOCALE ) */
 
-#endif
+#endif /* !defined( _PYEXE_LIBCLOCALE_H ) */
 
diff --git a/pyexe/pyexe_libcstring.h b/pyexe/pyexe_libcstring.h
index 7bf1f70..cc21840 100644
--- a/pyexe/pyexe_libcstring.h
+++ b/pyexe/pyexe_libcstring.h
@@ -45,7 +45,7 @@
 
 #include <libcstring.h>
 
-#endif
+#endif /* defined( HAVE_LOCAL_LIBCSTRING ) */
 
-#endif
+#endif /* !defined( _PYEXE_LIBCSTRING_H ) */
 
diff --git a/pyexe/pyexe_python.h b/pyexe/pyexe_python.h
index 984d5a9..fcc6eb5 100644
--- a/pyexe/pyexe_python.h
+++ b/pyexe/pyexe_python.h
@@ -72,5 +72,5 @@
 
 #endif /* !defined( Py_TYPE ) */
 
-#endif
+#endif /* !defined( _PYEXE_PYTHON_H ) */
 
diff --git a/pyexe/pyexe_unused.h b/pyexe/pyexe_unused.h
index d1df11d..f3f45cc 100644
--- a/pyexe/pyexe_unused.h
+++ b/pyexe/pyexe_unused.h
@@ -40,5 +40,5 @@
 	/* parameter */
 #endif
 
-#endif
+#endif /* !defined( _PYEXE_INTERNAL_UNUSED_H ) */
 
diff --git a/synclibs.ps1 b/synclibs.ps1
index 8beab76..68f0cfc 100644
--- a/synclibs.ps1
+++ b/synclibs.ps1
@@ -1,6 +1,6 @@
 # Script that synchronizes the local library dependencies
 #
-# Version: 20150105
+# Version: 20160212
 
 $GitUrlPrefix = "https://github.com/libyal"
 $LocalLibs = @("libbfio","libcdata","libcerror","libcfile","libclocale","libcnotify","libcpath","libcsplit","libcstring","libcsystem","libcthreads","libfcache","libfdata","libfdatetime","libuna")
diff --git a/synclibs.sh b/synclibs.sh
index 9508463..758e045 100755
--- a/synclibs.sh
+++ b/synclibs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Script that synchronizes the local library dependencies
 #
-# Version: 20150507
+# Version: 20160212
 
 GIT_URL_PREFIX="https://github.com/libyal";
 LOCAL_LIBS="libbfio libcdata libcerror libcfile libclocale libcnotify libcpath libcsplit libcstring libcsystem libcthreads libfcache libfdata libfdatetime libuna";