diff --git a/Source/Project64-core/AppInit.cpp b/Source/Project64-core/AppInit.cpp
index f574d503e..0b62fdfac 100644
--- a/Source/Project64-core/AppInit.cpp
+++ b/Source/Project64-core/AppInit.cpp
@@ -1,7 +1,9 @@
 #include "stdafx.h"
+
 #include <Common/path.h>
 #include <Common/Trace.h>
 #include <Common/Util.h>
+
 #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/Plugins/PluginClass.h>
diff --git a/Source/Project64-core/Logging.cpp b/Source/Project64-core/Logging.cpp
index 0c779ff7c..5597f9205 100644
--- a/Source/Project64-core/Logging.cpp
+++ b/Source/Project64-core/Logging.cpp
@@ -11,7 +11,6 @@
 #include "stdafx.h"
 #include <Project64-core/Logging.h>
 
-#include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <Common/path.h>
diff --git a/Source/Project64-core/N64System/CheatClass.cpp b/Source/Project64-core/N64System/CheatClass.cpp
index 26d2d7748..4cd02ef3c 100644
--- a/Source/Project64-core/N64System/CheatClass.cpp
+++ b/Source/Project64-core/N64System/CheatClass.cpp
@@ -9,7 +9,6 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include <string.h>
 #include "CheatClass.h"
 
 #include <Project64-core/Settings/SettingType/SettingsType-Cheats.h>
diff --git a/Source/Project64-core/N64System/Mips/Dma.cpp b/Source/Project64-core/N64System/Mips/Dma.cpp
index dc1ffad08..7720e417d 100644
--- a/Source/Project64-core/N64System/Mips/Dma.cpp
+++ b/Source/Project64-core/N64System/Mips/Dma.cpp
@@ -10,6 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 #include <Common/MemoryManagement.h>
+
 #include <Project64-core/N64System/Mips/Dma.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64RomClass.h>
diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
index d320f9fca..798152ac4 100644
--- a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
+++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
@@ -9,6 +9,7 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
 #include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/N64System/N64RomClass.h>
diff --git a/Source/Project64-core/N64System/Mips/PifRam.cpp b/Source/Project64-core/N64System/Mips/PifRam.cpp
index 9b1f09be9..0af058233 100644
--- a/Source/Project64-core/N64System/Mips/PifRam.cpp
+++ b/Source/Project64-core/N64System/Mips/PifRam.cpp
@@ -10,7 +10,6 @@
 ****************************************************************************/
 #include "stdafx.h"
 #include <stdio.h>
-#include <string.h>
 
 #include <Project64-core/N64System/Mips/PifRam.h>
 #include <Project64-core/N64System/SystemGlobals.h>
diff --git a/Source/Project64-core/N64System/Mips/RegisterClass.cpp b/Source/Project64-core/N64System/Mips/RegisterClass.cpp
index 5b9e9aedf..18657b827 100644
--- a/Source/Project64-core/N64System/Mips/RegisterClass.cpp
+++ b/Source/Project64-core/N64System/Mips/RegisterClass.cpp
@@ -9,7 +9,6 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
-#include <string.h>
 #include <Project64-core/N64System/Mips/RegisterClass.h>
 #include <Project64-core/N64System/N64Class.h>
 #include <Project64-core/N64System/SystemGlobals.h>
diff --git a/Source/Project64-core/N64System/Mips/Rumblepak.cpp b/Source/Project64-core/N64System/Mips/Rumblepak.cpp
index 45df9e6e1..f63d69ef1 100644
--- a/Source/Project64-core/N64System/Mips/Rumblepak.cpp
+++ b/Source/Project64-core/N64System/Mips/Rumblepak.cpp
@@ -10,6 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 #include "Rumblepak.h"
+
 #include <Project64-core/N64System/SystemGlobals.h>
 #include <Project64-core/Plugins/PluginClass.h>
 #include <Project64-core/Plugins/ControllerPlugin.h>
diff --git a/Source/Project64-core/N64System/ProfilingClass.cpp b/Source/Project64-core/N64System/ProfilingClass.cpp
index f32ed7491..4042835ad 100644
--- a/Source/Project64-core/N64System/ProfilingClass.cpp
+++ b/Source/Project64-core/N64System/ProfilingClass.cpp
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+#include <stdio.h>
+
 #include <Project64-core/N64System/ProfilingClass.h>
 #include <Common/LogClass.h>
 
diff --git a/Source/Project64-core/stdafx.h b/Source/Project64-core/stdafx.h
index c075f580f..0132152b4 100644
--- a/Source/Project64-core/stdafx.h
+++ b/Source/Project64-core/stdafx.h
@@ -1,3 +1,5 @@
+#include <string.h>
+
 #include <Common/stdtypes.h>
 #include <Common/StdString.h>
 #include <Common/Trace.h>