diff --git a/build/vs2010/Lol.Core.Rules.props b/build/vs2010/Lol.Core.Rules.props
index a4366960..fc920ebe 100644
--- a/build/vs2010/Lol.Core.Rules.props
+++ b/build/vs2010/Lol.Core.Rules.props
@@ -22,7 +22,8 @@
     <ClCompile Condition="'$(Configuration)'=='Debug'">
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <Optimization>Disabled</Optimization>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(Platform)'=='Xbox 360'">MultiThreadedDebug</RuntimeLibrary>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Condition="'$(Configuration)'=='Release'">
@@ -32,7 +33,8 @@
       <!-- For PlayStation tools -->
       <OptimizationLevel>Level2</OptimizationLevel>
 
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(Platform)'=='Xbox 360'">MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -56,6 +58,9 @@
       <AdditionalDependencies Condition="'$(Platform)'=='PS3'">$(Ps3Deps);%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalDependencies Condition="'$(Platform)'=='PS3'">$(GlDeps);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <Link Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64'">
+      <SubSystem>Windows</SubSystem>
+    </Link>
     <Link Condition="'$(Configuration)'=='Debug'">
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
diff --git a/test/BtPhysTest.cpp b/test/BtPhysTest.cpp
index 8bb7eee5..06587005 100644
--- a/test/BtPhysTest.cpp
+++ b/test/BtPhysTest.cpp
@@ -28,7 +28,7 @@
 #   include <cmath>
 #endif
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/benchsuite.cpp b/test/benchsuite.cpp
index 31e11d45..7d26729b 100644
--- a/test/benchsuite.cpp
+++ b/test/benchsuite.cpp
@@ -14,7 +14,7 @@
 
 #include <cstdio>
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/debug/quad.cpp b/test/debug/quad.cpp
index 360bbde5..93d33941 100644
--- a/test/debug/quad.cpp
+++ b/test/debug/quad.cpp
@@ -19,14 +19,10 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
-#if defined _WIN32
-#   undef main /* FIXME: still needed? */
-#endif
-
 int main(int argc, char **argv)
 {
     Application app("Quad", ivec2(640, 480), 60.0f);
diff --git a/test/math/pi.cpp b/test/math/pi.cpp
index dc5430c9..a909f764 100644
--- a/test/math/pi.cpp
+++ b/test/math/pi.cpp
@@ -14,7 +14,7 @@
 
 #include <cstdio>
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/math/poly.cpp b/test/math/poly.cpp
index 724bd57d..5eb1181e 100644
--- a/test/math/poly.cpp
+++ b/test/math/poly.cpp
@@ -14,7 +14,7 @@
 
 #include <cstdio>
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/math/remez.cpp b/test/math/remez.cpp
index d1d55c40..cfa100ac 100644
--- a/test/math/remez.cpp
+++ b/test/math/remez.cpp
@@ -12,7 +12,7 @@
 #   include "config.h"
 #endif
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/sandbox/sample.cpp b/test/sandbox/sample.cpp
index 48f7b1a9..ce8fc35c 100644
--- a/test/sandbox/sample.cpp
+++ b/test/sandbox/sample.cpp
@@ -12,7 +12,7 @@
 #   include "config.h"
 #endif
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/testsuite.cpp b/test/testsuite.cpp
index 16e1677b..4a6d3ac1 100644
--- a/test/testsuite.cpp
+++ b/test/testsuite.cpp
@@ -15,7 +15,7 @@
 #include <cstdio>
 #include <cstdlib>
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
diff --git a/test/xolotl/xolotl.cpp b/test/xolotl/xolotl.cpp
index d2b19b68..4a39bcd9 100644
--- a/test/xolotl/xolotl.cpp
+++ b/test/xolotl/xolotl.cpp
@@ -19,14 +19,10 @@
 
 using namespace lol;
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
-#if defined _WIN32
-#   undef main /* FIXME: still needed? */
-#endif
-
 #include "xolotl.h"
 
 class Xolotl : public WorldEntity
diff --git a/tutorial/01_triangle.cpp b/tutorial/01_triangle.cpp
index 80c08105..09f97a86 100644
--- a/tutorial/01_triangle.cpp
+++ b/tutorial/01_triangle.cpp
@@ -18,12 +18,11 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
 #if defined _WIN32
-#   undef main /* FIXME: still needed? */
 #   include <direct.h>
 #endif
 
diff --git a/tutorial/02_cube.cpp b/tutorial/02_cube.cpp
index 28fdea3c..69cc37c0 100644
--- a/tutorial/02_cube.cpp
+++ b/tutorial/02_cube.cpp
@@ -18,12 +18,11 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
 #if defined _WIN32
-#   undef main /* FIXME: still needed? */
 #   include <direct.h>
 #endif
 
diff --git a/tutorial/05_easymesh.cpp b/tutorial/05_easymesh.cpp
index 9e062086..5036d557 100644
--- a/tutorial/05_easymesh.cpp
+++ b/tutorial/05_easymesh.cpp
@@ -17,7 +17,7 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
diff --git a/tutorial/08_fbo.cpp b/tutorial/08_fbo.cpp
index 3b0ab8c6..eeb936ef 100644
--- a/tutorial/08_fbo.cpp
+++ b/tutorial/08_fbo.cpp
@@ -18,12 +18,11 @@
 using namespace std;
 using namespace lol;
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
 #if defined _WIN32
-#   undef main /* FIXME: still needed? */
 #   include <direct.h>
 #endif
 
diff --git a/tutorial/11_fractal.cpp b/tutorial/11_fractal.cpp
index e750e88f..c9d4fe00 100644
--- a/tutorial/11_fractal.cpp
+++ b/tutorial/11_fractal.cpp
@@ -26,12 +26,11 @@ using namespace lol;
 #   include <d3d9.h>
 #endif
 
-#if USE_SDL && defined __APPLE__
+#if USE_SDL
 #   include <SDL_main.h>
 #endif
 
 #if defined _WIN32
-#   undef main /* FIXME: still needed? */
 #   include <direct.h>
 #endif