diff --git a/source/6522.cpp b/source/6522.cpp
index e375dfc7..42a71cfd 100644
--- a/source/6522.cpp
+++ b/source/6522.cpp
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "6522.h"
 #include "CardManager.h"
-#include "Mockingboard.h"
 #include "Core.h"
 #include "CPU.h"
 #include "Memory.h"
diff --git a/source/CPU.cpp b/source/CPU.cpp
index 88621aa5..a7212ae3 100644
--- a/source/CPU.cpp
+++ b/source/CPU.cpp
@@ -90,8 +90,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Core.h"
 #include "CardManager.h"
 #include "Memory.h"
-#include "Mockingboard.h"
-#include "MouseInterface.h"
 #ifdef USE_SPEECH_API
 #include "Speech.h"
 #endif
diff --git a/source/Card.cpp b/source/Card.cpp
index 4000c696..96e104b9 100644
--- a/source/Card.cpp
+++ b/source/Card.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "ParallelPrinter.h"
 #include "z80emu.h"
 #include "FourPlay.h"
-#include "Joystick.h"
 #include "LanguageCard.h"
 #include "MouseInterface.h"
 #include "SAM.h"
diff --git a/source/Core.cpp b/source/Core.cpp
index 83344839..1d7860c9 100644
--- a/source/Core.cpp
+++ b/source/Core.cpp
@@ -34,7 +34,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Interface.h"
 #include "Log.h"
 #include "Memory.h"
-#include "Mockingboard.h"
 #include "Pravets.h"
 #include "Speaker.h"
 #include "Registry.h"
diff --git a/source/Disk.cpp b/source/Disk.cpp
index e725e0d5..5deb99a3 100644
--- a/source/Disk.cpp
+++ b/source/Disk.cpp
@@ -32,8 +32,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "Disk.h"
 
-#include "SaveState_Structs_v1.h"
-
 #include "Interface.h"
 #include "Core.h"
 #include "CardManager.h"
diff --git a/source/DiskFormatTrack.cpp b/source/DiskFormatTrack.cpp
index bbcb368c..97da564d 100644
--- a/source/DiskFormatTrack.cpp
+++ b/source/DiskFormatTrack.cpp
@@ -46,7 +46,6 @@ Writes the following: (in 1 continuous write operation)
 
 #include "DiskFormatTrack.h"
 #include "Disk.h"
-#include "Log.h"
 #include "YamlHelper.h"
 
 // Occurs on these conditions:
diff --git a/source/FrameBase.cpp b/source/FrameBase.cpp
index c2ac2a81..a29e9ff1 100644
--- a/source/FrameBase.cpp
+++ b/source/FrameBase.cpp
@@ -2,8 +2,8 @@
 
 #include "FrameBase.h"
 #include "Interface.h"
-#include "Core.h"
 #include "NTSC.h"
