33 files changed, 26 insertions, 26 deletions
diff --git a/backends/maemo/Makefile b/backends/platform/maemo/Makefile
index 75ae01c430..ca49a35f9c 100644
--- a/backends/maemo/Makefile
+++ b/backends/platform/maemo/Makefile
@@ -60,7 +60,7 @@ MODULE_DIRS += .
 
 
 BACKEND := sdl
-MODULES +=  backends/sdl base
+MODULES +=  backends/platform/sdl base
 MODULE_DIRS += .
 
 HAVE_GCC3 = 1
diff --git a/backends/maemo/hildon.cpp b/backends/platform/maemo/hildon.cpp
index 1c9bd9162a..1c9bd9162a 100644
--- a/backends/maemo/hildon.cpp
+++ b/backends/platform/maemo/hildon.cpp
diff --git a/backends/maemo/maemo-sdl.cpp b/backends/platform/maemo/maemo-sdl.cpp
index dfb6cb7048..dfb6cb7048 100644
--- a/backends/maemo/maemo-sdl.cpp
+++ b/backends/platform/maemo/maemo-sdl.cpp
diff --git a/backends/maemo/maemo-sdl.h b/backends/platform/maemo/maemo-sdl.h
index eff02df21f..e342ead5f9 100644
--- a/backends/maemo/maemo-sdl.h
+++ b/backends/platform/maemo/maemo-sdl.h
@@ -24,7 +24,7 @@
 #define MAEMO_SDL_H
 
 #include "common/stdafx.h"
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 
 //#include "CEkeys.h"
 
diff --git a/backends/maemo/main.cpp b/backends/platform/maemo/main.cpp
index 2631d35000..2631d35000 100644
--- a/backends/maemo/main.cpp
+++ b/backends/platform/maemo/main.cpp
diff --git a/backends/maemo/portdefs.h b/backends/platform/maemo/portdefs.h
index f825e5c4e2..f825e5c4e2 100644
--- a/backends/maemo/portdefs.h
+++ b/backends/platform/maemo/portdefs.h
diff --git a/backends/morphos/MorphOS.readme b/backends/platform/morphos/MorphOS.readme
index 201c8f32b8..201c8f32b8 100644
--- a/backends/morphos/MorphOS.readme
+++ b/backends/platform/morphos/MorphOS.readme
diff --git a/backends/morphos/build.rules b/backends/platform/morphos/build.rules
index 13b0033b8c..13b0033b8c 100644
--- a/backends/morphos/build.rules
+++ b/backends/platform/morphos/build.rules
diff --git a/backends/morphos/morphos.cpp b/backends/platform/morphos/morphos.cpp
index 889976afc4..889976afc4 100644
--- a/backends/morphos/morphos.cpp
+++ b/backends/platform/morphos/morphos.cpp
diff --git a/backends/morphos/morphos.h b/backends/platform/morphos/morphos.h
index 67ed8a481e..67ed8a481e 100644
--- a/backends/morphos/morphos.h
+++ b/backends/platform/morphos/morphos.h
diff --git a/backends/morphos/morphos_scaler.cpp b/backends/platform/morphos/morphos_scaler.cpp
index 46d4452c0b..46d4452c0b 100644
--- a/backends/morphos/morphos_scaler.cpp
+++ b/backends/platform/morphos/morphos_scaler.cpp
diff --git a/backends/morphos/morphos_scaler.h b/backends/platform/morphos/morphos_scaler.h
index d794e361a6..d794e361a6 100644
--- a/backends/morphos/morphos_scaler.h
+++ b/backends/platform/morphos/morphos_scaler.h
diff --git a/backends/morphos/morphos_sound.cpp b/backends/platform/morphos/morphos_sound.cpp
index c5c2f3b7ad..c5c2f3b7ad 100644
--- a/backends/morphos/morphos_sound.cpp
+++ b/backends/platform/morphos/morphos_sound.cpp
diff --git a/backends/morphos/morphos_sound.h b/backends/platform/morphos/morphos_sound.h
index a2d211a37f..a2d211a37f 100644
--- a/backends/morphos/morphos_sound.h
+++ b/backends/platform/morphos/morphos_sound.h
diff --git a/backends/morphos/morphos_start.cpp b/backends/platform/morphos/morphos_start.cpp
index ac5c16ad85..ac5c16ad85 100644
--- a/backends/morphos/morphos_start.cpp
+++ b/backends/platform/morphos/morphos_start.cpp
diff --git a/backends/morphos/morphos_timer.cpp b/backends/platform/morphos/morphos_timer.cpp
index b558c7fd66..b558c7fd66 100644
--- a/backends/morphos/morphos_timer.cpp
+++ b/backends/platform/morphos/morphos_timer.cpp
diff --git a/backends/morphos/morphos_timer.h b/backends/platform/morphos/morphos_timer.h
index 1ab3259b39..1ab3259b39 100644
--- a/backends/morphos/morphos_timer.h
+++ b/backends/platform/morphos/morphos_timer.h
diff --git a/backends/null/module.mk b/backends/platform/null/module.mk
index d8f2161a2e..12a2cbc510 100644
--- a/backends/null/module.mk
+++ b/backends/platform/null/module.mk
@@ -1,10 +1,10 @@
-MODULE := backends/null
+MODULE := backends/platform/null
 
 MODULE_OBJS := \
 	null.o
 
 MODULE_DIRS += \
