4 files changed, 8 insertions, 8 deletions
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index 067d8453a5..59c30578dd 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -27,8 +27,8 @@
 #ifdef ENABLE_KEYMAPPER
 
 #include "gui/GuiManager.h"
-#include "gui/PopUpWidget.h"
-#include "gui/ScrollBarWidget.h"
+#include "gui/widgets/popup.h"
+#include "gui/widgets/scrollbar.h"
 #include "gui/ThemeEval.h"
 
 #include "common/translation.h"
diff --git a/backends/platform/ds/arm9/source/dsoptions.cpp b/backends/platform/ds/arm9/source/dsoptions.cpp
index 6721a4910a..8597b318c9 100644
--- a/backends/platform/ds/arm9/source/dsoptions.cpp
+++ b/backends/platform/ds/arm9/source/dsoptions.cpp
@@ -27,12 +27,12 @@
 #include "dsmain.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
-#include "gui/TabWidget.h"
+#include "gui/widgets/list.h"
+#include "gui/widgets/tab.h"
 #include "osystem_ds.h"
 #include "engines/scumm/scumm.h"
 #include "touchkeyboard.h"
-#include "gui/PopUpWidget.h"
+#include "gui/widgets/popup.h"
 
 #include "common/translation.h"
 
diff --git a/backends/platform/ds/arm9/source/dsoptions.h b/backends/platform/ds/arm9/source/dsoptions.h
index 1bdc7c1f27..8ba8e6e4da 100644
--- a/backends/platform/ds/arm9/source/dsoptions.h
+++ b/backends/platform/ds/arm9/source/dsoptions.h
@@ -34,7 +34,7 @@
 #include "gui/object.h"
 #include "gui/widget.h"
 #include "gui/dialog.h"
-#include "gui/TabWidget.h"
+#include "gui/widgets/tab.h"
 #include "scumm/dialogs.h"
 
 namespace DS {
diff --git a/backends/platform/wii/options.h b/backends/platform/wii/options.h
index b126bde88f..00d42bc2ef 100644
--- a/backends/platform/wii/options.h
+++ b/backends/platform/wii/options.h
@@ -25,8 +25,8 @@
 
 #include "common/str.h"
 #include "gui/dialog.h"
-#include "gui/TabWidget.h"
-#include "gui/EditTextWidget.h"
+#include "gui/widgets/tab.h"
+#include "gui/widgets/edittext.h"
 
 using namespace GUI;