diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index 067d8453a53..59c30578dda 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 6721a4910af..8597b318c94 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 1bdc7c1f27d..8ba8e6e4da7 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 b126bde88ff..00d42bc2ef9 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;
 
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 9104eaff3aa..23d69db9d73 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -35,7 +35,7 @@
 #include "gui/about.h"
 #include "gui/GuiManager.h"
 #include "gui/launcher.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/message.h"
 #include "gui/options.h"
 #include "gui/saveload.h"
diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h
index 74e8f50b3dc..04a9566fedb 100644
--- a/engines/mohawk/dialogs.h
+++ b/engines/mohawk/dialogs.h
@@ -33,7 +33,7 @@
 #include "gui/dialog.h"
 #include "gui/options.h"
 #include "gui/widget.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 
 namespace Mohawk {
 
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp
index 66515127dae..855dc121056 100644
--- a/engines/parallaction/saveload.cpp
+++ b/engines/parallaction/saveload.cpp
@@ -29,7 +29,7 @@
 #include "gui/dialog.h"
 #include "gui/saveload.h"
 #include "gui/widget.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/message.h"
 
 #include "parallaction/parallaction.h"
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 1cdc9e3ff01..9507c10eb25 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -37,7 +37,7 @@
 #include "gui/about.h"
 
 #include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/ThemeEval.h"
 
 #include "scumm/dialogs.h"
diff --git a/engines/testbed/config.h b/engines/testbed/config.h
index 2ee5b090029..cf1948b412f 100644
--- a/engines/testbed/config.h
+++ b/engines/testbed/config.h
@@ -31,7 +31,7 @@
 #include "common/str-array.h"
 #include "common/tokenizer.h"
 
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/options.h"
 #include "gui/ThemeEngine.h"
 
diff --git a/gui/KeysDialog.h b/gui/KeysDialog.h
index 7a9936a085c..fcf8f818bd4 100644
--- a/gui/KeysDialog.h
+++ b/gui/KeysDialog.h
@@ -28,7 +28,7 @@
 
 #include "gui/GuiManager.h"
 #include "gui/dialog.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "common/str.h"
 #include "common/translation.h"
 
diff --git a/gui/browser.cpp b/gui/browser.cpp
index 6a9d3d05b50..f9be9182798 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -24,7 +24,7 @@
 
 #include "gui/browser.h"
 #include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 
 #include "common/config-manager.h"
 #include "common/system.h"
diff --git a/gui/browser_osx.mm b/gui/browser_osx.mm
index ea77e16c04e..37699c364cb 100644
--- a/gui/browser_osx.mm
+++ b/gui/browser_osx.mm
@@ -26,8 +26,6 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 #include "gui/browser.h"
-#include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
 
 #include "common/config-manager.h"
 #include "common/system.h"
diff --git a/gui/chooser.cpp b/gui/chooser.cpp
index a7b453c9577..9193f1b5b35 100644
--- a/gui/chooser.cpp
+++ b/gui/chooser.cpp
@@ -26,7 +26,7 @@
 #include "common/translation.h"
 #include "gui/chooser.h"
 #include "gui/GuiManager.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 
 namespace GUI {
 
diff --git a/gui/console.cpp b/gui/console.cpp
index ca3726c857a..b2635229fac 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "gui/console.h"
-#include "gui/ScrollBarWidget.h"
+#include "gui/widgets/scrollbar.h"
 #include "gui/ThemeEval.h"
 
 #include "engines/engine.h"
diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index e20b181c830..71ebd34d353 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -27,7 +27,7 @@
 #include "gui/GuiManager.h"
 #include "gui/dialog.h"
 #include "gui/widget.h"
-#include "gui/PopUpWidget.h"
+#include "gui/widgets/popup.h"
 
 #include "common/system.h"
 
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index adbc418e87d..cd3e3aace04 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -41,10 +41,10 @@
 #include "gui/GuiManager.h"
 #include "gui/options.h"
 #include "gui/saveload.h"
-#include "gui/EditTextWidget.h"
-#include "gui/ListWidget.h"
-#include "gui/TabWidget.h"
-#include "gui/PopUpWidget.h"
+#include "gui/widgets/edittext.h"
+#include "gui/widgets/list.h"
+#include "gui/widgets/tab.h"
+#include "gui/widgets/popup.h"
 #include "gui/ThemeEval.h"
 
 #include "graphics/cursorman.h"
diff --git a/gui/massadd.cpp b/gui/massadd.cpp
index 7a597085c58..bb4b65b681d 100644
--- a/gui/massadd.cpp
+++ b/gui/massadd.cpp
@@ -33,7 +33,7 @@
 #include "gui/massadd.h"
 #include "gui/GuiManager.h"
 #include "gui/widget.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 
 
 namespace GUI {
diff --git a/gui/module.mk b/gui/module.mk
index 72b5fa18f38..2fae810165d 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -6,27 +6,27 @@ MODULE_OBJS := \
 	console.o \
 	debugger.o \
 	dialog.o \
-	editable.o \
 	error.o \
-	EditTextWidget.o \
 	GuiManager.o \
 	launcher.o \
-	ListWidget.o \
 	massadd.o \
 	message.o \
 	object.o \
 	options.o \
-	PopUpWidget.o \
 	saveload.o \
-	ScrollBarWidget.o \
-	TabWidget.o \
 	themebrowser.o \
 	ThemeEngine.o \
 	ThemeEval.o \
 	ThemeLayout.o \
 	ThemeParser.o \
 	Tooltip.o \
-	widget.o
+	widget.o \
+	widgets/editable.o \
+	widgets/edittext.o \
+	widgets/list.o \
+	widgets/popup.o \
+	widgets/scrollbar.o \
+	widgets/tab.o
 
 ifdef MACOSX
 MODULE_OBJS += \
diff --git a/gui/options.cpp b/gui/options.cpp
index 418372e7cf6..a3f9075d9bd 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -29,8 +29,8 @@
 #include "gui/GuiManager.h"
 #include "gui/ThemeEval.h"
 #include "gui/options.h"
-#include "gui/PopUpWidget.h"
-#include "gui/TabWidget.h"
+#include "gui/widgets/popup.h"
+#include "gui/widgets/tab.h"
 
 #include "common/fs.h"
 #include "common/config-manager.h"
diff --git a/gui/options.h b/gui/options.h
index b8a084ed7bf..1c105046bb1 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -26,7 +26,6 @@
 #define OPTIONS_DIALOG_H
 
 #include "gui/dialog.h"
-#include "gui/TabWidget.h"
 #include "common/str.h"
 #include "sound/musicplugin.h"
 
@@ -42,6 +41,7 @@ class PopUpWidget;
 class SliderWidget;
 class StaticTextWidget;
 class ListWidget;
+class TabWidget;
 
 class OptionsDialog : public Dialog {
 public:
diff --git a/gui/saveload.cpp b/gui/saveload.cpp
index 3a86c5092eb..670c5875fa7 100644
--- a/gui/saveload.cpp
+++ b/gui/saveload.cpp
@@ -25,7 +25,7 @@
 #include "common/config-manager.h"
 #include "common/translation.h"
 
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/message.h"
 #include "gui/saveload.h"
 #include "gui/ThemeEval.h"
diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp
index c8f732fe5f3..3e4b680fef1 100644
--- a/gui/themebrowser.cpp
+++ b/gui/themebrowser.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "gui/themebrowser.h"
-#include "gui/ListWidget.h"
+#include "gui/widgets/list.h"
 #include "gui/widget.h"
 
 #include "common/translation.h"
diff --git a/gui/editable.cpp b/gui/widgets/editable.cpp
similarity index 99%
rename from gui/editable.cpp
rename to gui/widgets/editable.cpp
index 1ebe307bb07..9817f562ad3 100644
--- a/gui/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "common/events.h"
-#include "gui/editable.h"
+#include "gui/widgets/editable.h"
 #include "gui/GuiManager.h"
 
 namespace GUI {
diff --git a/gui/editable.h b/gui/widgets/editable.h
similarity index 97%
rename from gui/editable.h
rename to gui/widgets/editable.h
index 4a2d98349e5..0cd1f2721ca 100644
--- a/gui/editable.h
+++ b/gui/widgets/editable.h
@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#ifndef GUI_EDITABLE_H
-#define GUI_EDITABLE_H
+#ifndef GUI_WIDGETS_EDITABLE_H
+#define GUI_WIDGETS_EDITABLE_H
 
 #include "common/str.h"
 #include "common/rect.h"
diff --git a/gui/EditTextWidget.cpp b/gui/widgets/edittext.cpp
similarity index 99%
rename from gui/EditTextWidget.cpp
rename to gui/widgets/edittext.cpp
index e5de1c6e7ff..1e2ba694783 100644
--- a/gui/EditTextWidget.cpp
+++ b/gui/widgets/edittext.cpp
@@ -22,7 +22,7 @@
  * $Id$
  */
 
-#include "gui/EditTextWidget.h"
+#include "gui/widgets/edittext.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
 
diff --git a/gui/EditTextWidget.h b/gui/widgets/edittext.h
similarity index 95%
rename from gui/EditTextWidget.h
rename to gui/widgets/edittext.h
index 9c4ef036485..a2549882ca0 100644
--- a/gui/EditTextWidget.h
+++ b/gui/widgets/edittext.h
@@ -22,10 +22,10 @@
  * $Id$
  */
 
-#ifndef GUI_EDITTEXTWIDGET_H
-#define GUI_EDITTEXTWIDGET_H
+#ifndef GUI_WIDGETS_EDITTEXT_H
+#define GUI_WIDGETS_EDITTEXT_H
 
-#include "gui/editable.h"
+#include "gui/widgets/editable.h"
 #include "common/str.h"
 
 namespace GUI {
diff --git a/gui/ListWidget.cpp b/gui/widgets/list.cpp
similarity index 99%
rename from gui/ListWidget.cpp
rename to gui/widgets/list.cpp
index f5f41bba801..bcbe0b9cbfe 100644
--- a/gui/ListWidget.cpp
+++ b/gui/widgets/list.cpp
@@ -27,8 +27,8 @@
 #include "common/frac.h"
 #include "common/tokenizer.h"
 
-#include "gui/ListWidget.h"
-#include "gui/ScrollBarWidget.h"
+#include "gui/widgets/list.h"
+#include "gui/widgets/scrollbar.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
 
diff --git a/gui/ListWidget.h b/gui/widgets/list.h
similarity index 98%
rename from gui/ListWidget.h
rename to gui/widgets/list.h
index 3858fa6de2d..4bc9adc5ef5 100644
--- a/gui/ListWidget.h
+++ b/gui/widgets/list.h
@@ -22,10 +22,10 @@
  * $Id$
  */
 
-#ifndef GUI_LISTWIDGET_H
-#define GUI_LISTWIDGET_H
+#ifndef GUI_WIDGETS_LIST_H
+#define GUI_WIDGETS_LIST_H
 
-#include "gui/editable.h"
+#include "gui/widgets/editable.h"
 #include "common/str.h"
 
 #include "gui/ThemeEngine.h"
diff --git a/gui/PopUpWidget.cpp b/gui/widgets/popup.cpp
similarity index 99%
rename from gui/PopUpWidget.cpp
rename to gui/widgets/popup.cpp
index 1bd9cc5063e..fb3fee29265 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/widgets/popup.cpp
@@ -26,7 +26,7 @@
 #include "common/events.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
-#include "gui/PopUpWidget.h"
+#include "gui/widgets/popup.h"
 #include "engines/engine.h"
 
 #include "gui/ThemeEval.h"
diff --git a/gui/PopUpWidget.h b/gui/widgets/popup.h
similarity index 98%
rename from gui/PopUpWidget.h
rename to gui/widgets/popup.h
index f2c1728b52b..b3b3e308374 100644
--- a/gui/PopUpWidget.h
+++ b/gui/widgets/popup.h
@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#ifndef POPUPWIDGET_H
-#define POPUPWIDGET_H
+#ifndef GUI_WIDGETS_POPUP_H
+#define GUI_WIDGETS_POPUP_H
 
 #include "gui/widget.h"
 #include "common/str.h"
diff --git a/gui/ScrollBarWidget.cpp b/gui/widgets/scrollbar.cpp
similarity index 99%
rename from gui/ScrollBarWidget.cpp
rename to gui/widgets/scrollbar.cpp
index f4aaa8ffc96..2671fc7d610 100644
--- a/gui/ScrollBarWidget.cpp
+++ b/gui/widgets/scrollbar.cpp
@@ -22,7 +22,7 @@
  * $Id$
  */
 
-#include "ScrollBarWidget.h"
+#include "gui/widgets/scrollbar.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
 
diff --git a/gui/ScrollBarWidget.h b/gui/widgets/scrollbar.h
similarity index 97%
rename from gui/ScrollBarWidget.h
rename to gui/widgets/scrollbar.h
index dd2b702686d..53a3369fb4d 100644
--- a/gui/ScrollBarWidget.h
+++ b/gui/widgets/scrollbar.h
@@ -22,8 +22,8 @@
  * $Id$
  */
 
-#ifndef SCROLLBARWIDGET_H
-#define SCROLLBARWIDGET_H
+#ifndef GUI_WIDGETS_SCROLLBAR_H
+#define GUI_WIDGETS_SCROLLBAR_H
 
 #include "gui/widget.h"
 
diff --git a/gui/TabWidget.cpp b/gui/widgets/tab.cpp
similarity index 99%
rename from gui/TabWidget.cpp
rename to gui/widgets/tab.cpp
index ca409e50ab7..48b4dab4308 100644
--- a/gui/TabWidget.cpp
+++ b/gui/widgets/tab.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "common/util.h"
-#include "gui/TabWidget.h"
+#include "gui/widgets/tab.h"
 #include "gui/dialog.h"
 #include "gui/GuiManager.h"
 
diff --git a/gui/TabWidget.h b/gui/widgets/tab.h
similarity index 97%
rename from gui/TabWidget.h
rename to gui/widgets/tab.h
index e7b8733d8fb..aec68cca0a5 100644
--- a/gui/TabWidget.h
+++ b/gui/widgets/tab.h
@@ -22,10 +22,10 @@
  * $Id$
  */
 
-#ifndef TABWIDGET_H
-#define TABWIDGET_H
+#ifndef GUI_WIDGETS_TAB_H
+#define GUI_WIDGETS_TAB_H
 
-#include "widget.h"
+#include "gui/widget.h"
 #include "common/str.h"
 #include "common/array.h"