-	backends/null/
+	backends/platform/null/
 
 # We don't use the rules.mk here on purpose
 OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
diff --git a/backends/null/null.cpp b/backends/platform/null/null.cpp
index f9943ef448..f9943ef448 100644
--- a/backends/null/null.cpp
+++ b/backends/platform/null/null.cpp
diff --git a/backends/sdl/build.rules b/backends/platform/sdl/build.rules
index 14cfe0ebdf..14cfe0ebdf 100644
--- a/backends/sdl/build.rules
+++ b/backends/platform/sdl/build.rules
diff --git a/backends/sdl/events.cpp b/backends/platform/sdl/events.cpp
index 3c296b8a45..4fa02907db 100644
--- a/backends/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 #include "common/util.h"
 
 // FIXME move joystick defines out and replace with confile file options
diff --git a/backends/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index 30c7a4aa9b..eb560c5769 100644
--- a/backends/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 #include "common/util.h"
 #include "graphics/font.h"
 #include "graphics/fontman.h"
diff --git a/backends/sdl/module.mk b/backends/platform/sdl/module.mk
index fd9e314076..18e56bc4fe 100644
--- a/backends/sdl/module.mk
+++ b/backends/platform/sdl/module.mk
@@ -1,4 +1,4 @@
-MODULE := backends/sdl
+MODULE := backends/platform/sdl
 
 MODULE_OBJS := \
 	events.o \
@@ -6,7 +6,7 @@ MODULE_OBJS := \
 	sdl.o
 
 MODULE_DIRS += \
-	backends/sdl/
+	backends/platform/sdl/
 
 # We don't use the rules.mk here on purpose
 OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
diff --git a/backends/sdl/sdl-common.h b/backends/platform/sdl/sdl-common.h
index f4c9383c63..f4c9383c63 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/platform/sdl/sdl-common.h
diff --git a/backends/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index dce70bc780..b6d2d675df 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 #include "common/config-manager.h"
 #include "common/util.h"
 #include "base/main.h"
diff --git a/backends/x11/build.rules b/backends/platform/x11/build.rules
index 1540d452d6..1540d452d6 100644
--- a/backends/x11/build.rules
+++ b/backends/platform/x11/build.rules
diff --git a/backends/x11/module.mk b/backends/platform/x11/module.mk
index 7350708299..22015b53be 100644
--- a/backends/x11/module.mk
+++ b/backends/platform/x11/module.mk
@@ -1,10 +1,10 @@
-MODULE := backends/x11
+MODULE := backends/platform/x11
 
 MODULE_OBJS := \
 	x11.o
 
 MODULE_DIRS += \
-	backends/x11/
+	backends/platform/x11/
 
 # We don't use the rules.mk here on purpose
 OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
diff --git a/backends/x11/x11.cpp b/backends/platform/x11/x11.cpp
index 8039bd8c26..ce020c7a8e 100644
--- a/backends/x11/x11.cpp
+++ b/backends/platform/x11/x11.cpp
@@ -29,6 +29,7 @@
 #include "common/util.h"
 #include "base/main.h"
 #include "backends/intern.h"
+#include "backends/platform/x11/x11.h"
 
 #include <stdio.h>
 #include <assert.h>
