diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 28381fc16..87a8ac25a 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -737,6 +737,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
           {
             if (myState == EventHandlerState::EMULATION)
             {
+#ifdef GUI_SUPPORT
               if (myOSystem.settings().getBool("confirmexit"))
               {
                 StringList msg;
@@ -749,11 +750,13 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
                 enterMenuMode(EventHandlerState::MESSAGEMENU);
               }
               else
+#endif
                 exitEmulation(true);
             }
           }
           return;
 
+#ifdef GUI_SUPPORT
         case EventHandlerState::MESSAGEMENU:
           if (pressed && !repeated)
           {
@@ -762,6 +765,7 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
               exitEmulation(true);
           }
           return;
+#endif
 
         default:
           return;
diff --git a/src/gui/module.mk b/src/gui/module.mk
index 82c14c391..f550e167d 100644
--- a/src/gui/module.mk
+++ b/src/gui/module.mk
@@ -30,6 +30,8 @@ MODULE_OBJS := \
 	src/gui/LoggerDialog.o \
 	src/gui/Menu.o \
 	src/gui/MessageBox.o \
+	src/gui/MessageDialog.o \
+	src/gui/MessageMenu.o \
 	src/gui/MinUICommandDialog.o\
 	src/gui/OptionsDialog.o \
 	src/gui/PopUpWidget.o \