diff --git a/Globals.cpp b/Windows/Globals.cpp
similarity index 100%
rename from Globals.cpp
rename to Windows/Globals.cpp
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index 1b399343c9..392c522cde 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -279,9 +279,9 @@
     <ClCompile Include="DSoundStream.cpp" />
     <ClCompile Include="OpenGLBase.cpp" />
     <ClCompile Include="WindowsHost.cpp" />
-    <ClCompile Include="..\Globals.cpp" />
-    <ClCompile Include="..\main.cpp" />
-    <ClCompile Include="..\stdafx.cpp">
+    <ClCompile Include="Globals.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -359,4 +359,4 @@
       <UserProperties RESOURCE_FILE="DaSh.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/main.cpp b/Windows/main.cpp
similarity index 100%
rename from main.cpp
rename to Windows/main.cpp
diff --git a/stdafx.cpp b/Windows/stdafx.cpp
similarity index 100%
rename from stdafx.cpp
rename to Windows/stdafx.cpp
diff --git a/stdafx.h b/Windows/stdafx.h
similarity index 100%
rename from stdafx.h
rename to Windows/stdafx.h
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index a63bc5f606..55dd60a07d 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -53,7 +53,6 @@ LOCAL_SRC_FILES := \
   $(SRC)/ext/libkirk/bn.c \
   $(SRC)/ext/libkirk/ec.c \
   $(SRC)/ext/libkirk/kirk_engine.c \
-  $(SRC)/Globals.cpp \
   $(SRC)/Common/ArmABI.cpp \
   $(SRC)/Common/ArmEmitter.cpp \
   $(SRC)/Common/LogManager.cpp \