diff --git a/extern/CMakeProject-lua.cmake b/extern/CMakeProject-lua.cmake
index b2106d4878..70d45a95c7 100644
--- a/extern/CMakeProject-lua.cmake
+++ b/extern/CMakeProject-lua.cmake
@@ -64,6 +64,7 @@ set_property(TARGET "lua-5.1" PROPERTY FOLDER "External Libraries")
 
 if(MSVC)
   sm_add_compile_definition("lua-5.1" _CRT_SECURE_NO_WARNINGS)
+  sm_add_compile_flag("lua-5.1" /TP)
 endif(MSVC)
 
 disable_project_warnings("lua-5.1")
diff --git a/src/EnumHelper.h b/src/EnumHelper.h
index 230e21624b..d620830ecc 100644
--- a/src/EnumHelper.h
+++ b/src/EnumHelper.h
@@ -5,10 +5,14 @@
 #include "RageUtil.h"
 #include <memory>
 
+#ifndef _MSC_VER
 extern "C"
 {
+#endif
 #include "../extern/lua-5.1/src/lua.h"
+#ifndef _MSC_VER
 }
+#endif
 
 /** @brief A general foreach loop for enumerators, going up to a max value. */
 #define FOREACH_ENUM_N( e, max, var )	for( e var=(e)0; var<max; enum_add<e>( var, +1 ) )
diff --git a/src/LuaManager.h b/src/LuaManager.h
index b69d24e865..e0df497a9b 100644
--- a/src/LuaManager.h
+++ b/src/LuaManager.h
@@ -8,12 +8,16 @@ class RageMutex;
 class XNode;
 class LuaReference;
 
+#ifndef _MSC_VER
 extern "C"
 {
+#endif
 #include "../extern/lua-5.1/src/lua.h"
 #include "../extern/lua-5.1/src/lualib.h"
 #include "../extern/lua-5.1/src/lauxlib.h"
+#ifndef _MSC_VER
 }
+#endif
 
 // For Dialog::Result
 #include "arch/Dialog/Dialog.h"