diff --git a/source/6821.cpp b/source/6821.cpp
index 7be93e3a..8841a783 100644
--- a/source/6821.cpp
+++ b/source/6821.cpp
@@ -28,7 +28,6 @@
 
 #include "StdAfx.h"
 
-
 #include "6821.h"
 
 #define PIA_W_CALLBACK(st, val)	\
diff --git a/source/AY8910.cpp b/source/AY8910.cpp
index f7027fcf..7600740e 100644
--- a/source/AY8910.cpp
+++ b/source/AY8910.cpp
@@ -26,14 +26,11 @@
 
 #include "StdAfx.h"
 
-
 #include <windows.h>
 #include <stdio.h>
 #include <crtdbg.h>
 #include "AY8910.h"
 
-#include "Common.h"
-#include "Structs.h"
 #include "Applewin.h"		// For g_fh
 #include "Mockingboard.h"	// For g_uTimer1IrqCount
 
diff --git a/source/Joystick.cpp b/source/Joystick.cpp
index 9bdf5491..3b232378 100644
--- a/source/Joystick.cpp
+++ b/source/Joystick.cpp
@@ -41,9 +41,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "AppleWin.h"
 #include "CPU.h"
-#include "Disk.h"
 #include "Memory.h"
-#include "MouseInterface.h"
 
 #include "Configuration\PropertySheet.h"
 
diff --git a/source/Memory.cpp b/source/Memory.cpp
index e9deb7af..d33b2f49 100644
--- a/source/Memory.cpp
+++ b/source/Memory.cpp
@@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Disk.h"
 #include "Frame.h"
 #include "Harddisk.h"
+#include "Joystick.h"
 #include "Keyboard.h"
 #include "Memory.h"
 #include "Mockingboard.h"
@@ -47,7 +48,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "z80emu.h"
 #include "Z80VICE\z80.h"
-#include "Z80VICE\z80mem.h"
 #include "..\resource\resource.h"
 #include "Configuration\PropertySheet.h"
 
diff --git a/source/Riff.cpp b/source/Riff.cpp
index 8b95bf5a..0f914e0a 100644
--- a/source/Riff.cpp
+++ b/source/Riff.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "Stdafx.h"
-#include "riff.h"
+#include "Riff.h"
 
 static HANDLE g_hRiffFile = INVALID_HANDLE_VALUE;
 static DWORD dwTotalOffset;
diff --git a/source/SerialComms.cpp b/source/SerialComms.cpp
index 3342e80a..77b55f91 100644
--- a/source/SerialComms.cpp
+++ b/source/SerialComms.cpp
@@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "AppleWin.h"
 #include "CPU.h"
-#include "Disk.h"
+#include "Disk.h"	// DiskIsSpinning()
 #include "Frame.h"
 #include "Memory.h"
 #include "SerialComms.h"
diff --git a/source/Speaker.cpp b/source/Speaker.cpp
index 4b3c5fc7..4c4dfc94 100644
--- a/source/Speaker.cpp
+++ b/source/Speaker.cpp
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Memory.h"
 #include "SoundCore.h"
 #include "Speaker.h"
-#include "Video.h"
+#include "Video.h"	// VideoRedrawScreen()
 
 #include "Debugger\Debug.h"	// For DWORD extbench
 
diff --git a/source/Video.cpp b/source/Video.cpp
index 7e5cc496..fef0df11 100644
--- a/source/Video.cpp
+++ b/source/Video.cpp
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "AppleWin.h"
 #include "CPU.h"
-#include "Disk.h"
 #include "Frame.h"
 #include "Keyboard.h"
 #include "Memory.h"