diff --git a/dists/msvc9/residual.vcproj b/dists/msvc9/residual.vcproj
index 5e247778e93..6e1be64dc00 100644
--- a/dists/msvc9/residual.vcproj
+++ b/dists/msvc9/residual.vcproj
@@ -70,6 +70,7 @@
 				IgnoreDefaultLibraryNames="libcmt"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				EntryPointSymbol="WinMainCRTStartup"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -157,6 +158,7 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="WinMainCRTStartup"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -190,6 +192,14 @@
 		<Filter
 			Name="common"
 			>
+			<File
+				RelativePath="..\..\common\algorithm.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\array.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\common\debug.cpp"
 				>
@@ -198,10 +208,30 @@
 				RelativePath="..\..\common\debug.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\common\endian.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\common\frac.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\common\func.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\hash-str.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\hashmap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\hashmap.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\common\list.h"
 				>
@@ -222,6 +252,18 @@
 				RelativePath="..\..\common\matrix4.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\common\memorypool.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\memorypool.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\module.mk"
+				>
+			</File>
 			<File
 				RelativePath="..\..\common\mutex.cpp"
 				>
@@ -235,7 +277,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\platform.h"
+				RelativePath="..\..\common\str.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\str.h"
 				>
 			</File>
 			<File
@@ -246,10 +292,22 @@
 				RelativePath="..\..\common\timer.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\common\util.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\common\vector3d.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\common\zlib.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\zlib.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="dists"
diff --git a/engine/lua.cpp b/engine/lua.cpp
index 5a3792c7e67..0584fe93c58 100644
--- a/engine/lua.cpp
+++ b/engine/lua.cpp
@@ -20,6 +20,11 @@
  *
  */
 
+#ifdef _WIN32
+#include <windows.h>
+#undef ARRAYSIZE
+#endif
+
 #include "common/sys.h"
 #include "common/endian.h"
 #include "common/util.h"
@@ -54,8 +59,6 @@ extern Imuse *g_imuse;
 
 #ifdef _WIN32
 
-#include <windows.h>
-
 extern WIN32_FIND_DATAA g_find_file_data;
 extern HANDLE g_searchFile;
 extern bool g_firstFind;