diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index 68556a7e4..d795f5589 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -19,7 +19,6 @@
 #include "Console.hxx"
 #include "Settings.hxx"
 #include "EventHandler.hxx"
-#include "Event.hxx"
 #include "Sound.hxx"
 #include "StateManager.hxx"
 #include "StellaKeys.hxx"
@@ -45,7 +44,7 @@ static constexpr int MOD3 = KBDM_ALT;
 PhysicalKeyboardHandler::PhysicalKeyboardHandler(OSystem& system, EventHandler& handler)
   : myOSystem(system),
     myHandler(handler)
-#ifdef BSPF_UNIX  // FIXME - this may no longer be relevant
+#ifdef BSPF_UNIX
     , myAltKeyCounter(0)
 #endif
 {
diff --git a/src/common/PKeyboardHandler.hxx b/src/common/PKeyboardHandler.hxx
index d4a833a30..ffe869d21 100644
--- a/src/common/PKeyboardHandler.hxx
+++ b/src/common/PKeyboardHandler.hxx
@@ -25,6 +25,7 @@ class OSystem;
 class EventHandler;
 
 #include "bspf.hxx"
+#include "Event.hxx"
 #include "EventHandlerConstants.hxx"
 #include "KeyMap.hxx"