@@ -56,7 +57,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <backends/x11/x11.h>
 
 int main(int argc, char *argv[]) {
 	g_system = OSystem_X11::create(0, 0);
diff --git a/backends/x11/x11.h b/backends/platform/x11/x11.h
index ba29bc7eab..ba29bc7eab 100644
--- a/backends/x11/x11.h
+++ b/backends/platform/x11/x11.h
diff --git a/backends/symbian/src/SymbianOS.h b/backends/symbian/src/SymbianOS.h
index 4e8dbeb983..955f59c59c 100644
--- a/backends/symbian/src/SymbianOS.h
+++ b/backends/symbian/src/SymbianOS.h
@@ -25,7 +25,7 @@
 #ifndef SDLSYMBIANH
 #define SDLSYMBIANH
 
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 
 /** Vibration support */
 #ifdef USE_VIBRA_SE_PXXX
diff --git a/backends/wince/wince-sdl.h b/backends/wince/wince-sdl.h
index f9715272a5..ae1d252f2d 100644
--- a/backends/wince/wince-sdl.h
+++ b/backends/wince/wince-sdl.h
@@ -28,7 +28,7 @@
 #include "common/system.h"
 #include "graphics/scaler.h"
 #include "backends/intern.h"
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 
 #include "CEgui.h"
 #include "CEkeys.h"
diff --git a/configure b/configure
index 1102a44792..a308b4eb2c 100755
--- a/configure
+++ b/configure
@@ -1327,20 +1327,20 @@ fi
 case $_backend in
 	null)
 		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
-		MODULES="$MODULES backends/null"
+		MODULES="$MODULES backends/platform/null"
 		;;
 	sdl)
 		find_sdlconfig
 		INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
 		LIBS="$LIBS `$_sdlconfig --libs`"
-		MODULES="$MODULES backends/sdl"
+		MODULES="$MODULES backends/platform/sdl"
 		;;
 	x11)
 		INCLUDES="$INCLUDES -I/usr/X11R6/include"
 		LIBS="$LIBS -lpthread -lXext -lX11"
 		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/local/lib"
 		DEFINES="$DEFINES -DX11_BACKEND"
-		MODULES="$MODULES backends/x11"
+		MODULES="$MODULES backends/platform/x11"
 		;;
 	*)
 		echo "support for $_backend backend not implemented in configure script yet"
diff --git a/dists/devcpp/scummvm.dev b/dists/devcpp/scummvm.dev
index 7351a7edb4..6170a161d5 100644
--- a/dists/devcpp/scummvm.dev
+++ b/dists/devcpp/scummvm.dev
@@ -20,7 +20,7 @@ ObjectOutput=scummvm
 OverrideOutput=0
 OverrideOutputName=scummvm.exe
 HostApplication=
-Folders=backends,backends/fs,backends/fs/windows,backends/midi,backends/sdl,base,common,graphics,graphics/fonts,graphics/scaler,gui,sound,sound/softsynth,sound/softsynth/mt32
+Folders=backends,backends/fs,backends/fs/windows,backends/midi,backends/platform/sdl,base,common,graphics,graphics/fonts,graphics/scaler,gui,sound,sound/softsynth,sound/softsynth/mt32
 CommandLine=
 UseCustomMakefile=0
 CustomMakefile=
@@ -30,9 +30,9 @@ CompilerSet=0
 CompilerSettings=0000000000000000000000
 
 [Unit4]
-FileName=..\..\backends\sdl\sdl.cpp
+FileName=..\..\backends\platform\sdl\sdl.cpp
 CompileCpp=1
-Folder=backends/sdl
+Folder=backends/platform/sdl
 Compile=1
 Link=1
 Priority=1000
@@ -40,9 +40,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit5]
-FileName=..\..\backends\sdl\sdl-common.h
+FileName=..\..\backends\platform\sdl\sdl-common.h
 CompileCpp=1
-Folder=backends/sdl
+Folder=backends/platform/sdl
 Compile=1
 Link=1
 Priority=1000
@@ -1938,9 +1938,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit2]
-FileName=..\..\backends\sdl\events.cpp
+FileName=..\..\backends\platform\sdl\events.cpp
 CompileCpp=1
-Folder=backends/sdl
+Folder=backends/platform/sdl
 Compile=1
 Link=1
 Priority=1000
@@ -1948,9 +1948,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit3]
-FileName=..\..\backends\sdl\graphics.cpp
+FileName=..\..\backends\platform\sdl\graphics.cpp
 CompileCpp=1
-Folder=backends/sdl
+Folder=backends/platform/sdl
 Compile=1
 Link=1
 Priority=1000