Moved engines to the new engines/ directory

svn-id: r20582

531 files changed, 454 insertions, 454 deletions

diff --git a/Makefile b/Makefile
index 147d707087..b9f113a964 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ srcdir      ?= .
 
 DEFINES     := -DHAVE_CONFIG_H
 LDFLAGS     :=
-INCLUDES    := -I. -I$(srcdir)
+INCLUDES    := -I. -I$(srcdir) -I$(srcdir)/engines
 LIBS	    :=
 OBJS	    :=
 
diff --git a/Makefile.common b/Makefile.common
index 260403d328..1128067fa6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -36,7 +36,7 @@ MODULES := tools base $(MODULES)
 ifdef DISABLE_SCUMM
 DEFINES += -DDISABLE_SCUMM
 else
-MODULES += scumm
+MODULES += engines/scumm
 
 ifdef DISABLE_SCUMM_7_8
 DEFINES += -DDISABLE_SCUMM_7_8
@@ -51,55 +51,55 @@ endif
 ifdef DISABLE_SIMON
 DEFINES += -DDISABLE_SIMON
 else
-MODULES += simon
+MODULES += engines/simon
 endif
 
 ifdef DISABLE_SKY
 DEFINES += -DDISABLE_SKY
 else
-MODULES += sky
+MODULES += engines/sky
 endif
 
 ifdef DISABLE_SWORD1
 DEFINES += -DDISABLE_SWORD1
 else
-MODULES += sword1
+MODULES += engines/sword1
 endif
 
 ifdef DISABLE_SWORD2
 DEFINES += -DDISABLE_SWORD2
 else
-MODULES += sword2
+MODULES += engines/sword2
 endif
 
 ifdef DISABLE_QUEEN
 DEFINES += -DDISABLE_QUEEN
 else
-MODULES += queen
+MODULES += engines/queen
 endif
 
 ifdef DISABLE_SAGA
 DEFINES += -DDISABLE_SAGA
 else 
-MODULES += saga
+MODULES += engines/saga
 endif
 
 ifdef DISABLE_KYRA
 DEFINES += -DDISABLE_KYRA
 else 
-MODULES += kyra
+MODULES += engines/kyra
 endif
 
 ifdef DISABLE_GOB
 DEFINES += -DDISABLE_GOB
 else 
-MODULES += gob
+MODULES += engines/gob
 endif
 
 ifdef DISABLE_LURE
 DEFINES += -DDISABLE_LURE
 else
-MODULES += lure
+MODULES += engines/lure
 endif
 
 # After the game specific modules follow the shared modules
