diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index e6c7c98ea..b973d0bac 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -26,7 +26,7 @@
 #include "TIASurface.hxx"
 #include "PNGLibrary.hxx"
 #include "PKeyboardHandler.hxx"
-#include "KeyMap.hxx"
+
 
 #ifdef DEBUGGER_SUPPORT
   #include "Debugger.hxx"
diff --git a/src/emucore/CompuMate.cxx b/src/emucore/CompuMate.cxx
index 579e67616..0620062c3 100644
--- a/src/emucore/CompuMate.cxx
+++ b/src/emucore/CompuMate.cxx
@@ -15,8 +15,6 @@
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //============================================================================
 
-#include "Control.hxx"
-#include "StellaKeys.hxx"
 #include "CompuMate.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 7a76b24c9..bd316c2a2 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -18,18 +18,15 @@
 #include <sstream>
 #include <map>
 
-#include "bspf.hxx"
 #include "Logger.hxx"
 
 #include "Base.hxx"
 #include "Console.hxx"
-#include "Event.hxx"
 #include "FrameBuffer.hxx"
 #include "FSNode.hxx"
 #include "OSystem.hxx"
 #include "Joystick.hxx"
 #include "Paddles.hxx"
-#include "PJoystickHandler.hxx"
 #include "PointingDevice.hxx"
 #include "PropsSet.hxx"
 #include "Settings.hxx"