+#include "StrFormat.h"
 
 FrameBase::FrameBase()
 {
diff --git a/source/Harddisk.cpp b/source/Harddisk.cpp
index 14aec07d..84e0b52c 100644
--- a/source/Harddisk.cpp
+++ b/source/Harddisk.cpp
@@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Harddisk.h"
 #include "Core.h"
 #include "Interface.h"
-#include "CardManager.h"
 #include "CPU.h"
 #include "DiskImage.h"	// ImageError_e, Disk_Status_e
 #include "Memory.h"
diff --git a/source/Joystick.cpp b/source/Joystick.cpp
index a5239236..18e06421 100644
--- a/source/Joystick.cpp
+++ b/source/Joystick.cpp
@@ -40,15 +40,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "Joystick.h"
-#include "Windows/AppleWin.h"
 #include "CPU.h"
 #include "Memory.h"
 #include "YamlHelper.h"
 #include "Interface.h"
 #include "CopyProtectionDongles.h"
 
-#include "Configuration/PropertySheet.h"
-
 enum {DEVICE_NONE=0, DEVICE_JOYSTICK, DEVICE_KEYBOARD, DEVICE_MOUSE, DEVICE_JOYSTICK_THUMBSTICK2};
 
 // Indexed by joytype[n]
diff --git a/source/Keyboard.cpp b/source/Keyboard.cpp
index 6fb87bb4..5238279f 100644
--- a/source/Keyboard.cpp
+++ b/source/Keyboard.cpp
@@ -34,9 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Interface.h"
 #include "Utilities.h"
 #include "Pravets.h"
-#include "Tape.h"
 #include "YamlHelper.h"
-#include "Log.h"
 
 static BYTE asciicode[3][10] = {
 	// VK_LEFT/UP/RIGHT/DOWN/SELECT, VK_PRINT/EXECUTE/SNAPSHOT/INSERT/DELETE
diff --git a/source/Memory.cpp b/source/Memory.cpp
index 0a9f349b..0845825b 100644
--- a/source/Memory.cpp
+++ b/source/Memory.cpp
@@ -35,28 +35,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Core.h"
 #include "CardManager.h"
 #include "CPU.h"
-#include "Disk.h"
-#include "Harddisk.h"
 #include "Joystick.h"
 #include "Keyboard.h"
 #include "LanguageCard.h"
 #include "Log.h"
-#include "Mockingboard.h"
-#include "MouseInterface.h"
 #include "NTSC.h"
 #include "NoSlotClock.h"
 #include "Pravets.h"
-#include "ParallelPrinter.h"
-#include "Registry.h"
-#include "SAM.h"
-#include "FourPlay.h"
-#include "SNESMAX.h"
-#include "SerialComms.h"
 #include "Speaker.h"
 #include "Tape.h"
 #include "RGBMonitor.h"
 #include "VidHD.h"
-#include "CopyProtectionDongles.h"
 
 #include "z80emu.h"
 #include "Z80VICE/z80.h"
diff --git a/source/MouseInterface.cpp b/source/MouseInterface.cpp
index f0915840..01ae9580 100644
--- a/source/MouseInterface.cpp
+++ b/source/MouseInterface.cpp
@@ -43,14 +43,12 @@ Etc.
 #include "StdAfx.h"
 
 #include "MouseInterface.h"
-#include "SaveState_Structs_common.h"
 #include "Common.h"
 
 #include "Core.h"	// g_SynchronousEventMgr
 #include "CardManager.h"
 #include "CPU.h"
 #include "Interface.h"	// FrameSetCursorPosByMousePos()
-#include "Log.h"
 #include "Memory.h"
 #include "NTSC.h"	// NTSC_GetCyclesUntilVBlank()
 #include "YamlHelper.h"
diff --git a/source/Pravets.cpp b/source/Pravets.cpp
index 21911bd3..2a05e5e1 100644
--- a/source/Pravets.cpp
+++ b/source/Pravets.cpp
@@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Core.h"
 #include "Interface.h"
 #include "Keyboard.h"
-#include "Tape.h"
 
 Pravets::Pravets(void)
 {
diff --git a/source/RGBMonitor.cpp b/source/RGBMonitor.cpp
index c55d307a..dc53bf7c 100644
--- a/source/RGBMonitor.cpp
+++ b/source/RGBMonitor.cpp
@@ -5,7 +5,6 @@
 #include "RGBMonitor.h"
 #include "Memory.h" // MemGetMainPtr() MemGetAuxPtr()
 #include "Interface.h"
-#include "Card.h"
 #include "YamlHelper.h"
 
 
diff --git a/source/SaveState.cpp b/source/SaveState.cpp
index cfc6e170..eea5b11c 100644
--- a/source/SaveState.cpp
+++ b/source/SaveState.cpp
@@ -38,7 +38,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Joystick.h"
 #include "Keyboard.h"
 #include "Memory.h"
-#include "Mockingboard.h"
 #include "Pravets.h"
 #include "Speaker.h"
 #include "Speech.h"
diff --git a/source/Utilities.cpp b/source/Utilities.cpp
index c38b587d..f01e0b67 100644
--- a/source/Utilities.cpp
+++ b/source/Utilities.cpp
@@ -33,18 +33,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "CPU.h"
 #include "Joystick.h"
 #include "Log.h"
-#include "Mockingboard.h"
-#include "MouseInterface.h"
 #include "ParallelPrinter.h"
 #include "Registry.h"
 #include "Riff.h"
 #include "SaveState.h"
-#include "SerialComms.h"
 #include "Speaker.h"
 #include "Memory.h"
 #include "Pravets.h"
 #include "Keyboard.h"
-#include "Mockingboard.h"
 #include "Interface.h"
 #include "SoundCore.h"
 #include "CopyProtectionDongles.h"
diff --git a/source/VidHD.cpp b/source/VidHD.cpp
index 2920c794..86924bdb 100644
--- a/source/VidHD.cpp
+++ b/source/VidHD.cpp
@@ -50,7 +50,6 @@
 
 #include "Core.h"
 #include "Memory.h"
-#include "NTSC.h"
 #include "Video.h"
 #include "VidHD.h"
 #include "YamlHelper.h"
diff --git a/source/Video.cpp b/source/Video.cpp
index 574a67f6..a8a35238 100644
--- a/source/Video.cpp
+++ b/source/Video.cpp
@@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "CardManager.h"
 #include "Core.h"
 #include "CPU.h"
-#include "Log.h"
 #include "Memory.h"
 #include "Registry.h"
 #include "NTSC.h"