diff --git a/gob/anim.cpp b/engines/gob/anim.cpp
index a51befe3c8..a51befe3c8 100644
--- a/gob/anim.cpp
+++ b/engines/gob/anim.cpp
diff --git a/gob/anim.h b/engines/gob/anim.h
index f5252364b9..f5252364b9 100644
--- a/gob/anim.h
+++ b/engines/gob/anim.h
diff --git a/gob/cdrom.cpp b/engines/gob/cdrom.cpp
index bda2081404..bda2081404 100644
--- a/gob/cdrom.cpp
+++ b/engines/gob/cdrom.cpp
diff --git a/gob/cdrom.h b/engines/gob/cdrom.h
index 582a4a553a..582a4a553a 100644
--- a/gob/cdrom.h
+++ b/engines/gob/cdrom.h
diff --git a/gob/dataio.cpp b/engines/gob/dataio.cpp
index b66de4a497..b66de4a497 100644
--- a/gob/dataio.cpp
+++ b/engines/gob/dataio.cpp
diff --git a/gob/dataio.h b/engines/gob/dataio.h
index 9b28adfd10..9b28adfd10 100644
--- a/gob/dataio.h
+++ b/engines/gob/dataio.h
diff --git a/gob/draw.cpp b/engines/gob/draw.cpp
index f0e09a96ae..f0e09a96ae 100644
--- a/gob/draw.cpp
+++ b/engines/gob/draw.cpp
diff --git a/gob/draw.h b/engines/gob/draw.h
index 77fcd3f349..77fcd3f349 100644
--- a/gob/draw.h
+++ b/engines/gob/draw.h
diff --git a/gob/driver_vga.cpp b/engines/gob/driver_vga.cpp
index 3a2f44bc11..3a2f44bc11 100644
--- a/gob/driver_vga.cpp
+++ b/engines/gob/driver_vga.cpp
diff --git a/gob/driver_vga.h b/engines/gob/driver_vga.h
index de80b61c5f..de80b61c5f 100644
--- a/gob/driver_vga.h
+++ b/engines/gob/driver_vga.h
diff --git a/gob/game.cpp b/engines/gob/game.cpp
index 86544f0906..86544f0906 100644
--- a/gob/game.cpp
+++ b/engines/gob/game.cpp
diff --git a/gob/game.h b/engines/gob/game.h
index f1548d4386..f1548d4386 100644
--- a/gob/game.h
+++ b/engines/gob/game.h
diff --git a/gob/global.cpp b/engines/gob/global.cpp
index 0d732e1f2a..0d732e1f2a 100644
--- a/gob/global.cpp
+++ b/engines/gob/global.cpp
diff --git a/gob/global.h b/engines/gob/global.h
index 1583e711c8..1583e711c8 100644
--- a/gob/global.h
+++ b/engines/gob/global.h
diff --git a/gob/gob.cpp b/engines/gob/gob.cpp
index a3285b219f..a3285b219f 100644
--- a/gob/gob.cpp
+++ b/engines/gob/gob.cpp
diff --git a/gob/gob.h b/engines/gob/gob.h
index 211ec124ad..211ec124ad 100644
--- a/gob/gob.h
+++ b/engines/gob/gob.h
diff --git a/gob/goblin.cpp b/engines/gob/goblin.cpp
index f434c65a70..f434c65a70 100644
--- a/gob/goblin.cpp
+++ b/engines/gob/goblin.cpp
diff --git a/gob/goblin.h b/engines/gob/goblin.h
index 858bf247ae..858bf247ae 100644
--- a/gob/goblin.h
+++ b/engines/gob/goblin.h
diff --git a/gob/init.cpp b/engines/gob/init.cpp
index 43b6344499..43b6344499 100644
--- a/gob/init.cpp
+++ b/engines/gob/init.cpp
diff --git a/gob/init.h b/engines/gob/init.h
index 62cbb44f63..62cbb44f63 100644
--- a/gob/init.h
+++ b/engines/gob/init.h
diff --git a/gob/inter.cpp b/engines/gob/inter.cpp
index b17067411e..b17067411e 100644
--- a/gob/inter.cpp
+++ b/engines/gob/inter.cpp
diff --git a/gob/inter.h b/engines/gob/inter.h
index ed55dfbcc3..ed55dfbcc3 100644
--- a/gob/inter.h
+++ b/engines/gob/inter.h
diff --git a/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 747a852c19..747a852c19 100644
--- a/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
diff --git a/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 672a662670..672a662670 100644
--- a/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
diff --git a/gob/map.cpp b/engines/gob/map.cpp
index ed08d1d401..ed08d1d401 100644
--- a/gob/map.cpp
+++ b/engines/gob/map.cpp
diff --git a/gob/map.h b/engines/gob/map.h
index 59e9a3bdf9..59e9a3bdf9 100644
--- a/gob/map.h
+++ b/engines/gob/map.h
diff --git a/engines/gob/module.mk b/engines/gob/module.mk
new file mode 100644
index 0000000000..c8188d78b2
--- /dev/null
+++ b/engines/gob/module.mk
@@ -0,0 +1,40 @@
+MODULE := engines/gob
+
+MODULE_OBJS := \
+	engines/gob/anim.o \
+	engines/gob/cdrom.o \
+	engines/gob/dataio.o \
+	engines/gob/draw.o \
+	engines/gob/driver_vga.o \
+	engines/gob/game.o \
+	engines/gob/global.o \
+	engines/gob/gob.o \
+	engines/gob/goblin.o \
+	engines/gob/init.o \
+	engines/gob/inter.o \
+	engines/gob/inter_v1.o \
+	engines/gob/inter_v2.o \
+	engines/gob/map.o \
+	engines/gob/mult.o \
+	engines/gob/music.o \
+	engines/gob/pack.o \
+	engines/gob/palanim.o \
+	engines/gob/parse.o \
+	engines/gob/parse_v1.o \
+	engines/gob/parse_v2.o \
+	engines/gob/scenery.o \
+	engines/gob/sound.o \
+	engines/gob/timer.o \
+	engines/gob/util.o \
+	engines/gob/video.o
+
+MODULE_DIRS += \
+	engines/gob
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
diff --git a/gob/mult.cpp b/engines/gob/mult.cpp
index 96bffa80d1..96bffa80d1 100644
--- a/gob/mult.cpp
+++ b/engines/gob/mult.cpp
diff --git a/gob/mult.h b/engines/gob/mult.h
index 992c01cba3..992c01cba3 100644
--- a/gob/mult.h
+++ b/engines/gob/mult.h
diff --git a/gob/music.cpp b/engines/gob/music.cpp
index 3fbb37160f..3fbb37160f 100644
--- a/gob/music.cpp
+++ b/engines/gob/music.cpp
diff --git a/gob/music.h b/engines/gob/music.h
index e6421ea32c..e6421ea32c 100644
--- a/gob/music.h
+++ b/engines/gob/music.h
diff --git a/gob/pack.cpp b/engines/gob/pack.cpp
index c255a70ace..c255a70ace 100644
--- a/gob/pack.cpp
+++ b/engines/gob/pack.cpp
diff --git a/gob/pack.h b/engines/gob/pack.h
index 9df0d97b24..9df0d97b24 100644
--- a/gob/pack.h
+++ b/engines/gob/pack.h
diff --git a/gob/palanim.cpp b/engines/gob/palanim.cpp
index 7946639c4e..7946639c4e 100644
--- a/gob/palanim.cpp
+++ b/engines/gob/palanim.cpp
diff --git a/gob/palanim.h b/engines/gob/palanim.h
index 8bc661a052..8bc661a052 100644
--- a/gob/palanim.h
+++ b/engines/gob/palanim.h
diff --git a/gob/parse.cpp b/engines/gob/parse.cpp
index 45de528adb..45de528adb 100644
--- a/gob/parse.cpp
+++ b/engines/gob/parse.cpp
diff --git a/gob/parse.h b/engines/gob/parse.h
index e85fbebcfa..e85fbebcfa 100644
--- a/gob/parse.h
+++ b/engines/gob/parse.h
diff --git a/gob/parse_v1.cpp b/engines/gob/parse_v1.cpp
index fc0dc91d5b..fc0dc91d5b 100644
--- a/gob/parse_v1.cpp
+++ b/engines/gob/parse_v1.cpp
diff --git a/gob/parse_v2.cpp b/engines/gob/parse_v2.cpp
index d4dfdc863f..d4dfdc863f 100644
--- a/gob/parse_v2.cpp
+++ b/engines/gob/parse_v2.cpp
diff --git a/gob/scenery.cpp b/engines/gob/scenery.cpp
index 6061e75272..6061e75272 100644
--- a/gob/scenery.cpp
+++ b/engines/gob/scenery.cpp
diff --git a/gob/scenery.h b/engines/gob/scenery.h
index 119055f7bd..119055f7bd 100644
--- a/gob/scenery.h
+++ b/engines/gob/scenery.h
diff --git a/gob/sound.cpp b/engines/gob/sound.cpp
index 51c36ef22a..51c36ef22a 100644
--- a/gob/sound.cpp
+++ b/engines/gob/sound.cpp
diff --git a/gob/sound.h b/engines/gob/sound.h
index 169c2e03a4..169c2e03a4 100644
--- a/gob/sound.h
+++ b/engines/gob/sound.h
diff --git a/gob/timer.cpp b/engines/gob/timer.cpp
index 0b3bc06588..0b3bc06588 100644
--- a/gob/timer.cpp
+++ b/engines/gob/timer.cpp
diff --git a/gob/timer.h b/engines/gob/timer.h
index d47d20b376..d47d20b376 100644
--- a/gob/timer.h
+++ b/engines/gob/timer.h
diff --git a/gob/util.cpp b/engines/gob/util.cpp
index 7e6996f00f..7e6996f00f 100644
--- a/gob/util.cpp
+++ b/engines/gob/util.cpp
diff --git a/gob/util.h b/engines/gob/util.h
index 1e707b42c1..1e707b42c1 100644
--- a/gob/util.h
+++ b/engines/gob/util.h
diff --git a/gob/video.cpp b/engines/gob/video.cpp
index 83259c068d..83259c068d 100644
--- a/gob/video.cpp
+++ b/engines/gob/video.cpp
diff --git a/gob/video.h b/engines/gob/video.h
index 58c6bdb3c2..58c6bdb3c2 100644
--- a/gob/video.h
+++ b/engines/gob/video.h
diff --git a/kyra/animator.cpp b/engines/kyra/animator.cpp
index e5c5c431c8..e5c5c431c8 100644
--- a/kyra/animator.cpp
+++ b/engines/kyra/animator.cpp
diff --git a/kyra/animator.h b/engines/kyra/animator.h
index ecc80d1819..ecc80d1819 100644
--- a/kyra/animator.h
+++ b/engines/kyra/animator.h
diff --git a/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index b78056e3ad..b78056e3ad 100644
--- a/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
diff --git a/kyra/debugger.h b/engines/kyra/debugger.h
index 69766f3fc0..69766f3fc0 100644
--- a/kyra/debugger.h
+++ b/engines/kyra/debugger.h
diff --git a/kyra/gui.cpp b/engines/kyra/gui.cpp
index a1deccdfcd..a1deccdfcd 100644
--- a/kyra/gui.cpp
+++ b/engines/kyra/gui.cpp
diff --git a/kyra/items.cpp b/engines/kyra/items.cpp
index c98e1ee607..c98e1ee607 100644
--- a/kyra/items.cpp
+++ b/engines/kyra/items.cpp
diff --git a/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index c85ce9b323..c85ce9b323 100644
--- a/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
diff --git a/kyra/kyra.h b/engines/kyra/kyra.h
index f1112fa799..f1112fa799 100644
--- a/kyra/kyra.h
+++ b/engines/kyra/kyra.h
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
new file mode 100644
index 0000000000..943c628831
--- /dev/null
+++ b/engines/kyra/module.mk
@@ -0,0 +1,33 @@
+MODULE := engines/kyra
+
+MODULE_OBJS := \
+	engines/kyra/kyra.o \
+	engines/kyra/resource.o \
+	engines/kyra/screen.o \
+	engines/kyra/script_v1.o \
+	engines/kyra/script.o \
+	engines/kyra/seqplayer.o \
+	engines/kyra/sound.o \
+	engines/kyra/staticres.o \
+	engines/kyra/sprites.o \
+	engines/kyra/wsamovie.o \
+	engines/kyra/debugger.o \
+	engines/kyra/animator.o \
+	engines/kyra/gui.o \
+	engines/kyra/sequences_v1.o \
+	engines/kyra/items.o \
+	engines/kyra/scene.o \
+	engines/kyra/text.o \
+	engines/kyra/timer.o \
+	engines/kyra/saveload.o
+
+MODULE_DIRS += \
+	engines/kyra
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
diff --git a/kyra/resource.cpp b/engines/kyra/resource.cpp
index 0dd76ff5de..0dd76ff5de 100644
--- a/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
diff --git a/kyra/resource.h b/engines/kyra/resource.h
index 1a479c0b73..1a479c0b73 100644
--- a/kyra/resource.h
+++ b/engines/kyra/resource.h
diff --git a/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index fcc6dbfe66..fcc6dbfe66 100644
--- a/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
diff --git a/kyra/scene.cpp b/engines/kyra/scene.cpp
index a94050a296..a94050a296 100644
--- a/kyra/scene.cpp
+++ b/engines/kyra/scene.cpp
diff --git a/kyra/screen.cpp b/engines/kyra/screen.cpp
index 4bf2d8da75..4bf2d8da75 100644
--- a/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
diff --git a/kyra/screen.h b/engines/kyra/screen.h
index 0f2c59cbea..0f2c59cbea 100644
--- a/kyra/screen.h
+++ b/engines/kyra/screen.h
diff --git a/kyra/script.cpp b/engines/kyra/script.cpp
index b43766dba7..b43766dba7 100644
--- a/kyra/script.cpp
+++ b/engines/kyra/script.cpp
diff --git a/kyra/script.h b/engines/kyra/script.h
index 28f5170422..28f5170422 100644
--- a/kyra/script.h
+++ b/engines/kyra/script.h
diff --git a/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index 08ff4a6d9f..08ff4a6d9f 100644
--- a/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
diff --git a/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp
index fab2228c8a..fab2228c8a 100644
--- a/kyra/seqplayer.cpp
+++ b/engines/kyra/seqplayer.cpp
diff --git a/kyra/seqplayer.h b/engines/kyra/seqplayer.h
index ad747238c5..ad747238c5 100644
--- a/kyra/seqplayer.h
+++ b/engines/kyra/seqplayer.h
diff --git a/kyra/sequences_v1.cpp b/engines/kyra/sequences_v1.cpp
index 8b60196763..8b60196763 100644
--- a/kyra/sequences_v1.cpp
+++ b/engines/kyra/sequences_v1.cpp
diff --git a/kyra/sound.cpp b/engines/kyra/sound.cpp
index 48e59a5d15..48e59a5d15 100644
--- a/kyra/sound.cpp
+++ b/engines/kyra/sound.cpp
diff --git a/kyra/sound.h b/engines/kyra/sound.h
index 7af201cd9f..7af201cd9f 100644
--- a/kyra/sound.h
+++ b/engines/kyra/sound.h
diff --git a/kyra/sprites.cpp b/engines/kyra/sprites.cpp
index d1f9d00fd6..d1f9d00fd6 100644
--- a/kyra/sprites.cpp
+++ b/engines/kyra/sprites.cpp
diff --git a/kyra/sprites.h b/engines/kyra/sprites.h
index b1ce9ae8e7..b1ce9ae8e7 100644
--- a/kyra/sprites.h
+++ b/engines/kyra/sprites.h
diff --git a/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 66e10358c3..66e10358c3 100644
--- a/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
diff --git a/kyra/text.cpp b/engines/kyra/text.cpp
index 2877687682..2877687682 100644
--- a/kyra/text.cpp
+++ b/engines/kyra/text.cpp
diff --git a/kyra/text.h b/engines/kyra/text.h
index f8f7c975a6..f8f7c975a6 100644
--- a/kyra/text.h
+++ b/engines/kyra/text.h
diff --git a/kyra/timer.cpp b/engines/kyra/timer.cpp
index 7abfd9fcbc..7abfd9fcbc 100644
--- a/kyra/timer.cpp
+++ b/engines/kyra/timer.cpp
diff --git a/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp
index 17fe3f8cb2..17fe3f8cb2 100644
--- a/kyra/wsamovie.cpp
+++ b/engines/kyra/wsamovie.cpp
diff --git a/kyra/wsamovie.h b/engines/kyra/wsamovie.h
index fe3927f175..fe3927f175 100644
--- a/kyra/wsamovie.h
+++ b/engines/kyra/wsamovie.h
diff --git a/lure/animseq.cpp b/engines/lure/animseq.cpp
index c5ca90afd1..c5ca90afd1 100644
--- a/lure/animseq.cpp
+++ b/engines/lure/animseq.cpp
diff --git a/lure/animseq.h b/engines/lure/animseq.h
index fb6387a85d..fb6387a85d 100644
--- a/lure/animseq.h
+++ b/engines/lure/animseq.h
diff --git a/lure/debug-input.cpp b/engines/lure/debug-input.cpp
index 9c6d7bf707..9c6d7bf707 100644
--- a/lure/debug-input.cpp
+++ b/engines/lure/debug-input.cpp
diff --git a/lure/debug-input.h b/engines/lure/debug-input.h
index ec820d6745..ec820d6745 100644
--- a/lure/debug-input.h
+++ b/engines/lure/debug-input.h
diff --git a/lure/debug-methods.cpp b/engines/lure/debug-methods.cpp
index 2fda7a57dc..2fda7a57dc 100644
--- a/lure/debug-methods.cpp
+++ b/engines/lure/debug-methods.cpp
diff --git a/lure/debug-methods.h b/engines/lure/debug-methods.h
index 72e31b571b..72e31b571b 100644
--- a/lure/debug-methods.h
+++ b/engines/lure/debug-methods.h
diff --git a/lure/decode.cpp b/engines/lure/decode.cpp
index c04e4dca5b..c04e4dca5b 100644
--- a/lure/decode.cpp
+++ b/engines/lure/decode.cpp
diff --git a/lure/decode.h b/engines/lure/decode.h
index 4f2994d424..4f2994d424 100644
--- a/lure/decode.h
+++ b/engines/lure/decode.h
diff --git a/lure/disk.cpp b/engines/lure/disk.cpp
index e996ff6ecc..e996ff6ecc 100644
--- a/lure/disk.cpp
+++ b/engines/lure/disk.cpp
diff --git a/lure/disk.h b/engines/lure/disk.h
index 9ce1c977ae..9ce1c977ae 100644
--- a/lure/disk.h
+++ b/engines/lure/disk.h
diff --git a/lure/events.cpp b/engines/lure/events.cpp
index 1d8ce03b42..1d8ce03b42 100644
--- a/lure/events.cpp
+++ b/engines/lure/events.cpp
diff --git a/lure/events.h b/engines/lure/events.h
index 9e6e9c540c..9e6e9c540c 100644
--- a/lure/events.h
+++ b/engines/lure/events.h
diff --git a/lure/game.cpp b/engines/lure/game.cpp
index 2cc3e39b42..2cc3e39b42 100644
--- a/lure/game.cpp
+++ b/engines/lure/game.cpp
diff --git a/lure/game.h b/engines/lure/game.h
index d1957a6201..d1957a6201 100644
--- a/lure/game.h
+++ b/engines/lure/game.h
diff --git a/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index e7df938d47..e7df938d47 100644
--- a/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
diff --git a/lure/hotspots.h b/engines/lure/hotspots.h
index 3483522c96..3483522c96 100644
--- a/lure/hotspots.h
+++ b/engines/lure/hotspots.h
diff --git a/lure/intro.cpp b/engines/lure/intro.cpp
index 58bca80239..58bca80239 100644
--- a/lure/intro.cpp
+++ b/engines/lure/intro.cpp
diff --git a/lure/intro.h b/engines/lure/intro.h
index d7934d938a..d7934d938a 100644
--- a/lure/intro.h
+++ b/engines/lure/intro.h
diff --git a/lure/lure.cpp b/engines/lure/lure.cpp
index 3adc27eea9..3adc27eea9 100644
--- a/lure/lure.cpp
+++ b/engines/lure/lure.cpp
diff --git a/lure/lure.h b/engines/lure/lure.h
index 0a923cb72b..0a923cb72b 100644
--- a/lure/lure.h
+++ b/engines/lure/lure.h
diff --git a/lure/luredefs.h b/engines/lure/luredefs.h
index d4175ce863..d4175ce863 100644
--- a/lure/luredefs.h
+++ b/engines/lure/luredefs.h
diff --git a/lure/memory.cpp b/engines/lure/memory.cpp
index 2a24101dd3..2a24101dd3 100644
--- a/lure/memory.cpp
+++ b/engines/lure/memory.cpp
diff --git a/lure/memory.h b/engines/lure/memory.h
index c2f735ca2b..c2f735ca2b 100644
--- a/lure/memory.h
+++ b/engines/lure/memory.h
diff --git a/lure/menu.cpp b/engines/lure/menu.cpp
index 752b11f339..752b11f339 100644
--- a/lure/menu.cpp
+++ b/engines/lure/menu.cpp
diff --git a/lure/menu.h b/engines/lure/menu.h
index 96c6a1b2fd..96c6a1b2fd 100644
--- a/lure/menu.h
+++ b/engines/lure/menu.h
diff --git a/engines/lure/module.mk b/engines/lure/module.mk
new file mode 100644
index 0000000000..8b83531bd7
--- /dev/null
+++ b/engines/lure/module.mk
@@ -0,0 +1,36 @@
+MODULE := engines/lure
+
+MODULE_OBJS := \
+	engines/lure/animseq.o \
+	engines/lure/debug-input.o \
+	engines/lure/debug-methods.o \
+	engines/lure/decode.o \
+	engines/lure/disk.o \
+	engines/lure/events.o \
+	engines/lure/game.o \
+	engines/lure/hotspots.o \
+	engines/lure/intro.o \
+	engines/lure/lure.o \
+	engines/lure/memory.o \
+	engines/lure/menu.o \
+	engines/lure/palette.o \
+	engines/lure/res.o \
+	engines/lure/res_struct.o \
+	engines/lure/room.o \
+	engines/lure/screen.o \
+	engines/lure/scripts.o \
+	engines/lure/strings.o \
+	engines/lure/surface.o \
+	engines/lure/system.o
+
+MODULE_DIRS += \
+	engines/lure
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
+
diff --git a/lure/palette.cpp b/engines/lure/palette.cpp
index e4d8db0a41..e4d8db0a41 100644
--- a/lure/palette.cpp
+++ b/engines/lure/palette.cpp
diff --git a/lure/palette.h b/engines/lure/palette.h
index 6fa2d9a1b7..6fa2d9a1b7 100644
--- a/lure/palette.h
+++ b/engines/lure/palette.h
diff --git a/lure/res.cpp b/engines/lure/res.cpp
index 929b983f68..929b983f68 100644
--- a/lure/res.cpp
+++ b/engines/lure/res.cpp
diff --git a/lure/res.h b/engines/lure/res.h
index 66af55170f..66af55170f 100644
--- a/lure/res.h
+++ b/engines/lure/res.h
diff --git a/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index db01a471cd..db01a471cd 100644
--- a/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
diff --git a/lure/res_struct.h b/engines/lure/res_struct.h
index 418fb9fbdd..418fb9fbdd 100644
--- a/lure/res_struct.h
+++ b/engines/lure/res_struct.h
diff --git a/lure/room.cpp b/engines/lure/room.cpp
index 748ffccd28..748ffccd28 100644
--- a/lure/room.cpp
+++ b/engines/lure/room.cpp
diff --git a/lure/room.h b/engines/lure/room.h
index 8553722cda..8553722cda 100644
--- a/lure/room.h
+++ b/engines/lure/room.h
diff --git a/lure/screen.cpp b/engines/lure/screen.cpp
index ad84c9e838..ad84c9e838 100644
--- a/lure/screen.cpp
+++ b/engines/lure/screen.cpp
diff --git a/lure/screen.h b/engines/lure/screen.h
index 064fec0e96..064fec0e96 100644
--- a/lure/screen.h
+++ b/engines/lure/screen.h
diff --git a/lure/scripts.cpp b/engines/lure/scripts.cpp
index 073753a93f..073753a93f 100644
--- a/lure/scripts.cpp
+++ b/engines/lure/scripts.cpp
diff --git a/lure/scripts.h b/engines/lure/scripts.h
index b8ed59b15d..b8ed59b15d 100644
--- a/lure/scripts.h
+++ b/engines/lure/scripts.h
diff --git a/lure/strings.cpp b/engines/lure/strings.cpp
index d509e3842d..d509e3842d 100644
--- a/lure/strings.cpp
+++ b/engines/lure/strings.cpp
diff --git a/lure/strings.h b/engines/lure/strings.h
index 03c1da2440..03c1da2440 100644
--- a/lure/strings.h
+++ b/engines/lure/strings.h
diff --git a/lure/surface.cpp b/engines/lure/surface.cpp
index e254cfe501..e254cfe501 100644
--- a/lure/surface.cpp
+++ b/engines/lure/surface.cpp
diff --git a/lure/surface.h b/engines/lure/surface.h
index 9febf542f5..9febf542f5 100644
--- a/lure/surface.h
+++ b/engines/lure/surface.h
diff --git a/lure/system.cpp b/engines/lure/system.cpp
index 6b305edc57..6b305edc57 100644
--- a/lure/system.cpp
+++ b/engines/lure/system.cpp
diff --git a/lure/system.h b/engines/lure/system.h
index 8d7471a296..8d7471a296 100644
--- a/lure/system.h
+++ b/engines/lure/system.h
diff --git a/queen/bankman.cpp b/engines/queen/bankman.cpp
index 18ad276d0f..18ad276d0f 100644
--- a/queen/bankman.cpp
+++ b/engines/queen/bankman.cpp
diff --git a/queen/bankman.h b/engines/queen/bankman.h
index 63eb9224ff..63eb9224ff 100644
--- a/queen/bankman.h
+++ b/engines/queen/bankman.h
diff --git a/queen/command.cpp b/engines/queen/command.cpp
index a84d859fe6..a84d859fe6 100644
--- a/queen/command.cpp
+++ b/engines/queen/command.cpp
diff --git a/queen/command.h b/engines/queen/command.h
index 3ef848b24d..3ef848b24d 100644
--- a/queen/command.h
+++ b/engines/queen/command.h
diff --git a/queen/credits.cpp b/engines/queen/credits.cpp
index a88c67e587..a88c67e587 100644
--- a/queen/credits.cpp
+++ b/engines/queen/credits.cpp
diff --git a/queen/credits.h b/engines/queen/credits.h
index 4f34772c28..4f34772c28 100644
--- a/queen/credits.h
+++ b/engines/queen/credits.h
diff --git a/queen/cutaway.cpp b/engines/queen/cutaway.cpp
index dc24d5b627..dc24d5b627 100644
--- a/queen/cutaway.cpp
+++ b/engines/queen/cutaway.cpp
diff --git a/queen/cutaway.h b/engines/queen/cutaway.h
index bbf5ec0652..bbf5ec0652 100644
--- a/queen/cutaway.h
+++ b/engines/queen/cutaway.h
diff --git a/queen/debug.cpp b/engines/queen/debug.cpp
index 63fc40f444..63fc40f444 100644
--- a/queen/debug.cpp
+++ b/engines/queen/debug.cpp
diff --git a/queen/debug.h b/engines/queen/debug.h
index 40cb8bb6ff..40cb8bb6ff 100644
--- a/queen/debug.h
+++ b/engines/queen/debug.h
diff --git a/queen/defs.h b/engines/queen/defs.h
index 223e539894..223e539894 100644
--- a/queen/defs.h
+++ b/engines/queen/defs.h
diff --git a/queen/display.cpp b/engines/queen/display.cpp
index d56e472e30..d56e472e30 100644
--- a/queen/display.cpp
+++ b/engines/queen/display.cpp
diff --git a/queen/display.h b/engines/queen/display.h
index 87608a57e3..87608a57e3 100644
--- a/queen/display.h
+++ b/engines/queen/display.h
diff --git a/queen/graphics.cpp b/engines/queen/graphics.cpp
index be2f8d6017..be2f8d6017 100644
--- a/queen/graphics.cpp
+++ b/engines/queen/graphics.cpp
diff --git a/queen/graphics.h b/engines/queen/graphics.h
index b2899a5036..b2899a5036 100644
--- a/queen/graphics.h
+++ b/engines/queen/graphics.h
diff --git a/queen/grid.cpp b/engines/queen/grid.cpp
index cb8ed4696b..cb8ed4696b 100644
--- a/queen/grid.cpp
+++ b/engines/queen/grid.cpp
diff --git a/queen/grid.h b/engines/queen/grid.h
index d6e148eec2..d6e148eec2 100644
--- a/queen/grid.h
+++ b/engines/queen/grid.h
diff --git a/queen/input.cpp b/engines/queen/input.cpp
index 7ae2e2abce..7ae2e2abce 100644
--- a/queen/input.cpp
+++ b/engines/queen/input.cpp
diff --git a/queen/input.h b/engines/queen/input.h
index d1e86016c9..d1e86016c9 100644
--- a/queen/input.h
+++ b/engines/queen/input.h
diff --git a/queen/journal.cpp b/engines/queen/journal.cpp
index 0aeb71e083..0aeb71e083 100644
--- a/queen/journal.cpp
+++ b/engines/queen/journal.cpp
diff --git a/queen/journal.h b/engines/queen/journal.h
index ab3e2a0ecd..ab3e2a0ecd 100644
--- a/queen/journal.h
+++ b/engines/queen/journal.h
diff --git a/queen/logic.cpp b/engines/queen/logic.cpp
index a535907dd9..a535907dd9 100644
--- a/queen/logic.cpp
+++ b/engines/queen/logic.cpp
diff --git a/queen/logic.h b/engines/queen/logic.h
index f1f93de17e..f1f93de17e 100644
--- a/queen/logic.h
+++ b/engines/queen/logic.h
diff --git a/engines/queen/module.mk b/engines/queen/module.mk
new file mode 100644
index 0000000000..be3c5707e6
--- /dev/null
+++ b/engines/queen/module.mk
@@ -0,0 +1,34 @@
+MODULE := engines/queen
+
+MODULE_OBJS := \
+	engines/queen/bankman.o \
+	engines/queen/command.o \
+	engines/queen/credits.o \
+	engines/queen/cutaway.o \
+	engines/queen/debug.o \
+	engines/queen/display.o \
+	engines/queen/graphics.o \
+	engines/queen/grid.o \
+	engines/queen/input.o \
+	engines/queen/journal.o \
+	engines/queen/logic.o \
+	engines/queen/music.o \
+	engines/queen/musicdata.o \
+	engines/queen/queen.o \
+	engines/queen/resource.o \
+	engines/queen/restables.o \
+	engines/queen/sound.o \
+	engines/queen/state.o \
+	engines/queen/talk.o \
+	engines/queen/walk.o
+
+MODULE_DIRS += \
+	engines/queen
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
diff --git a/queen/music.cpp b/engines/queen/music.cpp
index c4a7a24503..c4a7a24503 100644
--- a/queen/music.cpp
+++ b/engines/queen/music.cpp
diff --git a/queen/music.h b/engines/queen/music.h
index 1051b8b988..1051b8b988 100644
--- a/queen/music.h
+++ b/engines/queen/music.h
diff --git a/queen/musicdata.cpp b/engines/queen/musicdata.cpp
index 39acdf8ab4..39acdf8ab4 100644
--- a/queen/musicdata.cpp
+++ b/engines/queen/musicdata.cpp
diff --git a/queen/queen.cpp b/engines/queen/queen.cpp
index e6c6f39269..e6c6f39269 100644
--- a/queen/queen.cpp
+++ b/engines/queen/queen.cpp
diff --git a/queen/queen.h b/engines/queen/queen.h
index 91c657cf14..91c657cf14 100644
--- a/queen/queen.h
+++ b/engines/queen/queen.h
diff --git a/queen/resource.cpp b/engines/queen/resource.cpp
index 51fa47b687..51fa47b687 100644
--- a/queen/resource.cpp
+++ b/engines/queen/resource.cpp
diff --git a/queen/resource.h b/engines/queen/resource.h
index e205490eca..e205490eca 100644
--- a/queen/resource.h
+++ b/engines/queen/resource.h
diff --git a/queen/restables.cpp b/engines/queen/restables.cpp
index 8cebaccf49..8cebaccf49 100644
--- a/queen/restables.cpp
+++ b/engines/queen/restables.cpp
diff --git a/queen/sound.cpp b/engines/queen/sound.cpp
index a5c756e366..a5c756e366 100644
--- a/queen/sound.cpp
+++ b/engines/queen/sound.cpp
diff --git a/queen/sound.h b/engines/queen/sound.h
index d12032e994..d12032e994 100644
--- a/queen/sound.h
+++ b/engines/queen/sound.h
diff --git a/queen/state.cpp b/engines/queen/state.cpp
index 5709bb07c6..5709bb07c6 100644
--- a/queen/state.cpp
+++ b/engines/queen/state.cpp
diff --git a/queen/state.h b/engines/queen/state.h
index d7be47fbc8..d7be47fbc8 100644
--- a/queen/state.h
+++ b/engines/queen/state.h
diff --git a/queen/structs.h b/engines/queen/structs.h
index 4f43950fa4..4f43950fa4 100644
--- a/queen/structs.h
+++ b/engines/queen/structs.h
diff --git a/queen/talk.cpp b/engines/queen/talk.cpp
index 27399ab0cf..27399ab0cf 100644
--- a/queen/talk.cpp
+++ b/engines/queen/talk.cpp
diff --git a/queen/talk.h b/engines/queen/talk.h
index d1469e2fe8..d1469e2fe8 100644
--- a/queen/talk.h
+++ b/engines/queen/talk.h
diff --git a/queen/walk.cpp b/engines/queen/walk.cpp
index 69854b373a..69854b373a 100644
--- a/queen/walk.cpp
+++ b/engines/queen/walk.cpp
diff --git a/queen/walk.h b/engines/queen/walk.h
index 02c8264db9..02c8264db9 100644
--- a/queen/walk.h
+++ b/engines/queen/walk.h
diff --git a/queen/xref.txt b/engines/queen/xref.txt
index 55067aa922..55067aa922 100644
--- a/queen/xref.txt
+++ b/engines/queen/xref.txt
diff --git a/saga/actor.cpp b/engines/saga/actor.cpp
index cc89f0ef2a..cc89f0ef2a 100644
--- a/saga/actor.cpp
+++ b/engines/saga/actor.cpp
diff --git a/saga/actor.h b/engines/saga/actor.h
index 74f1abd689..74f1abd689 100644
--- a/saga/actor.h
+++ b/engines/saga/actor.h
diff --git a/saga/animation.cpp b/engines/saga/animation.cpp
index 016070dc50..016070dc50 100644
--- a/saga/animation.cpp
+++ b/engines/saga/animation.cpp
diff --git a/saga/animation.h b/engines/saga/animation.h
index 191166732a..191166732a 100644
--- a/saga/animation.h
+++ b/engines/saga/animation.h
diff --git a/saga/console.cpp b/engines/saga/console.cpp
index 3455c8c1c3..3455c8c1c3 100644
--- a/saga/console.cpp
+++ b/engines/saga/console.cpp
diff --git a/saga/console.h b/engines/saga/console.h
index c93373960f..c93373960f 100644
--- a/saga/console.h
+++ b/engines/saga/console.h
diff --git a/saga/events.cpp b/engines/saga/events.cpp
index 0d1da65efb..0d1da65efb 100644
--- a/saga/events.cpp
+++ b/engines/saga/events.cpp
diff --git a/saga/events.h b/engines/saga/events.h
index d89b3d89f5..d89b3d89f5 100644
--- a/saga/events.h
+++ b/engines/saga/events.h
diff --git a/saga/font.cpp b/engines/saga/font.cpp
index 9a91bf4872..9a91bf4872 100644
--- a/saga/font.cpp
+++ b/engines/saga/font.cpp
diff --git a/saga/font.h b/engines/saga/font.h
index f7f2113808..f7f2113808 100644
--- a/saga/font.h
+++ b/engines/saga/font.h
diff --git a/saga/font_map.cpp b/engines/saga/font_map.cpp
index 04e3400b2e..04e3400b2e 100644
--- a/saga/font_map.cpp
+++ b/engines/saga/font_map.cpp
diff --git a/saga/game.cpp b/engines/saga/game.cpp
index 86526fe267..86526fe267 100644
--- a/saga/game.cpp
+++ b/engines/saga/game.cpp
diff --git a/saga/gfx.cpp b/engines/saga/gfx.cpp
index 4de8c52de2..4de8c52de2 100644
--- a/saga/gfx.cpp
+++ b/engines/saga/gfx.cpp
diff --git a/saga/gfx.h b/engines/saga/gfx.h
index ff96cbf081..ff96cbf081 100644
--- a/saga/gfx.h
+++ b/engines/saga/gfx.h
diff --git a/saga/ihnm_introproc.cpp b/engines/saga/ihnm_introproc.cpp
index 881625c170..881625c170 100644
--- a/saga/ihnm_introproc.cpp
+++ b/engines/saga/ihnm_introproc.cpp
diff --git a/saga/image.cpp b/engines/saga/image.cpp
index b7ac53f179..b7ac53f179 100644
--- a/saga/image.cpp
+++ b/engines/saga/image.cpp
diff --git a/saga/input.cpp b/engines/saga/input.cpp
index 0abce03a31..0abce03a31 100644
--- a/saga/input.cpp
+++ b/engines/saga/input.cpp
diff --git a/saga/interface.cpp b/engines/saga/interface.cpp
index 1d3b110068..1d3b110068 100644
--- a/saga/interface.cpp
+++ b/engines/saga/interface.cpp
diff --git a/saga/interface.h b/engines/saga/interface.h
index bee3fd4a2a..bee3fd4a2a 100644
--- a/saga/interface.h
+++ b/engines/saga/interface.h
diff --git a/saga/isomap.cpp b/engines/saga/isomap.cpp
index 6acbf8ba70..6acbf8ba70 100644
--- a/saga/isomap.cpp
+++ b/engines/saga/isomap.cpp
diff --git a/saga/isomap.h b/engines/saga/isomap.h
index 9264c20fbe..9264c20fbe 100644
--- a/saga/isomap.h
+++ b/engines/saga/isomap.h
diff --git a/saga/ite_introproc.cpp b/engines/saga/ite_introproc.cpp
index abe2deb4a5..abe2deb4a5 100644
--- a/saga/ite_introproc.cpp
+++ b/engines/saga/ite_introproc.cpp
diff --git a/saga/itedata.cpp b/engines/saga/itedata.cpp
index 3329ab1bbd..3329ab1bbd 100644
--- a/saga/itedata.cpp
+++ b/engines/saga/itedata.cpp
diff --git a/saga/itedata.h b/engines/saga/itedata.h
index 45d045356d..45d045356d 100644
--- a/saga/itedata.h
+++ b/engines/saga/itedata.h
diff --git a/saga/list.h b/engines/saga/list.h
index d002f405de..d002f405de 100644
--- a/saga/list.h
+++ b/engines/saga/list.h
diff --git a/engines/saga/module.mk b/engines/saga/module.mk
new file mode 100644
index 0000000000..3d39108444
--- /dev/null
+++ b/engines/saga/module.mk
@@ -0,0 +1,44 @@
+MODULE := engines/saga
+
+MODULE_OBJS := \
+	engines/saga/actor.o \
+	engines/saga/animation.o \
+	engines/saga/console.o \
+	engines/saga/events.o \
+	engines/saga/font.o \
+	engines/saga/font_map.o \
+	engines/saga/game.o \
+	engines/saga/gfx.o \
+	engines/saga/ihnm_introproc.o \
+	engines/saga/image.o \
+	engines/saga/interface.o \
+	engines/saga/isomap.o \
+	engines/saga/ite_introproc.o \
+	engines/saga/itedata.o \
+	engines/saga/objectmap.o \
+	engines/saga/puzzle.o \
+	engines/saga/palanim.o \
+	engines/saga/render.o \
+	engines/saga/rscfile.o \
+	engines/saga/saga.o \
+	engines/saga/saveload.o \
+	engines/saga/scene.o \
+	engines/saga/script.o \
+	engines/saga/sfuncs.o \
+	engines/saga/sndres.o \
+	engines/saga/sprite.o \
+	engines/saga/sthread.o \
+	engines/saga/input.o \
+	engines/saga/music.o \
+	engines/saga/sound.o
+
+MODULE_DIRS += \
+	engines/saga
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
diff --git a/saga/music.cpp b/engines/saga/music.cpp
index e352818ee6..e352818ee6 100644
--- a/saga/music.cpp
+++ b/engines/saga/music.cpp
diff --git a/saga/music.h b/engines/saga/music.h
index 377a5bf1d8..377a5bf1d8 100644
--- a/saga/music.h
+++ b/engines/saga/music.h
diff --git a/saga/objectmap.cpp b/engines/saga/objectmap.cpp
index d0a302b0d7..d0a302b0d7 100644
--- a/saga/objectmap.cpp
+++ b/engines/saga/objectmap.cpp
diff --git a/saga/objectmap.h b/engines/saga/objectmap.h
index 43356d3579..43356d3579 100644
--- a/saga/objectmap.h
+++ b/engines/saga/objectmap.h
diff --git a/saga/palanim.cpp b/engines/saga/palanim.cpp
index 4cfaf5e0fd..4cfaf5e0fd 100644
--- a/saga/palanim.cpp
+++ b/engines/saga/palanim.cpp
diff --git a/saga/palanim.h b/engines/saga/palanim.h
index e2ca695eb6..e2ca695eb6 100644
--- a/saga/palanim.h
+++ b/engines/saga/palanim.h
diff --git a/saga/puzzle.cpp b/engines/saga/puzzle.cpp
index c09a9c0462..c09a9c0462 100644
--- a/saga/puzzle.cpp
+++ b/engines/saga/puzzle.cpp
diff --git a/saga/puzzle.h b/engines/saga/puzzle.h
index b5c9b7c15c..b5c9b7c15c 100644
--- a/saga/puzzle.h
+++ b/engines/saga/puzzle.h
diff --git a/saga/render.cpp b/engines/saga/render.cpp
index 7d312fb920..7d312fb920 100644
--- a/saga/render.cpp
+++ b/engines/saga/render.cpp
diff --git a/saga/render.h b/engines/saga/render.h
index f6187393d2..f6187393d2 100644
--- a/saga/render.h
+++ b/engines/saga/render.h
diff --git a/saga/resnames.h b/engines/saga/resnames.h
index 01522a9ca7..01522a9ca7 100644
--- a/saga/resnames.h
+++ b/engines/saga/resnames.h
diff --git a/saga/rscfile.cpp b/engines/saga/rscfile.cpp
index 24d1262d56..24d1262d56 100644
--- a/saga/rscfile.cpp
+++ b/engines/saga/rscfile.cpp
diff --git a/saga/rscfile.h b/engines/saga/rscfile.h
index 434a6d9a96..434a6d9a96 100644
--- a/saga/rscfile.h
+++ b/engines/saga/rscfile.h
diff --git a/saga/saga.cpp b/engines/saga/saga.cpp
index 4adda480c6..4adda480c6 100644
--- a/saga/saga.cpp
+++ b/engines/saga/saga.cpp
diff --git a/saga/saga.h b/engines/saga/saga.h
index f2111265bd..f2111265bd 100644
--- a/saga/saga.h
+++ b/engines/saga/saga.h
diff --git a/saga/saveload.cpp b/engines/saga/saveload.cpp
index 761ae49521..761ae49521 100644
--- a/saga/saveload.cpp
+++ b/engines/saga/saveload.cpp
diff --git a/saga/scene.cpp b/engines/saga/scene.cpp
index 708800dc41..708800dc41 100644
--- a/saga/scene.cpp
+++ b/engines/saga/scene.cpp
diff --git a/saga/scene.h b/engines/saga/scene.h
index 7f99140d10..7f99140d10 100644
--- a/saga/scene.h
+++ b/engines/saga/scene.h
diff --git a/saga/script.cpp b/engines/saga/script.cpp
index 3d3a626e9f..3d3a626e9f 100644
--- a/saga/script.cpp
+++ b/engines/saga/script.cpp
diff --git a/saga/script.h b/engines/saga/script.h
index bc11013b3f..bc11013b3f 100644
--- a/saga/script.h
+++ b/engines/saga/script.h
diff --git a/saga/sfuncs.cpp b/engines/saga/sfuncs.cpp
index 9caa15150b..9caa15150b 100644
--- a/saga/sfuncs.cpp
+++ b/engines/saga/sfuncs.cpp
diff --git a/saga/sndres.cpp b/engines/saga/sndres.cpp
index d3679599fd..d3679599fd 100644
--- a/saga/sndres.cpp
+++ b/engines/saga/sndres.cpp
diff --git a/saga/sndres.h b/engines/saga/sndres.h
index 638fb80849..638fb80849 100644
--- a/saga/sndres.h
+++ b/engines/saga/sndres.h
diff --git a/saga/sound.cpp b/engines/saga/sound.cpp
index 37f9cf174f..37f9cf174f 100644
--- a/saga/sound.cpp
+++ b/engines/saga/sound.cpp
diff --git a/saga/sound.h b/engines/saga/sound.h
index 85c3eda748..85c3eda748 100644
--- a/saga/sound.h
+++ b/engines/saga/sound.h
diff --git a/saga/sprite.cpp b/engines/saga/sprite.cpp
index 5309b1f109..5309b1f109 100644
--- a/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
diff --git a/saga/sprite.h b/engines/saga/sprite.h
index 03bde8e050..03bde8e050 100644
--- a/saga/sprite.h
+++ b/engines/saga/sprite.h
diff --git a/saga/sthread.cpp b/engines/saga/sthread.cpp
index a6724b588c..a6724b588c 100644
--- a/saga/sthread.cpp
+++ b/engines/saga/sthread.cpp
diff --git a/saga/stream.h b/engines/saga/stream.h
index 4a407216b2..4a407216b2 100644
--- a/saga/stream.h
+++ b/engines/saga/stream.h
diff --git a/saga/xref.txt b/engines/saga/xref.txt
index 1d3aff0824..1d3aff0824 100644
--- a/saga/xref.txt
+++ b/engines/saga/xref.txt
diff --git a/scumm/actor.cpp b/engines/scumm/actor.cpp
index 7e6696680f..7e6696680f 100644
--- a/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
diff --git a/scumm/actor.h b/engines/scumm/actor.h
index 2a6e49ed15..2a6e49ed15 100644
--- a/scumm/actor.h
+++ b/engines/scumm/actor.h
diff --git a/scumm/akos.cpp b/engines/scumm/akos.cpp
index d8f484f1d3..d8f484f1d3 100644
--- a/scumm/akos.cpp
+++ b/engines/scumm/akos.cpp
diff --git a/scumm/akos.h b/engines/scumm/akos.h
index 1a849903d8..1a849903d8 100644
--- a/scumm/akos.h
+++ b/engines/scumm/akos.h
diff --git a/scumm/base-costume.cpp b/engines/scumm/base-costume.cpp
index e93b5b80cd..e93b5b80cd 100644
--- a/scumm/base-costume.cpp
+++ b/engines/scumm/base-costume.cpp
diff --git a/scumm/base-costume.h b/engines/scumm/base-costume.h
index e1d096dea9..e1d096dea9 100644
--- a/scumm/base-costume.h
+++ b/engines/scumm/base-costume.h
diff --git a/scumm/bomp.cpp b/engines/scumm/bomp.cpp
index f3f78e4731..f3f78e4731 100644
--- a/scumm/bomp.cpp
+++ b/engines/scumm/bomp.cpp
diff --git a/scumm/bomp.h b/engines/scumm/bomp.h
index 74d367172d..74d367172d 100644
--- a/scumm/bomp.h
+++ b/engines/scumm/bomp.h
diff --git a/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index 4460519480..4460519480 100644
--- a/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
diff --git a/scumm/boxes.h b/engines/scumm/boxes.h
index f5fb7160fd..f5fb7160fd 100644
--- a/scumm/boxes.h
+++ b/engines/scumm/boxes.h
diff --git a/scumm/camera.cpp b/engines/scumm/camera.cpp
index cc6d9bfaed..cc6d9bfaed 100644
--- a/scumm/camera.cpp
+++ b/engines/scumm/camera.cpp
diff --git a/scumm/charset.cpp b/engines/scumm/charset.cpp
index e8086ed30a..e8086ed30a 100644
--- a/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
diff --git a/scumm/charset.h b/engines/scumm/charset.h
index 3746f3be4e..3746f3be4e 100644
--- a/scumm/charset.h
+++ b/engines/scumm/charset.h
diff --git a/scumm/costume.cpp b/engines/scumm/costume.cpp
index 48f81111c6..48f81111c6 100644
--- a/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
diff --git a/scumm/costume.h b/engines/scumm/costume.h
index 56c97e0a8c..56c97e0a8c 100644
--- a/scumm/costume.h
+++ b/engines/scumm/costume.h
diff --git a/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 6fee33e79b..6fee33e79b 100644
--- a/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
diff --git a/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index e14e9a36f0..e14e9a36f0 100644
--- a/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
diff --git a/scumm/debugger.h b/engines/scumm/debugger.h
index 664c28923d..664c28923d 100644
--- a/scumm/debugger.h
+++ b/engines/scumm/debugger.h
diff --git a/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index eafd956251..eafd956251 100644
--- a/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
diff --git a/scumm/dialogs.h b/engines/scumm/dialogs.h
index 60d796956e..60d796956e 100644
--- a/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
diff --git a/scumm/floodfill_he.cpp b/engines/scumm/floodfill_he.cpp
index c7df765606..c7df765606 100644
--- a/scumm/floodfill_he.cpp
+++ b/engines/scumm/floodfill_he.cpp
diff --git a/scumm/floodfill_he.h b/engines/scumm/floodfill_he.h
index 7d0fa7073f..7d0fa7073f 100644
--- a/scumm/floodfill_he.h
+++ b/engines/scumm/floodfill_he.h
diff --git a/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index dc476a8f0b..dc476a8f0b 100644
--- a/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
diff --git a/scumm/gfx.h b/engines/scumm/gfx.h
index 9aa8461c2c..9aa8461c2c 100644
--- a/scumm/gfx.h
+++ b/engines/scumm/gfx.h
diff --git a/scumm/help.cpp b/engines/scumm/help.cpp
index acc9e67a6d..acc9e67a6d 100644
--- a/scumm/help.cpp
+++ b/engines/scumm/help.cpp
diff --git a/scumm/help.h b/engines/scumm/help.h
index 9691c09594..9691c09594 100644
--- a/scumm/help.h
+++ b/engines/scumm/help.h
diff --git a/scumm/imuse.cpp b/engines/scumm/imuse.cpp
index 5d170e98b8..5d170e98b8 100644
--- a/scumm/imuse.cpp
+++ b/engines/scumm/imuse.cpp
diff --git a/scumm/imuse.h b/engines/scumm/imuse.h
index 0c9a9206ba..0c9a9206ba 100644
--- a/scumm/imuse.h
+++ b/engines/scumm/imuse.h
diff --git a/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index c057cc8d85..c057cc8d85 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
diff --git a/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h
index fed2e48457..fed2e48457 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/engines/scumm/imuse_digi/dimuse.h
diff --git a/scumm/imuse_digi/dimuse_bndmgr.cpp b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
index d36d733ef2..d36d733ef2 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
diff --git a/scumm/imuse_digi/dimuse_bndmgr.h b/engines/scumm/imuse_digi/dimuse_bndmgr.h
index 36d4f5683e..36d4f5683e 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.h
+++ b/engines/scumm/imuse_digi/dimuse_bndmgr.h
diff --git a/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp
index dccae928b0..dccae928b0 100644
--- a/scumm/imuse_digi/dimuse_codecs.cpp
+++ b/engines/scumm/imuse_digi/dimuse_codecs.cpp
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp
index 4c0cedc57c..4c0cedc57c 100644
--- a/scumm/imuse_digi/dimuse_music.cpp
+++ b/engines/scumm/imuse_digi/dimuse_music.cpp
diff --git a/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp
index 83deb91e54..83deb91e54 100644
--- a/scumm/imuse_digi/dimuse_script.cpp
+++ b/engines/scumm/imuse_digi/dimuse_script.cpp
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index 7d3d06f16e..7d3d06f16e 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
diff --git a/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h
index 5844fa0c1b..5844fa0c1b 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.h
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h
diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/engines/scumm/imuse_digi/dimuse_tables.cpp
index f4fd25a160..f4fd25a160 100644
--- a/scumm/imuse_digi/dimuse_tables.cpp
+++ b/engines/scumm/imuse_digi/dimuse_tables.cpp
diff --git a/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp
index d1bd5b8923..d1bd5b8923 100644
--- a/scumm/imuse_digi/dimuse_track.cpp
+++ b/engines/scumm/imuse_digi/dimuse_track.cpp
diff --git a/scumm/imuse_internal.h b/engines/scumm/imuse_internal.h
index aa9b49cb00..aa9b49cb00 100644
--- a/scumm/imuse_internal.h
+++ b/engines/scumm/imuse_internal.h
diff --git a/scumm/imuse_player.cpp b/engines/scumm/imuse_player.cpp
index 06ebd289cd..06ebd289cd 100644
--- a/scumm/imuse_player.cpp
+++ b/engines/scumm/imuse_player.cpp
diff --git a/scumm/input.cpp b/engines/scumm/input.cpp
index ad890604c4..ad890604c4 100644
--- a/scumm/input.cpp
+++ b/engines/scumm/input.cpp
diff --git a/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp
index 08c982b65f..08c982b65f 100644
--- a/scumm/insane/insane.cpp
+++ b/engines/scumm/insane/insane.cpp
diff --git a/scumm/insane/insane.h b/engines/scumm/insane/insane.h
index 36567ae06e..36567ae06e 100644
--- a/scumm/insane/insane.h
+++ b/engines/scumm/insane/insane.h
diff --git a/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp
index 4e58fa14c9..4e58fa14c9 100644
--- a/scumm/insane/insane_ben.cpp
+++ b/engines/scumm/insane/insane_ben.cpp
diff --git a/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index d67fc7ae09..d67fc7ae09 100644
--- a/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
diff --git a/scumm/insane/insane_iact.cpp b/engines/scumm/insane/insane_iact.cpp
index c706c7d191..c706c7d191 100644
--- a/scumm/insane/insane_iact.cpp
+++ b/engines/scumm/insane/insane_iact.cpp
diff --git a/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp
index 7cc01fc2cf..7cc01fc2cf 100644
--- a/scumm/insane/insane_scenes.cpp
+++ b/engines/scumm/insane/insane_scenes.cpp
diff --git a/scumm/instrument.cpp b/engines/scumm/instrument.cpp
index 6e688d89e5..6e688d89e5 100644
--- a/scumm/instrument.cpp
+++ b/engines/scumm/instrument.cpp
diff --git a/scumm/instrument.h b/engines/scumm/instrument.h
index eb1a30a1d1..eb1a30a1d1 100644
--- a/scumm/instrument.h
+++ b/engines/scumm/instrument.h
diff --git a/scumm/intern.h b/engines/scumm/intern.h
index fae915a037..fae915a037 100644
--- a/scumm/intern.h
+++ b/engines/scumm/intern.h
diff --git a/scumm/intern_he.h b/engines/scumm/intern_he.h
index 26a9e0a40f..26a9e0a40f 100644
--- a/scumm/intern_he.h
+++ b/engines/scumm/intern_he.h
diff --git a/scumm/logic_he.cpp b/engines/scumm/logic_he.cpp
index 76de561721..76de561721 100644
--- a/scumm/logic_he.cpp
+++ b/engines/scumm/logic_he.cpp
diff --git a/scumm/logic_he.h b/engines/scumm/logic_he.h
index c237f6182c..c237f6182c 100644
--- a/scumm/logic_he.h
+++ b/engines/scumm/logic_he.h
diff --git a/scumm/midiparser_eup.cpp b/engines/scumm/midiparser_eup.cpp
index a9c40f99c5..a9c40f99c5 100644
--- a/scumm/midiparser_eup.cpp
+++ b/engines/scumm/midiparser_eup.cpp
diff --git a/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp
index b240ffb5fd..b240ffb5fd 100644
--- a/scumm/midiparser_ro.cpp
+++ b/engines/scumm/midiparser_ro.cpp
diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk
new file mode 100644
index 0000000000..6bf42512b3
--- /dev/null
+++ b/engines/scumm/module.mk
@@ -0,0 +1,110 @@
+MODULE := engines/scumm
+
+MODULE_OBJS := \
+	engines/scumm/actor.o \
+	engines/scumm/akos.o \
+	engines/scumm/base-costume.o \
+	engines/scumm/bomp.o \
+	engines/scumm/boxes.o \
+	engines/scumm/camera.o \
+	engines/scumm/charset.o \
+	engines/scumm/costume.o \
+	engines/scumm/cursor.o \
+	engines/scumm/debugger.o \
+	engines/scumm/dialogs.o \
+	engines/scumm/gfx.o \
+	engines/scumm/imuse.o \
+	engines/scumm/imuse_player.o \
+	engines/scumm/input.o \
+	engines/scumm/instrument.o \
+	engines/scumm/help.o \
+	engines/scumm/midiparser_ro.o \
+	engines/scumm/midiparser_eup.o \
+	engines/scumm/object.o \
+	engines/scumm/palette.o \
+	engines/scumm/player_mod.o \
+	engines/scumm/player_v1.o \
+	engines/scumm/player_nes.o \
+	engines/scumm/player_v2.o \
+	engines/scumm/player_v2a.o \
+	engines/scumm/player_v3a.o \
+	engines/scumm/resource.o \
+	engines/scumm/resource_v2.o \
+	engines/scumm/resource_v3.o \
+	engines/scumm/resource_v4.o \
+	engines/scumm/room.o \
+	engines/scumm/saveload.o \
+	engines/scumm/script.o \
+	engines/scumm/script_c64.o \
+	engines/scumm/script_v2.o \
+	engines/scumm/script_v5.o \
+	engines/scumm/script_v6.o \
+	engines/scumm/script_v6he.o \
+	engines/scumm/scumm.o \
+	engines/scumm/sound.o \
+	engines/scumm/sound_he.o \
+	engines/scumm/string.o \
+	engines/scumm/usage_bits.o \
+	engines/scumm/util.o \
+	engines/scumm/vars.o \
+	engines/scumm/verbs.o \
+	engines/scumm/thumbnail.o
+
+ifndef DISABLE_SCUMM_7_8
+MODULE_OBJS += \
+	engines/scumm/nut_renderer.o \
+	engines/scumm/script_v8.o \
+	engines/scumm/imuse_digi/dimuse.o \
+	engines/scumm/imuse_digi/dimuse_bndmgr.o \
+	engines/scumm/imuse_digi/dimuse_codecs.o \
+	engines/scumm/imuse_digi/dimuse_music.o \
+	engines/scumm/imuse_digi/dimuse_sndmgr.o \
+	engines/scumm/imuse_digi/dimuse_script.o \
+	engines/scumm/imuse_digi/dimuse_track.o \
+	engines/scumm/imuse_digi/dimuse_tables.o \
+	engines/scumm/insane/insane.o \
+	engines/scumm/insane/insane_ben.o \
+	engines/scumm/insane/insane_enemy.o \
+	engines/scumm/insane/insane_scenes.o \
+	engines/scumm/insane/insane_iact.o \
+	engines/scumm/smush/chunk.o \
+	engines/scumm/smush/codec1.o \
+	engines/scumm/smush/codec37.o \
+	engines/scumm/smush/codec47.o \
+	engines/scumm/smush/imuse_channel.o \
+	engines/scumm/smush/smush_player.o \
+	engines/scumm/smush/saud_channel.o \
+	engines/scumm/smush/smush_mixer.o \
+	engines/scumm/smush/smush_font.o
+endif
+
+ifndef DISABLE_HE
+MODULE_OBJS += \
+	engines/scumm/floodfill_he.o \
+	engines/scumm/logic_he.o \
+	engines/scumm/palette_he.o \
+	engines/scumm/resource_v7he.o \
+	engines/scumm/script_v7he.o \
+	engines/scumm/script_v72he.o \
+	engines/scumm/script_v80he.o \
+	engines/scumm/script_v90he.o \
+	engines/scumm/script_v100he.o \
+	engines/scumm/sprite_he.o \
+	engines/scumm/wiz_he.o
+endif
+
+MODULE_DIRS += \
+	engines/scumm \
+	engines/scumm/imuse_digi \
+	engines/scumm/insane \
+	engines/scumm/smush
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+# HACK HACK evil HACK HACK
+PLUGIN_LDFLAGS += -lz
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
diff --git a/scumm/music.h b/engines/scumm/music.h
index b837fced51..b837fced51 100644
--- a/scumm/music.h
+++ b/engines/scumm/music.h
diff --git a/scumm/nut_renderer.cpp b/engines/scumm/nut_renderer.cpp
index e7d3e6f7c9..e7d3e6f7c9 100644
--- a/scumm/nut_renderer.cpp
+++ b/engines/scumm/nut_renderer.cpp
diff --git a/scumm/nut_renderer.h b/engines/scumm/nut_renderer.h
index 8972fef949..8972fef949 100644
--- a/scumm/nut_renderer.h
+++ b/engines/scumm/nut_renderer.h
diff --git a/scumm/object.cpp b/engines/scumm/object.cpp
index 0472edcc15..0472edcc15 100644
--- a/scumm/object.cpp
+++ b/engines/scumm/object.cpp
diff --git a/scumm/object.h b/engines/scumm/object.h
index edb779b5eb..edb779b5eb 100644
--- a/scumm/object.h
+++ b/engines/scumm/object.h
diff --git a/scumm/palette.cpp b/engines/scumm/palette.cpp
index d8b8f643f1..d8b8f643f1 100644
--- a/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
diff --git a/scumm/palette_he.cpp b/engines/scumm/palette_he.cpp
index 2d6a471d79..2d6a471d79 100644
--- a/scumm/palette_he.cpp
+++ b/engines/scumm/palette_he.cpp
diff --git a/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp
index 773d34732d..773d34732d 100644
--- a/scumm/player_mod.cpp
+++ b/engines/scumm/player_mod.cpp
diff --git a/scumm/player_mod.h b/engines/scumm/player_mod.h
index 317bf7fd6e..317bf7fd6e 100644
--- a/scumm/player_mod.h
+++ b/engines/scumm/player_mod.h
diff --git a/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp
index 8564ac1e41..8564ac1e41 100644
--- a/scumm/player_nes.cpp
+++ b/engines/scumm/player_nes.cpp
diff --git a/scumm/player_nes.h b/engines/scumm/player_nes.h
index 17a11b2fe3..17a11b2fe3 100644
--- a/scumm/player_nes.h
+++ b/engines/scumm/player_nes.h
diff --git a/scumm/player_v1.cpp b/engines/scumm/player_v1.cpp
index 74605b20d1..74605b20d1 100644
--- a/scumm/player_v1.cpp
+++ b/engines/scumm/player_v1.cpp
diff --git a/scumm/player_v1.h b/engines/scumm/player_v1.h
index 60ba8ad26d..60ba8ad26d 100644
--- a/scumm/player_v1.h
+++ b/engines/scumm/player_v1.h
diff --git a/scumm/player_v2.cpp b/engines/scumm/player_v2.cpp
index 70aff98bb9..70aff98bb9 100644
--- a/scumm/player_v2.cpp
+++ b/engines/scumm/player_v2.cpp
diff --git a/scumm/player_v2.h b/engines/scumm/player_v2.h
index 160400e06a..160400e06a 100644
--- a/scumm/player_v2.h
+++ b/engines/scumm/player_v2.h
diff --git a/scumm/player_v2a.cpp b/engines/scumm/player_v2a.cpp
index 36499ba527..36499ba527 100644
--- a/scumm/player_v2a.cpp
+++ b/engines/scumm/player_v2a.cpp
diff --git a/scumm/player_v2a.h b/engines/scumm/player_v2a.h
index b2d25d67d5..b2d25d67d5 100644
--- a/scumm/player_v2a.h
+++ b/engines/scumm/player_v2a.h
diff --git a/scumm/player_v3a.cpp b/engines/scumm/player_v3a.cpp
index 32ab9754af..32ab9754af 100644
--- a/scumm/player_v3a.cpp
+++ b/engines/scumm/player_v3a.cpp
diff --git a/scumm/player_v3a.h b/engines/scumm/player_v3a.h
index 351d8ece60..351d8ece60 100644
--- a/scumm/player_v3a.h
+++ b/engines/scumm/player_v3a.h
diff --git a/scumm/resource.cpp b/engines/scumm/resource.cpp
index e1601ca991..e1601ca991 100644
--- a/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
diff --git a/scumm/resource.h b/engines/scumm/resource.h
index 318582b5cb..318582b5cb 100644
--- a/scumm/resource.h
+++ b/engines/scumm/resource.h
diff --git a/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp
index 26e96ec9ef..26e96ec9ef 100644
--- a/scumm/resource_v2.cpp
+++ b/engines/scumm/resource_v2.cpp
diff --git a/scumm/resource_v3.cpp b/engines/scumm/resource_v3.cpp
index 510f106550..510f106550 100644
--- a/scumm/resource_v3.cpp
+++ b/engines/scumm/resource_v3.cpp
diff --git a/scumm/resource_v4.cpp b/engines/scumm/resource_v4.cpp
index 0f8530af2d..0f8530af2d 100644
--- a/scumm/resource_v4.cpp
+++ b/engines/scumm/resource_v4.cpp
diff --git a/scumm/resource_v7he.cpp b/engines/scumm/resource_v7he.cpp
index 6ce8446a9a..6ce8446a9a 100644
--- a/scumm/resource_v7he.cpp
+++ b/engines/scumm/resource_v7he.cpp
diff --git a/scumm/resource_v7he.h b/engines/scumm/resource_v7he.h
index 1496aa3d7f..1496aa3d7f 100644
--- a/scumm/resource_v7he.h
+++ b/engines/scumm/resource_v7he.h
diff --git a/scumm/room.cpp b/engines/scumm/room.cpp
index e53b13c663..e53b13c663 100644
--- a/scumm/room.cpp
+++ b/engines/scumm/room.cpp
diff --git a/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 9dca7abd40..9dca7abd40 100644
--- a/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
diff --git a/scumm/saveload.h b/engines/scumm/saveload.h
index dc2c3b5262..dc2c3b5262 100644
--- a/scumm/saveload.h
+++ b/engines/scumm/saveload.h
diff --git a/scumm/script.cpp b/engines/scumm/script.cpp
index c6a971837f..c6a971837f 100644
--- a/scumm/script.cpp
+++ b/engines/scumm/script.cpp
diff --git a/scumm/script.h b/engines/scumm/script.h
index e832aee8d9..e832aee8d9 100644
--- a/scumm/script.h
+++ b/engines/scumm/script.h
diff --git a/scumm/script_c64.cpp b/engines/scumm/script_c64.cpp
index 2e8ff5f4d6..2e8ff5f4d6 100644
--- a/scumm/script_c64.cpp
+++ b/engines/scumm/script_c64.cpp
diff --git a/scumm/script_v100he.cpp b/engines/scumm/script_v100he.cpp
index 790f65e021..790f65e021 100644
--- a/scumm/script_v100he.cpp
+++ b/engines/scumm/script_v100he.cpp
diff --git a/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index 880628f53e..880628f53e 100644
--- a/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
diff --git a/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 7a048d0a01..7a048d0a01 100644
--- a/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
diff --git a/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 77709eed21..77709eed21 100644
--- a/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
diff --git a/scumm/script_v6he.cpp b/engines/scumm/script_v6he.cpp
index ce3f76bc18..ce3f76bc18 100644
--- a/scumm/script_v6he.cpp
+++ b/engines/scumm/script_v6he.cpp
diff --git a/scumm/script_v72he.cpp b/engines/scumm/script_v72he.cpp
index 021a74dcc3..021a74dcc3 100644
--- a/scumm/script_v72he.cpp
+++ b/engines/scumm/script_v72he.cpp
diff --git a/scumm/script_v7he.cpp b/engines/scumm/script_v7he.cpp
index f615266131..f615266131 100644
--- a/scumm/script_v7he.cpp
+++ b/engines/scumm/script_v7he.cpp
diff --git a/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index b5f9f48466..b5f9f48466 100644
--- a/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
diff --git a/scumm/script_v80he.cpp b/engines/scumm/script_v80he.cpp
index 307ab75d3f..307ab75d3f 100644
--- a/scumm/script_v80he.cpp
+++ b/engines/scumm/script_v80he.cpp
diff --git a/scumm/script_v90he.cpp b/engines/scumm/script_v90he.cpp
index 0536506534..0536506534 100644
--- a/scumm/script_v90he.cpp
+++ b/engines/scumm/script_v90he.cpp
diff --git a/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index f442f38ba3..f442f38ba3 100644
--- a/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
diff --git a/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 5cd9ef9111..5cd9ef9111 100644
--- a/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
diff --git a/scumm/scumm.h b/engines/scumm/scumm.h
index 5509378371..5509378371 100644
--- a/scumm/scumm.h
+++ b/engines/scumm/scumm.h
diff --git a/scumm/smush/channel.h b/engines/scumm/smush/channel.h
index 52e64c8b2d..52e64c8b2d 100644
--- a/scumm/smush/channel.h
+++ b/engines/scumm/smush/channel.h
diff --git a/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp
index 60512cdf2f..60512cdf2f 100644
--- a/scumm/smush/chunk.cpp
+++ b/engines/scumm/smush/chunk.cpp
diff --git a/scumm/smush/chunk.h b/engines/scumm/smush/chunk.h
index 26290538a6..26290538a6 100644
--- a/scumm/smush/chunk.h
+++ b/engines/scumm/smush/chunk.h
diff --git a/scumm/smush/chunk_type.h b/engines/scumm/smush/chunk_type.h
index 18c49f0dbf..18c49f0dbf 100644
--- a/scumm/smush/chunk_type.h
+++ b/engines/scumm/smush/chunk_type.h
diff --git a/scumm/smush/codec1.cpp b/engines/scumm/smush/codec1.cpp
index 04d55e2ed7..04d55e2ed7 100644
--- a/scumm/smush/codec1.cpp
+++ b/engines/scumm/smush/codec1.cpp
diff --git a/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp
index 732bffeeae..732bffeeae 100644
--- a/scumm/smush/codec37.cpp
+++ b/engines/scumm/smush/codec37.cpp
diff --git a/scumm/smush/codec37.h b/engines/scumm/smush/codec37.h
index 534316c1e5..534316c1e5 100644
--- a/scumm/smush/codec37.h
+++ b/engines/scumm/smush/codec37.h
diff --git a/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp
index ef10a282a9..ef10a282a9 100644
--- a/scumm/smush/codec47.cpp
+++ b/engines/scumm/smush/codec47.cpp
diff --git a/scumm/smush/codec47.h b/engines/scumm/smush/codec47.h
index ea71c22963..ea71c22963 100644
--- a/scumm/smush/codec47.h
+++ b/engines/scumm/smush/codec47.h
diff --git a/scumm/smush/imuse_channel.cpp b/engines/scumm/smush/imuse_channel.cpp
index 76a10a9e9e..76a10a9e9e 100644
--- a/scumm/smush/imuse_channel.cpp
+++ b/engines/scumm/smush/imuse_channel.cpp
diff --git a/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp
index 2277336570..2277336570 100644
--- a/scumm/smush/saud_channel.cpp
+++ b/engines/scumm/smush/saud_channel.cpp
diff --git a/scumm/smush/smush_font.cpp b/engines/scumm/smush/smush_font.cpp
index 96d9e2f7c5..96d9e2f7c5 100644
--- a/scumm/smush/smush_font.cpp
+++ b/engines/scumm/smush/smush_font.cpp
diff --git a/scumm/smush/smush_font.h b/engines/scumm/smush/smush_font.h
index 724eb46658..724eb46658 100644
--- a/scumm/smush/smush_font.h
+++ b/engines/scumm/smush/smush_font.h
diff --git a/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp
index 00a50321da..00a50321da 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/engines/scumm/smush/smush_mixer.cpp
diff --git a/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h
index 2a7c2d3ebc..2a7c2d3ebc 100644
--- a/scumm/smush/smush_mixer.h
+++ b/engines/scumm/smush/smush_mixer.h
diff --git a/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 926e7f9f87..926e7f9f87 100644
--- a/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
diff --git a/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h
index f697057d89..f697057d89 100644
--- a/scumm/smush/smush_player.h
+++ b/engines/scumm/smush/smush_player.h
diff --git a/scumm/sound.cpp b/engines/scumm/sound.cpp
index 26f0c712c8..26f0c712c8 100644
--- a/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
diff --git a/scumm/sound.h b/engines/scumm/sound.h
index 0b913fe7e3..0b913fe7e3 100644
--- a/scumm/sound.h
+++ b/engines/scumm/sound.h
diff --git a/scumm/sound_he.cpp b/engines/scumm/sound_he.cpp
index 879e34a99e..879e34a99e 100644
--- a/scumm/sound_he.cpp
+++ b/engines/scumm/sound_he.cpp
diff --git a/scumm/sprite_he.cpp b/engines/scumm/sprite_he.cpp
index a6065eb7be..a6065eb7be 100644
--- a/scumm/sprite_he.cpp
+++ b/engines/scumm/sprite_he.cpp
diff --git a/scumm/sprite_he.h b/engines/scumm/sprite_he.h
index 5396c1fed4..5396c1fed4 100644
--- a/scumm/sprite_he.h
+++ b/engines/scumm/sprite_he.h
diff --git a/scumm/string.cpp b/engines/scumm/string.cpp
index c32413542d..c32413542d 100644
--- a/scumm/string.cpp
+++ b/engines/scumm/string.cpp
diff --git a/scumm/thumbnail.cpp b/engines/scumm/thumbnail.cpp
index eefc34286a..eefc34286a 100644
--- a/scumm/thumbnail.cpp
+++ b/engines/scumm/thumbnail.cpp
diff --git a/scumm/usage_bits.cpp b/engines/scumm/usage_bits.cpp
index 3fd90311fd..3fd90311fd 100644
--- a/scumm/usage_bits.cpp
+++ b/engines/scumm/usage_bits.cpp
diff --git a/scumm/usage_bits.h b/engines/scumm/usage_bits.h
index 36fd7cc610..36fd7cc610 100644
--- a/scumm/usage_bits.h
+++ b/engines/scumm/usage_bits.h
diff --git a/scumm/util.cpp b/engines/scumm/util.cpp
index 70e3a3e467..70e3a3e467 100644
--- a/scumm/util.cpp
+++ b/engines/scumm/util.cpp
diff --git a/scumm/util.h b/engines/scumm/util.h
index 99d75cf127..99d75cf127 100644
--- a/scumm/util.h
+++ b/engines/scumm/util.h
diff --git a/scumm/vars.cpp b/engines/scumm/vars.cpp
index 1cdc446637..1cdc446637 100644
--- a/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
diff --git a/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 7b01527b92..7b01527b92 100644
--- a/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
diff --git a/scumm/verbs.h b/engines/scumm/verbs.h
index 87cf7f3955..87cf7f3955 100644
--- a/scumm/verbs.h
+++ b/engines/scumm/verbs.h
diff --git a/scumm/wiz_he.cpp b/engines/scumm/wiz_he.cpp
index 9b0f9c3f15..9b0f9c3f15 100644
--- a/scumm/wiz_he.cpp
+++ b/engines/scumm/wiz_he.cpp
diff --git a/scumm/wiz_he.h b/engines/scumm/wiz_he.h
index 86d3e97721..86d3e97721 100644
--- a/scumm/wiz_he.h
+++ b/engines/scumm/wiz_he.h
diff --git a/simon/charset.cpp b/engines/simon/charset.cpp
index 05ed2c0351..05ed2c0351 100644
--- a/simon/charset.cpp
+++ b/engines/simon/charset.cpp
diff --git a/simon/cursor.cpp b/engines/simon/cursor.cpp
index 248039d05d..248039d05d 100644
--- a/simon/cursor.cpp
+++ b/engines/simon/cursor.cpp
diff --git a/simon/debug.cpp b/engines/simon/debug.cpp
index 39e462782f..39e462782f 100644
--- a/simon/debug.cpp
+++ b/engines/simon/debug.cpp
diff --git a/simon/debug.h b/engines/simon/debug.h
index 5b7bf45eeb..5b7bf45eeb 100644
--- a/simon/debug.h
+++ b/engines/simon/debug.h
diff --git a/simon/debugger.cpp b/engines/simon/debugger.cpp
index 1384c60693..1384c60693 100644
--- a/simon/debugger.cpp
+++ b/engines/simon/debugger.cpp
diff --git a/simon/debugger.h b/engines/simon/debugger.h
index 837fbbccf8..837fbbccf8 100644
--- a/simon/debugger.h
+++ b/engines/simon/debugger.h
diff --git a/simon/game.cpp b/engines/simon/game.cpp
index 1cd7e4d729..1cd7e4d729 100644
--- a/simon/game.cpp
+++ b/engines/simon/game.cpp
diff --git a/simon/icons.cpp b/engines/simon/icons.cpp
index d9f7692e81..d9f7692e81 100644
--- a/simon/icons.cpp
+++ b/engines/simon/icons.cpp
diff --git a/simon/intern.h b/engines/simon/intern.h
index aa60d0245f..aa60d0245f 100644
--- a/simon/intern.h
+++ b/engines/simon/intern.h
diff --git a/simon/items.cpp b/engines/simon/items.cpp
index d1df1aa82c..d1df1aa82c 100644
--- a/simon/items.cpp
+++ b/engines/simon/items.cpp
diff --git a/simon/midi.cpp b/engines/simon/midi.cpp
index 915bc7108f..915bc7108f 100644
--- a/simon/midi.cpp
+++ b/engines/simon/midi.cpp
diff --git a/simon/midi.h b/engines/simon/midi.h
index bc903f9d17..bc903f9d17 100644
--- a/simon/midi.h
+++ b/engines/simon/midi.h
diff --git a/simon/midiparser_s1d.cpp b/engines/simon/midiparser_s1d.cpp
index 926a8cb263..926a8cb263 100644
--- a/simon/midiparser_s1d.cpp
+++ b/engines/simon/midiparser_s1d.cpp
diff --git a/engines/simon/module.mk b/engines/simon/module.mk
new file mode 100644
index 0000000000..3323f3a0de
--- /dev/null
+++ b/engines/simon/module.mk
@@ -0,0 +1,29 @@
+MODULE := engines/simon
+
+MODULE_OBJS := \
+	engines/simon/charset.o \
+	engines/simon/cursor.o \
+	engines/simon/debug.o \
+	engines/simon/debugger.o \
+	engines/simon/game.o \
+	engines/simon/icons.o \
+	engines/simon/items.o \
+	engines/simon/midi.o \
+	engines/simon/midiparser_s1d.o \
+	engines/simon/res.o \
+	engines/simon/saveload.o \
+	engines/simon/sound.o \
+	engines/simon/simon.o \
+	engines/simon/verb.o \
+	engines/simon/vga.o \
+
+MODULE_DIRS += \
+	engines/simon
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
diff --git a/simon/res.cpp b/engines/simon/res.cpp
index 0be063c065..0be063c065 100644
--- a/simon/res.cpp
+++ b/engines/simon/res.cpp
diff --git a/simon/saveload.cpp b/engines/simon/saveload.cpp
index 9314a4bfca..9314a4bfca 100644
--- a/simon/saveload.cpp
+++ b/engines/simon/saveload.cpp
diff --git a/simon/simon.cpp b/engines/simon/simon.cpp
index 78d0eac221..78d0eac221 100644
--- a/simon/simon.cpp
+++ b/engines/simon/simon.cpp
diff --git a/simon/simon.h b/engines/simon/simon.h
index 8fa27924b6..8fa27924b6 100644
--- a/simon/simon.h
+++ b/engines/simon/simon.h
diff --git a/simon/sound.cpp b/engines/simon/sound.cpp
index f40a164a12..f40a164a12 100644
--- a/simon/sound.cpp
+++ b/engines/simon/sound.cpp
diff --git a/simon/sound.h b/engines/simon/sound.h
index 245c6ffb0c..245c6ffb0c 100644
--- a/simon/sound.h
+++ b/engines/simon/sound.h
diff --git a/simon/verb.cpp b/engines/simon/verb.cpp
index 65f105f1f9..65f105f1f9 100644
--- a/simon/verb.cpp
+++ b/engines/simon/verb.cpp
diff --git a/simon/vga.cpp b/engines/simon/vga.cpp
index d7d0731539..d7d0731539 100644
--- a/simon/vga.cpp
+++ b/engines/simon/vga.cpp
diff --git a/simon/vga.h b/engines/simon/vga.h
index 2dd77633de..2dd77633de 100644
--- a/simon/vga.h
+++ b/engines/simon/vga.h
diff --git a/sky/autoroute.cpp b/engines/sky/autoroute.cpp
index 15c00ff028..15c00ff028 100644
--- a/sky/autoroute.cpp
+++ b/engines/sky/autoroute.cpp
diff --git a/sky/autoroute.h b/engines/sky/autoroute.h
index 060bc9acb1..060bc9acb1 100644
--- a/sky/autoroute.h
+++ b/engines/sky/autoroute.h
diff --git a/sky/compact.cpp b/engines/sky/compact.cpp
index a7d9ee69e6..a7d9ee69e6 100644
--- a/sky/compact.cpp
+++ b/engines/sky/compact.cpp
diff --git a/sky/compact.h b/engines/sky/compact.h
index 7f8abbd516..7f8abbd516 100644
--- a/sky/compact.h
+++ b/engines/sky/compact.h
diff --git a/sky/control.cpp b/engines/sky/control.cpp
index c2aa5ed02f..c2aa5ed02f 100644
--- a/sky/control.cpp
+++ b/engines/sky/control.cpp
diff --git a/sky/control.h b/engines/sky/control.h
index d219dab749..d219dab749 100644
--- a/sky/control.h
+++ b/engines/sky/control.h
diff --git a/sky/debug.cpp b/engines/sky/debug.cpp
index 05aec03db5..05aec03db5 100644
--- a/sky/debug.cpp
+++ b/engines/sky/debug.cpp
diff --git a/sky/debug.h b/engines/sky/debug.h
index 8fdb46d2e1..8fdb46d2e1 100644
--- a/sky/debug.h
+++ b/engines/sky/debug.h
diff --git a/sky/disk.cpp b/engines/sky/disk.cpp
index 3c39a287d0..3c39a287d0 100644
--- a/sky/disk.cpp
+++ b/engines/sky/disk.cpp
diff --git a/sky/disk.h b/engines/sky/disk.h
index 4d2fe4c294..4d2fe4c294 100644
--- a/sky/disk.h
+++ b/engines/sky/disk.h
diff --git a/sky/grid.cpp b/engines/sky/grid.cpp
index 7becff74d5..7becff74d5 100644
--- a/sky/grid.cpp
+++ b/engines/sky/grid.cpp
diff --git a/sky/grid.h b/engines/sky/grid.h
index 7c2ba557c0..7c2ba557c0 100644
--- a/sky/grid.h
+++ b/engines/sky/grid.h
diff --git a/sky/hufftext.cpp b/engines/sky/hufftext.cpp
index 01b0d4a679..01b0d4a679 100644
--- a/sky/hufftext.cpp
+++ b/engines/sky/hufftext.cpp
diff --git a/sky/intro.cpp b/engines/sky/intro.cpp
index ce6849fbd0..ce6849fbd0 100644
--- a/sky/intro.cpp
+++ b/engines/sky/intro.cpp
diff --git a/sky/intro.h b/engines/sky/intro.h
index 294c907887..294c907887 100644
--- a/sky/intro.h
+++ b/engines/sky/intro.h
diff --git a/sky/logic.cpp b/engines/sky/logic.cpp
index 9ea560a5bf..9ea560a5bf 100644
--- a/sky/logic.cpp
+++ b/engines/sky/logic.cpp
diff --git a/sky/logic.h b/engines/sky/logic.h
index 7d10be6d8c..7d10be6d8c 100644
--- a/sky/logic.h
+++ b/engines/sky/logic.h
diff --git a/engines/sky/module.mk b/engines/sky/module.mk
new file mode 100644
index 0000000000..875cf65e47
--- /dev/null
+++ b/engines/sky/module.mk
@@ -0,0 +1,37 @@
+MODULE := engines/sky
+
+MODULE_OBJS := \
+	engines/sky/autoroute.o \
+	engines/sky/compact.o \
+	engines/sky/control.o \
+	engines/sky/debug.o \
+	engines/sky/disk.o \
+	engines/sky/grid.o \
+	engines/sky/hufftext.o \
+	engines/sky/intro.o \
+	engines/sky/logic.o \
+	engines/sky/mouse.o \
+	engines/sky/rnc_deco.o \
+	engines/sky/screen.o \
+	engines/sky/sky.o \
+	engines/sky/sound.o \
+	engines/sky/text.o \
+	engines/sky/music/adlibchannel.o \
+	engines/sky/music/adlibmusic.o \
+	engines/sky/music/gmchannel.o \
+	engines/sky/music/gmmusic.o \
+	engines/sky/music/mt32music.o \
+	engines/sky/music/musicbase.o
+
+MODULE_DIRS += \
+	engines/sky \
+	engines/sky/music \
+	engines/sky/compacts
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
diff --git a/sky/mouse.cpp b/engines/sky/mouse.cpp
index dd906b5b2d..dd906b5b2d 100644
--- a/sky/mouse.cpp
+++ b/engines/sky/mouse.cpp
diff --git a/sky/mouse.h b/engines/sky/mouse.h
index 9e713cce03..9e713cce03 100644
--- a/sky/mouse.h
+++ b/engines/sky/mouse.h
diff --git a/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp
index 9b28f832bb..9b28f832bb 100644
--- a/sky/music/adlibchannel.cpp
+++ b/engines/sky/music/adlibchannel.cpp
diff --git a/sky/music/adlibchannel.h b/engines/sky/music/adlibchannel.h
index 661f3a20dc..661f3a20dc 100644
--- a/sky/music/adlibchannel.h
+++ b/engines/sky/music/adlibchannel.h
diff --git a/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp
index e7ee4ecb6d..e7ee4ecb6d 100644
--- a/sky/music/adlibmusic.cpp
+++ b/engines/sky/music/adlibmusic.cpp
diff --git a/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h
index effa19dc51..effa19dc51 100644
--- a/sky/music/adlibmusic.h
+++ b/engines/sky/music/adlibmusic.h
diff --git a/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp
index 66fbdfb69f..66fbdfb69f 100644
--- a/sky/music/gmchannel.cpp
+++ b/engines/sky/music/gmchannel.cpp
diff --git a/sky/music/gmchannel.h b/engines/sky/music/gmchannel.h
index 051b5d0648..051b5d0648 100644
--- a/sky/music/gmchannel.h
+++ b/engines/sky/music/gmchannel.h
diff --git a/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp
index bedb8acc7c..bedb8acc7c 100644
--- a/sky/music/gmmusic.cpp
+++ b/engines/sky/music/gmmusic.cpp
diff --git a/sky/music/gmmusic.h b/engines/sky/music/gmmusic.h
index 2623c6b5cd..2623c6b5cd 100644
--- a/sky/music/gmmusic.h
+++ b/engines/sky/music/gmmusic.h
diff --git a/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp
index a6bcbf4d05..a6bcbf4d05 100644
--- a/sky/music/mt32music.cpp
+++ b/engines/sky/music/mt32music.cpp
diff --git a/sky/music/mt32music.h b/engines/sky/music/mt32music.h
index a64663a15f..a64663a15f 100644
--- a/sky/music/mt32music.h
+++ b/engines/sky/music/mt32music.h
diff --git a/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp
index 9d308ebc7f..9d308ebc7f 100644
--- a/sky/music/musicbase.cpp
+++ b/engines/sky/music/musicbase.cpp
diff --git a/sky/music/musicbase.h b/engines/sky/music/musicbase.h
index d9f3e22beb..d9f3e22beb 100644
--- a/sky/music/musicbase.h
+++ b/engines/sky/music/musicbase.h
diff --git a/sky/rnc_deco.cpp b/engines/sky/rnc_deco.cpp
index 06b7721d74..06b7721d74 100644
--- a/sky/rnc_deco.cpp
+++ b/engines/sky/rnc_deco.cpp
diff --git a/sky/rnc_deco.h b/engines/sky/rnc_deco.h
index 1a05d95531..1a05d95531 100644
--- a/sky/rnc_deco.h
+++ b/engines/sky/rnc_deco.h
diff --git a/sky/screen.cpp b/engines/sky/screen.cpp
index 8688969de5..8688969de5 100644
--- a/sky/screen.cpp
+++ b/engines/sky/screen.cpp
diff --git a/sky/screen.h b/engines/sky/screen.h
index c1e504a87f..c1e504a87f 100644
--- a/sky/screen.h
+++ b/engines/sky/screen.h
diff --git a/sky/sky.cpp b/engines/sky/sky.cpp
index af904097ed..af904097ed 100644
--- a/sky/sky.cpp
+++ b/engines/sky/sky.cpp
diff --git a/sky/sky.h b/engines/sky/sky.h
index 71dcfa533c..71dcfa533c 100644
--- a/sky/sky.h
+++ b/engines/sky/sky.h
diff --git a/sky/skydefs.h b/engines/sky/skydefs.h
index 4d56999f95..4d56999f95 100644
--- a/sky/skydefs.h
+++ b/engines/sky/skydefs.h
diff --git a/sky/sound.cpp b/engines/sky/sound.cpp
index 0cd015d49d..0cd015d49d 100644
--- a/sky/sound.cpp
+++ b/engines/sky/sound.cpp
diff --git a/sky/sound.h b/engines/sky/sound.h
index 6d8283e33a..6d8283e33a 100644
--- a/sky/sound.h
+++ b/engines/sky/sound.h
diff --git a/sky/struc.h b/engines/sky/struc.h
index 45d1d946ca..45d1d946ca 100644
--- a/sky/struc.h
+++ b/engines/sky/struc.h
diff --git a/sky/text.cpp b/engines/sky/text.cpp
index 2c997340ab..2c997340ab 100644
--- a/sky/text.cpp
+++ b/engines/sky/text.cpp
diff --git a/sky/text.h b/engines/sky/text.h
index 33aa6f8df7..33aa6f8df7 100644
--- a/sky/text.h
+++ b/engines/sky/text.h
diff --git a/sword1/animation.cpp b/engines/sword1/animation.cpp
index f6865cc5e2..f6865cc5e2 100644
--- a/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
diff --git a/sword1/animation.h b/engines/sword1/animation.h
index 2200212384..2200212384 100644
--- a/sword1/animation.h
+++ b/engines/sword1/animation.h
diff --git a/sword1/collision.h b/engines/sword1/collision.h
index 0795298ec6..0795298ec6 100644
--- a/sword1/collision.h
+++ b/engines/sword1/collision.h
diff --git a/sword1/control.cpp b/engines/sword1/control.cpp
index bf101e9638..bf101e9638 100644
--- a/sword1/control.cpp
+++ b/engines/sword1/control.cpp
diff --git a/sword1/control.h b/engines/sword1/control.h
index b1f81165be..b1f81165be 100644
--- a/sword1/control.h
+++ b/engines/sword1/control.h
diff --git a/sword1/credits.cpp b/engines/sword1/credits.cpp
index 117430b96f..117430b96f 100644
--- a/sword1/credits.cpp
+++ b/engines/sword1/credits.cpp
diff --git a/sword1/credits.h b/engines/sword1/credits.h
index a964744f22..a964744f22 100644
--- a/sword1/credits.h
+++ b/engines/sword1/credits.h
diff --git a/sword1/debug.cpp b/engines/sword1/debug.cpp
index d5ef5f87da..d5ef5f87da 100644
--- a/sword1/debug.cpp
+++ b/engines/sword1/debug.cpp
diff --git a/sword1/debug.h b/engines/sword1/debug.h
index 36ddf26973..36ddf26973 100644
--- a/sword1/debug.h
+++ b/engines/sword1/debug.h
diff --git a/sword1/eventman.cpp b/engines/sword1/eventman.cpp
index c13007e8fc..c13007e8fc 100644
--- a/sword1/eventman.cpp
+++ b/engines/sword1/eventman.cpp
diff --git a/sword1/eventman.h b/engines/sword1/eventman.h
index c04b12e711..c04b12e711 100644
--- a/sword1/eventman.h
+++ b/engines/sword1/eventman.h
diff --git a/sword1/logic.cpp b/engines/sword1/logic.cpp
index 27108e9e51..27108e9e51 100644
--- a/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
diff --git a/sword1/logic.h b/engines/sword1/logic.h
index 32977dc83c..32977dc83c 100644
--- a/sword1/logic.h
+++ b/engines/sword1/logic.h
diff --git a/sword1/memman.cpp b/engines/sword1/memman.cpp
index b9b0dc5d24..b9b0dc5d24 100644
--- a/sword1/memman.cpp
+++ b/engines/sword1/memman.cpp
diff --git a/sword1/memman.h b/engines/sword1/memman.h
index e230fac1af..e230fac1af 100644
--- a/sword1/memman.h
+++ b/engines/sword1/memman.h
diff --git a/sword1/menu.cpp b/engines/sword1/menu.cpp
index 1266d39daa..1266d39daa 100644
--- a/sword1/menu.cpp
+++ b/engines/sword1/menu.cpp
diff --git a/sword1/menu.h b/engines/sword1/menu.h
index 134ad9ab30..134ad9ab30 100644
--- a/sword1/menu.h
+++ b/engines/sword1/menu.h
diff --git a/engines/sword1/module.mk b/engines/sword1/module.mk
new file mode 100644
index 0000000000..9f4b3f2c3a
--- /dev/null
+++ b/engines/sword1/module.mk
@@ -0,0 +1,32 @@
+MODULE := engines/sword1
+
+MODULE_OBJS := \
+	engines/sword1/animation.o \
+	engines/sword1/control.o \
+	engines/sword1/credits.o \
+	engines/sword1/debug.o \
+	engines/sword1/eventman.o \
+	engines/sword1/logic.o \
+	engines/sword1/memman.o \
+	engines/sword1/menu.o \
+	engines/sword1/mouse.o \
+	engines/sword1/music.o \
+	engines/sword1/objectman.o \
+	engines/sword1/resman.o \
+	engines/sword1/router.o \
+	engines/sword1/screen.o \
+	engines/sword1/sound.o \
+	engines/sword1/staticres.o \
+	engines/sword1/sword1.o \
+	engines/sword1/text.o
+
+MODULE_DIRS += \
+	engines/sword1 
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
diff --git a/sword1/mouse.cpp b/engines/sword1/mouse.cpp
index a84708c6b9..a84708c6b9 100644
--- a/sword1/mouse.cpp
+++ b/engines/sword1/mouse.cpp
diff --git a/sword1/mouse.h b/engines/sword1/mouse.h
index 8512d85791..8512d85791 100644
--- a/sword1/mouse.h
+++ b/engines/sword1/mouse.h
diff --git a/sword1/music.cpp b/engines/sword1/music.cpp
index a5ed77d30d..a5ed77d30d 100644
--- a/sword1/music.cpp
+++ b/engines/sword1/music.cpp
diff --git a/sword1/music.h b/engines/sword1/music.h
index 4f355d3931..4f355d3931 100644
--- a/sword1/music.h
+++ b/engines/sword1/music.h
diff --git a/sword1/object.h b/engines/sword1/object.h
index 3d2cde4a6d..3d2cde4a6d 100644
--- a/sword1/object.h
+++ b/engines/sword1/object.h
diff --git a/sword1/objectman.cpp b/engines/sword1/objectman.cpp
index 330e5566ee..330e5566ee 100644
--- a/sword1/objectman.cpp
+++ b/engines/sword1/objectman.cpp
diff --git a/sword1/objectman.h b/engines/sword1/objectman.h
index 398d7d85a4..398d7d85a4 100644
--- a/sword1/objectman.h
+++ b/engines/sword1/objectman.h
diff --git a/sword1/resman.cpp b/engines/sword1/resman.cpp
index fd86993dfa..fd86993dfa 100644
--- a/sword1/resman.cpp
+++ b/engines/sword1/resman.cpp
diff --git a/sword1/resman.h b/engines/sword1/resman.h
index e2920b0a81..e2920b0a81 100644
--- a/sword1/resman.h
+++ b/engines/sword1/resman.h
diff --git a/sword1/router.cpp b/engines/sword1/router.cpp
index d4a1b26648..d4a1b26648 100644
--- a/sword1/router.cpp
+++ b/engines/sword1/router.cpp
diff --git a/sword1/router.h b/engines/sword1/router.h
index e7c835f6d2..e7c835f6d2 100644
--- a/sword1/router.h
+++ b/engines/sword1/router.h
diff --git a/sword1/screen.cpp b/engines/sword1/screen.cpp
index 248f1d3227..248f1d3227 100644
--- a/sword1/screen.cpp
+++ b/engines/sword1/screen.cpp
diff --git a/sword1/screen.h b/engines/sword1/screen.h
index 43a0b74cab..43a0b74cab 100644
--- a/sword1/screen.h
+++ b/engines/sword1/screen.h
diff --git a/sword1/sound.cpp b/engines/sword1/sound.cpp
index 5275c5683e..5275c5683e 100644
--- a/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
diff --git a/sword1/sound.h b/engines/sword1/sound.h
index 10fed8b33c..10fed8b33c 100644
--- a/sword1/sound.h
+++ b/engines/sword1/sound.h
diff --git a/sword1/staticres.cpp b/engines/sword1/staticres.cpp
index 9991d0e826..9991d0e826 100644
--- a/sword1/staticres.cpp
+++ b/engines/sword1/staticres.cpp
diff --git a/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 1f49426262..1f49426262 100644
--- a/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
diff --git a/sword1/sword1.h b/engines/sword1/sword1.h
index a41685ad75..a41685ad75 100644
--- a/sword1/sword1.h
+++ b/engines/sword1/sword1.h
diff --git a/sword1/sworddefs.h b/engines/sword1/sworddefs.h
index 4b057245c5..4b057245c5 100644
--- a/sword1/sworddefs.h
+++ b/engines/sword1/sworddefs.h
diff --git a/sword1/swordres.h b/engines/sword1/swordres.h
index dca5330350..dca5330350 100644
--- a/sword1/swordres.h
+++ b/engines/sword1/swordres.h
diff --git a/sword1/text.cpp b/engines/sword1/text.cpp
index d7e14073e9..d7e14073e9 100644
--- a/sword1/text.cpp
+++ b/engines/sword1/text.cpp
diff --git a/sword1/text.h b/engines/sword1/text.h
index 34b106518a..34b106518a 100644
--- a/sword1/text.h
+++ b/engines/sword1/text.h
diff --git a/sword2/_mouse.cpp b/engines/sword2/_mouse.cpp
index db0cf00f73..db0cf00f73 100644
--- a/sword2/_mouse.cpp
+++ b/engines/sword2/_mouse.cpp
diff --git a/sword2/animation.cpp b/engines/sword2/animation.cpp
index 2ba5df6792..2ba5df6792 100644
--- a/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
diff --git a/sword2/animation.h b/engines/sword2/animation.h
index e3a554ccd7..e3a554ccd7 100644
--- a/sword2/animation.h
+++ b/engines/sword2/animation.h
diff --git a/sword2/anims.cpp b/engines/sword2/anims.cpp
index e64903a61f..e64903a61f 100644
--- a/sword2/anims.cpp
+++ b/engines/sword2/anims.cpp
diff --git a/sword2/build_display.cpp b/engines/sword2/build_display.cpp
index bc5a31a1f9..bc5a31a1f9 100644
--- a/sword2/build_display.cpp
+++ b/engines/sword2/build_display.cpp
diff --git a/sword2/build_display.h b/engines/sword2/build_display.h
index 1a362da137..1a362da137 100644
--- a/sword2/build_display.h
+++ b/engines/sword2/build_display.h
diff --git a/sword2/console.cpp b/engines/sword2/console.cpp
index b465dc369f..b465dc369f 100644
--- a/sword2/console.cpp
+++ b/engines/sword2/console.cpp
diff --git a/sword2/console.h b/engines/sword2/console.h
index 95bfbe946d..95bfbe946d 100644
--- a/sword2/console.h
+++ b/engines/sword2/console.h
diff --git a/sword2/controls.cpp b/engines/sword2/controls.cpp
index df1b38c83e..df1b38c83e 100644
--- a/sword2/controls.cpp
+++ b/engines/sword2/controls.cpp
diff --git a/sword2/controls.h b/engines/sword2/controls.h
index 719489b3ae..719489b3ae 100644
--- a/sword2/controls.h
+++ b/engines/sword2/controls.h
diff --git a/sword2/d_draw.cpp b/engines/sword2/d_draw.cpp
index 7f278996fb..7f278996fb 100644
--- a/sword2/d_draw.cpp
+++ b/engines/sword2/d_draw.cpp
diff --git a/sword2/debug.cpp b/engines/sword2/debug.cpp
index 53fc200241..53fc200241 100644
--- a/sword2/debug.cpp
+++ b/engines/sword2/debug.cpp
diff --git a/sword2/debug.h b/engines/sword2/debug.h
index 9b0b40f9ec..9b0b40f9ec 100644
--- a/sword2/debug.h
+++ b/engines/sword2/debug.h
diff --git a/sword2/defs.h b/engines/sword2/defs.h
index 4acb484f34..4acb484f34 100644
--- a/sword2/defs.h
+++ b/engines/sword2/defs.h
diff --git a/sword2/events.cpp b/engines/sword2/events.cpp
index e8090414aa..e8090414aa 100644
--- a/sword2/events.cpp
+++ b/engines/sword2/events.cpp
diff --git a/sword2/function.cpp b/engines/sword2/function.cpp
index e749e7b497..e749e7b497 100644
--- a/sword2/function.cpp
+++ b/engines/sword2/function.cpp
diff --git a/sword2/header.h b/engines/sword2/header.h
index 9aefa52832..9aefa52832 100644
--- a/sword2/header.h
+++ b/engines/sword2/header.h
diff --git a/sword2/icons.cpp b/engines/sword2/icons.cpp
index 980c20e3b4..980c20e3b4 100644
--- a/sword2/icons.cpp
+++ b/engines/sword2/icons.cpp
diff --git a/sword2/icons.h b/engines/sword2/icons.h
index ab5ea578ca..ab5ea578ca 100644
--- a/sword2/icons.h
+++ b/engines/sword2/icons.h
diff --git a/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp
index 1a6e7080b8..1a6e7080b8 100644
--- a/sword2/interpreter.cpp
+++ b/engines/sword2/interpreter.cpp
diff --git a/sword2/interpreter.h b/engines/sword2/interpreter.h
index 365f818a98..365f818a98 100644
--- a/sword2/interpreter.h
+++ b/engines/sword2/interpreter.h
diff --git a/sword2/layers.cpp b/engines/sword2/layers.cpp
index 0b59b5a9b1..0b59b5a9b1 100644
--- a/sword2/layers.cpp
+++ b/engines/sword2/layers.cpp
diff --git a/sword2/layers.h b/engines/sword2/layers.h
index 88aff933b3..88aff933b3 100644
--- a/sword2/layers.h
+++ b/engines/sword2/layers.h
diff --git a/sword2/logic.cpp b/engines/sword2/logic.cpp
index c26d5615b9..c26d5615b9 100644
--- a/sword2/logic.cpp
+++ b/engines/sword2/logic.cpp
diff --git a/sword2/logic.h b/engines/sword2/logic.h
index 9e264f603c..9e264f603c 100644
--- a/sword2/logic.h
+++ b/engines/sword2/logic.h
diff --git a/sword2/maketext.cpp b/engines/sword2/maketext.cpp
index 5edaf5e41e..5edaf5e41e 100644
--- a/sword2/maketext.cpp
+++ b/engines/sword2/maketext.cpp
diff --git a/sword2/maketext.h b/engines/sword2/maketext.h
index 364a412857..364a412857 100644
--- a/sword2/maketext.h
+++ b/engines/sword2/maketext.h
diff --git a/sword2/memory.cpp b/engines/sword2/memory.cpp
index 7da4e86b51..7da4e86b51 100644
--- a/sword2/memory.cpp
+++ b/engines/sword2/memory.cpp
diff --git a/sword2/memory.h b/engines/sword2/memory.h
index 3154842cd9..3154842cd9 100644
--- a/sword2/memory.h
+++ b/engines/sword2/memory.h
diff --git a/sword2/menu.cpp b/engines/sword2/menu.cpp
index 07e00accb6..07e00accb6 100644
--- a/sword2/menu.cpp
+++ b/engines/sword2/menu.cpp
diff --git a/engines/sword2/module.mk b/engines/sword2/module.mk
new file mode 100644
index 0000000000..2ee3f39ebb
--- /dev/null
+++ b/engines/sword2/module.mk
@@ -0,0 +1,48 @@
+MODULE := engines/sword2
+
+MODULE_OBJS := \
+	engines/sword2/_mouse.o \
+	engines/sword2/animation.o \
+	engines/sword2/anims.o \
+	engines/sword2/build_display.o \
+	engines/sword2/console.o \
+	engines/sword2/controls.o \
+	engines/sword2/d_draw.o \
+	engines/sword2/debug.o \
+	engines/sword2/events.o \
+	engines/sword2/function.o \
+	engines/sword2/icons.o \
+	engines/sword2/interpreter.o \
+	engines/sword2/layers.o \
+	engines/sword2/logic.o \
+	engines/sword2/maketext.o \
+	engines/sword2/memory.o \
+	engines/sword2/menu.o \
+	engines/sword2/mouse.o \
+	engines/sword2/music.o \
+	engines/sword2/palette.o \
+	engines/sword2/protocol.o \
+	engines/sword2/rdwin.o \
+	engines/sword2/render.o \
+	engines/sword2/resman.o \
+	engines/sword2/router.o \
+	engines/sword2/save_rest.o \
+	engines/sword2/scroll.o \
+	engines/sword2/sound.o \
+	engines/sword2/speech.o \
+	engines/sword2/sprite.o \
+	engines/sword2/startup.o \
+	engines/sword2/sword2.o \
+	engines/sword2/sync.o \
+	engines/sword2/walker.o
+
+MODULE_DIRS += \
+	engines/sword2
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules
diff --git a/sword2/mouse.cpp b/engines/sword2/mouse.cpp
index f8c315a47f..f8c315a47f 100644
--- a/sword2/mouse.cpp
+++ b/engines/sword2/mouse.cpp
diff --git a/sword2/mouse.h b/engines/sword2/mouse.h
index bed5e032ba..bed5e032ba 100644
--- a/sword2/mouse.h
+++ b/engines/sword2/mouse.h
diff --git a/sword2/music.cpp b/engines/sword2/music.cpp
index 847f4808cf..847f4808cf 100644
--- a/sword2/music.cpp
+++ b/engines/sword2/music.cpp
diff --git a/sword2/object.h b/engines/sword2/object.h
index 1fd434f8a0..1fd434f8a0 100644
--- a/sword2/object.h
+++ b/engines/sword2/object.h
diff --git a/sword2/palette.cpp b/engines/sword2/palette.cpp
index 0b6b7a8ca2..0b6b7a8ca2 100644
--- a/sword2/palette.cpp
+++ b/engines/sword2/palette.cpp
diff --git a/sword2/protocol.cpp b/engines/sword2/protocol.cpp
index 23010e27a9..23010e27a9 100644
--- a/sword2/protocol.cpp
+++ b/engines/sword2/protocol.cpp
diff --git a/sword2/rdwin.cpp b/engines/sword2/rdwin.cpp
index 310b66abf7..310b66abf7 100644
--- a/sword2/rdwin.cpp
+++ b/engines/sword2/rdwin.cpp
diff --git a/sword2/render.cpp b/engines/sword2/render.cpp
index da60ecd6d9..da60ecd6d9 100644
--- a/sword2/render.cpp
+++ b/engines/sword2/render.cpp
diff --git a/sword2/resman.cpp b/engines/sword2/resman.cpp
index 7387dc8f50..7387dc8f50 100644
--- a/sword2/resman.cpp
+++ b/engines/sword2/resman.cpp
diff --git a/sword2/resman.h b/engines/sword2/resman.h
index 18b5cb8765..18b5cb8765 100644
--- a/sword2/resman.h
+++ b/engines/sword2/resman.h
diff --git a/sword2/router.cpp b/engines/sword2/router.cpp
index bbca609e3c..bbca609e3c 100644
--- a/sword2/router.cpp
+++ b/engines/sword2/router.cpp
diff --git a/sword2/router.h b/engines/sword2/router.h
index 45efd046bd..45efd046bd 100644
--- a/sword2/router.h
+++ b/engines/sword2/router.h
diff --git a/sword2/save_rest.cpp b/engines/sword2/save_rest.cpp
index df03c21be3..df03c21be3 100644
--- a/sword2/save_rest.cpp
+++ b/engines/sword2/save_rest.cpp
diff --git a/sword2/save_rest.h b/engines/sword2/save_rest.h
index 9463f3fd4a..9463f3fd4a 100644
--- a/sword2/save_rest.h
+++ b/engines/sword2/save_rest.h
diff --git a/sword2/scroll.cpp b/engines/sword2/scroll.cpp
index 3d0a263bc6..3d0a263bc6 100644
--- a/sword2/scroll.cpp
+++ b/engines/sword2/scroll.cpp
diff --git a/sword2/sound.cpp b/engines/sword2/sound.cpp
index d855e88afb..d855e88afb 100644
--- a/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
diff --git a/sword2/sound.h b/engines/sword2/sound.h
index 7390a60bbc..7390a60bbc 100644
--- a/sword2/sound.h
+++ b/engines/sword2/sound.h
diff --git a/sword2/speech.cpp b/engines/sword2/speech.cpp
index da6bd258ea..da6bd258ea 100644
--- a/sword2/speech.cpp
+++ b/engines/sword2/speech.cpp
diff --git a/sword2/sprite.cpp b/engines/sword2/sprite.cpp
index a0ba7f7189..a0ba7f7189 100644
--- a/sword2/sprite.cpp
+++ b/engines/sword2/sprite.cpp
diff --git a/sword2/startup.cpp b/engines/sword2/startup.cpp
index 2e1dd7b0ae..2e1dd7b0ae 100644
--- a/sword2/startup.cpp
+++ b/engines/sword2/startup.cpp
diff --git a/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 6056d636b7..6056d636b7 100644
--- a/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
diff --git a/sword2/sword2.h b/engines/sword2/sword2.h
index bcb80ec957..bcb80ec957 100644
--- a/sword2/sword2.h
+++ b/engines/sword2/sword2.h
diff --git a/sword2/sync.cpp b/engines/sword2/sync.cpp
index 205e273873..205e273873 100644
--- a/sword2/sync.cpp
+++ b/engines/sword2/sync.cpp
diff --git a/sword2/walker.cpp b/engines/sword2/walker.cpp
index 82ef80f65f..82ef80f65f 100644
--- a/sword2/walker.cpp
+++ b/engines/sword2/walker.cpp
diff --git a/gob/module.mk b/gob/module.mk
deleted file mode 100644
index 914931d775..0000000000
--- a/gob/module.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-MODULE := gob
-
-MODULE_OBJS := \
-	gob/anim.o \
-	gob/cdrom.o \
-	gob/dataio.o \
-	gob/draw.o \
-	gob/driver_vga.o \
-	gob/game.o \
-	gob/global.o \
-	gob/gob.o \
-	gob/goblin.o \
-	gob/init.o \
-	gob/inter.o \
-	gob/inter_v1.o \
-	gob/inter_v2.o \
-	gob/map.o \
-	gob/mult.o \
-	gob/music.o \
-	gob/pack.o \
-	gob/palanim.o \
-	gob/parse.o \
-	gob/parse_v1.o \
-	gob/parse_v2.o \
-	gob/scenery.o \
-	gob/sound.o \
-	gob/timer.o \
-	gob/util.o \
-	gob/video.o
-
-MODULE_DIRS += \
-	gob
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules
diff --git a/kyra/module.mk b/kyra/module.mk
deleted file mode 100644
index 6d0a2f02e5..0000000000
--- a/kyra/module.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-MODULE := kyra
-
-MODULE_OBJS := \
-	kyra/kyra.o \
-	kyra/resource.o \
-	kyra/screen.o \
-	kyra/script_v1.o \
-	kyra/script.o \
-	kyra/seqplayer.o \
-	kyra/sound.o \
-	kyra/staticres.o \
-	kyra/sprites.o \
-	kyra/wsamovie.o \
-	kyra/debugger.o \
-	kyra/animator.o \
-	kyra/gui.o \
-	kyra/sequences_v1.o \
-	kyra/items.o \
-	kyra/scene.o \
-	kyra/text.o \
-	kyra/timer.o \
-	kyra/saveload.o
-
-MODULE_DIRS += \
-	kyra
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules
diff --git a/lure/module.mk b/lure/module.mk
deleted file mode 100644
index da1025ee6a..0000000000
--- a/lure/module.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-MODULE := lure
-
-MODULE_OBJS := \
-	lure/animseq.o \
-	lure/debug-input.o \
-	lure/debug-methods.o \
-	lure/decode.o \
-	lure/disk.o \
-	lure/events.o \
-	lure/game.o \
-	lure/hotspots.o \
-	lure/intro.o \
-	lure/lure.o \
-	lure/memory.o \
-	lure/menu.o \
-	lure/palette.o \
-	lure/res.o \
-	lure/res_struct.o \
-	lure/room.o \
-	lure/screen.o \
-	lure/scripts.o \
-	lure/strings.o \
-	lure/surface.o \
-	lure/system.o
-
-MODULE_DIRS += \
-	lure
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules
-
diff --git a/queen/module.mk b/queen/module.mk
deleted file mode 100644
index 62ee481d5e..0000000000
--- a/queen/module.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-MODULE := queen
-
-MODULE_OBJS := \
-	queen/bankman.o \
-	queen/command.o \
-	queen/credits.o \
-	queen/cutaway.o \
-	queen/debug.o \
-	queen/display.o \
-	queen/graphics.o \
-	queen/grid.o \
-	queen/input.o \
-	queen/journal.o \
-	queen/logic.o \
-	queen/music.o \
-	queen/musicdata.o \
-	queen/queen.o \
-	queen/resource.o \
-	queen/restables.o \
-	queen/sound.o \
-	queen/state.o \
-	queen/talk.o \
-	queen/walk.o
-
-MODULE_DIRS += \
-	queen
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules
diff --git a/saga/module.mk b/saga/module.mk
deleted file mode 100644
index 0f648fea48..0000000000
--- a/saga/module.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-MODULE := saga
-
-MODULE_OBJS := \
-	saga/actor.o \
-	saga/animation.o \
-	saga/console.o \
-	saga/events.o \
-	saga/font.o \
-	saga/font_map.o \
-	saga/game.o \
-	saga/gfx.o \
-	saga/ihnm_introproc.o \
-	saga/image.o \
-	saga/interface.o \
-	saga/isomap.o \
-	saga/ite_introproc.o \
-	saga/itedata.o \
-	saga/objectmap.o \
-	saga/puzzle.o \
-	saga/palanim.o \
-	saga/render.o \
-	saga/rscfile.o \
-	saga/saga.o \
-	saga/saveload.o \
-	saga/scene.o \
-	saga/script.o \
-	saga/sfuncs.o \
-	saga/sndres.o \
-	saga/sprite.o \
-	saga/sthread.o \
-	saga/input.o \
-	saga/music.o \
-	saga/sound.o
-
-MODULE_DIRS += \
-	saga
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules
diff --git a/scumm/module.mk b/scumm/module.mk
deleted file mode 100644
index 547a64e174..0000000000
--- a/scumm/module.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-MODULE := scumm
-
-MODULE_OBJS := \
-	scumm/actor.o \
-	scumm/akos.o \
-	scumm/base-costume.o \
-	scumm/bomp.o \
-	scumm/boxes.o \
-	scumm/camera.o \
-	scumm/charset.o \
-	scumm/costume.o \
-	scumm/cursor.o \
-	scumm/debugger.o \
-	scumm/dialogs.o \
-	scumm/gfx.o \
-	scumm/imuse.o \
-	scumm/imuse_player.o \
-	scumm/input.o \
-	scumm/instrument.o \
-	scumm/help.o \
-	scumm/midiparser_ro.o \
-	scumm/midiparser_eup.o \
-	scumm/object.o \
-	scumm/palette.o \
-	scumm/player_mod.o \
-	scumm/player_v1.o \
-	scumm/player_nes.o \
-	scumm/player_v2.o \
-	scumm/player_v2a.o \
-	scumm/player_v3a.o \
-	scumm/resource.o \
-	scumm/resource_v2.o \
-	scumm/resource_v3.o \
-	scumm/resource_v4.o \
-	scumm/room.o \
-	scumm/saveload.o \
-	scumm/script.o \
-	scumm/script_c64.o \
-	scumm/script_v2.o \
-	scumm/script_v5.o \
-	scumm/script_v6.o \
-	scumm/script_v6he.o \
-	scumm/scumm.o \
-	scumm/sound.o \
-	scumm/sound_he.o \
-	scumm/string.o \
-	scumm/usage_bits.o \
-	scumm/util.o \
-	scumm/vars.o \
-	scumm/verbs.o \
-	scumm/thumbnail.o
-
-ifndef DISABLE_SCUMM_7_8
-MODULE_OBJS += \
-	scumm/nut_renderer.o \
-	scumm/script_v8.o \
-	scumm/imuse_digi/dimuse.o \
-	scumm/imuse_digi/dimuse_bndmgr.o \
-	scumm/imuse_digi/dimuse_codecs.o \
-	scumm/imuse_digi/dimuse_music.o \
-	scumm/imuse_digi/dimuse_sndmgr.o \
-	scumm/imuse_digi/dimuse_script.o \
-	scumm/imuse_digi/dimuse_track.o \
-	scumm/imuse_digi/dimuse_tables.o \
-	scumm/insane/insane.o \
-	scumm/insane/insane_ben.o \
-	scumm/insane/insane_enemy.o \
-	scumm/insane/insane_scenes.o \
-	scumm/insane/insane_iact.o \
-	scumm/smush/chunk.o \
-	scumm/smush/codec1.o \
-	scumm/smush/codec37.o \
-	scumm/smush/codec47.o \
-	scumm/smush/imuse_channel.o \
-	scumm/smush/smush_player.o \
-	scumm/smush/saud_channel.o \
-	scumm/smush/smush_mixer.o \
-	scumm/smush/smush_font.o
-endif
-
-ifndef DISABLE_HE
-MODULE_OBJS += \
-	scumm/floodfill_he.o \
-	scumm/logic_he.o \
-	scumm/palette_he.o \
-	scumm/resource_v7he.o \
-	scumm/script_v7he.o \
-	scumm/script_v72he.o \
-	scumm/script_v80he.o \
-	scumm/script_v90he.o \
-	scumm/script_v100he.o \
-	scumm/sprite_he.o \
-	scumm/wiz_he.o
-endif
-
-MODULE_DIRS += \
-	scumm \
-	scumm/imuse_digi \
-	scumm/insane \
-	scumm/smush
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-# HACK HACK evil HACK HACK
-PLUGIN_LDFLAGS += -lz
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules
diff --git a/simon/module.mk b/simon/module.mk
deleted file mode 100644
index d2f860fb7f..0000000000
--- a/simon/module.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-MODULE := simon
-
-MODULE_OBJS := \
-	simon/charset.o \
-	simon/cursor.o \
-	simon/debug.o \
-	simon/debugger.o \
-	simon/game.o \
-	simon/icons.o \
-	simon/items.o \
-	simon/midi.o \
-	simon/midiparser_s1d.o \
-	simon/res.o \
-	simon/saveload.o \
-	simon/sound.o \
-	simon/simon.o \
-	simon/verb.o \
-	simon/vga.o \
-
-MODULE_DIRS += \
-	simon
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules
diff --git a/sky/module.mk b/sky/module.mk
deleted file mode 100644
index 45582927bc..0000000000
--- a/sky/module.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-MODULE := sky
-
-MODULE_OBJS := \
-	sky/autoroute.o \
-	sky/compact.o \
-	sky/control.o \
-	sky/debug.o \
-	sky/disk.o \
-	sky/grid.o \
-	sky/hufftext.o \
-	sky/intro.o \
-	sky/logic.o \
-	sky/mouse.o \
-	sky/rnc_deco.o \
-	sky/screen.o \
-	sky/sky.o \
-	sky/sound.o \
-	sky/text.o \
-	sky/music/adlibchannel.o \
-	sky/music/adlibmusic.o \
-	sky/music/gmchannel.o \
-	sky/music/gmmusic.o \
-	sky/music/mt32music.o \
-	sky/music/musicbase.o
-
-MODULE_DIRS += \
-	sky \
-	sky/music \
-	sky/compacts
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules
diff --git a/sword1/module.mk b/sword1/module.mk
deleted file mode 100644
index 77f1b0bb9d..0000000000
--- a/sword1/module.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-MODULE := sword1
-
-MODULE_OBJS := \
-	sword1/animation.o \
-	sword1/control.o \
-	sword1/credits.o \
-	sword1/debug.o \
-	sword1/eventman.o \
-	sword1/logic.o \
-	sword1/memman.o \
-	sword1/menu.o \
-	sword1/mouse.o \
-	sword1/music.o \
-	sword1/objectman.o \
-	sword1/resman.o \
-	sword1/router.o \
-	sword1/screen.o \
-	sword1/sound.o \
-	sword1/staticres.o \
-	sword1/sword1.o \
-	sword1/text.o
-
-MODULE_DIRS += \
-	sword1 
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules
diff --git a/sword2/module.mk b/sword2/module.mk
deleted file mode 100644
index fb020ba633..0000000000
--- a/sword2/module.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-MODULE := sword2
-
-MODULE_OBJS := \
-	sword2/_mouse.o \
-	sword2/animation.o \
-	sword2/anims.o \
-	sword2/build_display.o \
-	sword2/console.o \
-	sword2/controls.o \
-	sword2/d_draw.o \
-	sword2/debug.o \
-	sword2/events.o \
-	sword2/function.o \
-	sword2/icons.o \
-	sword2/interpreter.o \
-	sword2/layers.o \
-	sword2/logic.o \
-	sword2/maketext.o \
-	sword2/memory.o \
-	sword2/menu.o \
-	sword2/mouse.o \
-	sword2/music.o \
-	sword2/palette.o \
-	sword2/protocol.o \
-	sword2/rdwin.o \
-	sword2/render.o \
-	sword2/resman.o \
-	sword2/router.o \
-	sword2/save_rest.o \
-	sword2/scroll.o \
-	sword2/sound.o \
-	sword2/speech.o \
-	sword2/sprite.o \
-	sword2/startup.o \
-	sword2/sword2.o \
-	sword2/sync.o \
-	sword2/walker.o
-
-MODULE_DIRS += \
-	sword2
-
-# This module can be built as a plugin
-ifdef BUILD_PLUGINS
-PLUGIN := 1
-endif
-
-# Include common rules 
-include $(srcdir)/common.rules