diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9946708f..d938e462 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,10 +99,6 @@ IF (MSGPACK_ENABLE_CXX)
 	)
 ENDIF ()
 
-IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-	SET_SOURCE_FILES_PROPERTIES(${msgpack_SOURCES} PROPERTIES LANGUAGE CXX)
-ENDIF ()
-
 EXECUTE_PROCESS (
 	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/src/msgpack
 )
diff --git a/msgpack_vc8.vcproj b/msgpack_vc8.vcproj
index 72d47b6b..8f3f4a67 100644
--- a/msgpack_vc8.vcproj
+++ b/msgpack_vc8.vcproj
@@ -159,102 +159,22 @@
 			<File
 				RelativePath=".\src\objectc.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\unpack.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\version.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\vrefbuffer.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\zone.c"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="2"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\object.cpp"
diff --git a/src/msgpack.h b/src/msgpack.h
index 40cc3e9f..082edb84 100644
--- a/src/msgpack.h
+++ b/src/msgpack.h
@@ -20,18 +20,6 @@
  * @{
  * @}
  */
-#if !defined(__cplusplus) && defined(_MSC_VER)
-#if !defined(FALSE)
-#define FALSE (0)
-#endif
-#if !defined(TRUE)
-#define TRUE (!FALSE)
-#endif
-#define bool int
-#define true TRUE
-#define false FALSE
-#define inline __inline
-#endif
 
 #include "msgpack/object.h"
 #include "msgpack/zone.h"
diff --git a/src/msgpack/sysdep.h b/src/msgpack/sysdep.h
index 4fedbd8b..8f082160 100644
--- a/src/msgpack/sysdep.h
+++ b/src/msgpack/sysdep.h
@@ -191,5 +191,18 @@ typedef unsigned int _msgpack_atomic_counter_t;
 */
 
 
+#if !defined(__cplusplus) && defined(_MSC_VER)
+#if !defined(FALSE)
+#define FALSE (0)
+#endif
+#if !defined(TRUE)
+#define TRUE (!FALSE)
+#endif
+#define bool int
+#define true TRUE
+#define false FALSE
+#define inline __inline
+#endif
+
 #endif /* msgpack/sysdep.h */
 
diff --git a/src/unpack.c b/src/unpack.c
index 3186c855..8f154cac 100644
--- a/src/unpack.c
+++ b/src/unpack.c
@@ -56,7 +56,7 @@ static int template_execute(template_context* ctx,
 
 
 static inline msgpack_object template_callback_root(unpack_user* u)
-{ msgpack_object o = {}; return o; }
+{ msgpack_object o = { MSGPACK_OBJECT_NIL }; return o; }
 
 static inline int template_callback_uint8(unpack_user* u, uint8_t d, msgpack_object* o)
 { o->type = MSGPACK_OBJECT_POSITIVE_INTEGER; o->via.u64 = d; return 0; }