diff --git a/gui/editrecorddialog.cpp b/gui/editrecorddialog.cpp
index a77c4f393fb..36c2958ee9e 100644
--- a/gui/editrecorddialog.cpp
+++ b/gui/editrecorddialog.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "editrecorddialog.h"
+#include "gui/editrecorddialog.h"
 #include "gui/widgets/edittext.h"
 #include "common/translation.h"
 
diff --git a/gui/launcher.h b/gui/launcher.h
index 46048682088..e384784365e 100644
--- a/gui/launcher.h
+++ b/gui/launcher.h
@@ -31,8 +31,9 @@
 
 #include "gui/dialog.h"
 #include "gui/widgets/popup.h"
+#include "gui/MetadataParser.h"
+
 #include "engines/game.h"
-#include "MetadataParser.h"
 
 using Common::String;
 using Common::U32String;
diff --git a/gui/recorderdialog.cpp b/gui/recorderdialog.cpp
index 513ecbe65c4..77ecfb64fc2 100644
--- a/gui/recorderdialog.cpp
+++ b/gui/recorderdialog.cpp
@@ -35,7 +35,7 @@
 #include "common/system.h"
 #include "gui/ThemeEval.h"
 #include "gui/gui-manager.h"
-#include "recorderdialog.h"
+#include "gui/recorderdialog.h"
 
 #define MAX_RECORDS_NAMES 0xFF
 
diff --git a/gui/remotebrowser.cpp b/gui/remotebrowser.cpp
index 9d98e47b84e..15aa0da7879 100644
--- a/gui/remotebrowser.cpp
+++ b/gui/remotebrowser.cpp
@@ -32,7 +32,7 @@
 #include "backends/networking/curl/request.h"
 #include "backends/cloud/storage.h"
 #include "backends/cloud/cloudmanager.h"
-#include "message.h"
+#include "gui/message.h"
 
 namespace GUI {