diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx
index cc7d48b6e..ab3771e9a 100644
--- a/src/emucore/EventHandler.hxx
+++ b/src/emucore/EventHandler.hxx
@@ -471,19 +471,15 @@ class EventHandler
       SCANLINES,
       INTERPOLATION,
       // *** Input group ***
-    #ifdef JOYSTICK_SUPPORT
       DEADZONE,
       ANALOG_SENSITIVITY,
       DEJITTER_AVERAGING,
       DEJITTER_REACTION,
-    #endif
       DIGITAL_SENSITIVITY,
       AUTO_FIRE,
       FOUR_DIRECTIONS,
       MOD_KEY_COMBOS,
-    #ifdef JOYSTICK_SUPPORT
       SA_PORT_ORDER,
-    #endif
       USE_MOUSE,
       PADDLE_SENSITIVITY,
       TRACKBALL_SENSITIVITY,
diff --git a/src/libretro/Makefile.common b/src/libretro/Makefile.common
index 55e92c650..3dbadd6b6 100644
--- a/src/libretro/Makefile.common
+++ b/src/libretro/Makefile.common
@@ -111,6 +111,7 @@ SOURCES_CXX := \
 	$(CORE_DIR)/emucore/MT24LC256.cxx \
 	$(CORE_DIR)/emucore/OSystem.cxx \
 	$(CORE_DIR)/emucore/Paddles.cxx \
+	$(CORE_DIR)/emucore/PlusROM.cxx \
 	$(CORE_DIR)/emucore/PointingDevice.cxx \
 	$(CORE_DIR)/emucore/Props.cxx \
 	$(CORE_DIR)/emucore/PropsSet.cxx \