diff --git a/Makefile.common b/Makefile.common
index c20e08cfc6a..bfcafac18c5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -36,6 +36,8 @@ MODULES += \
 	audio \
 	math \
 	common \
+	common/compression \
+	common/formats \
 	po \
 	doc
 
diff --git a/common/compression/module.mk b/common/compression/module.mk
new file mode 100644
index 00000000000..a9a2a4f4f02
--- /dev/null
+++ b/common/compression/module.mk
@@ -0,0 +1,18 @@
+MODULE := common/compression
+
+MODULE_OBJS := \
+	clickteam.o \
+	dcl.o \
+	gzio.o \
+	installshield_cab.o \
+	installshieldv3_archive.o \
+	powerpacker.o \
+	rnc_deco.o \
+	stuffit.o \
+	unarj.o \
+	unzip.o \
+	vise.o \
+	zlib.o
+
+# Include common rules
+include $(srcdir)/rules.mk
diff --git a/common/formats/module.mk b/common/formats/module.mk
new file mode 100644
index 00000000000..e68397c5b5c
--- /dev/null
+++ b/common/formats/module.mk
@@ -0,0 +1,14 @@
+MODULE := common/formats
+
+MODULE_OBJS := \
+	iff_container.o \
+	ini-file.o \
+	json.o \
+	quicktime.o \
+	winexe.o \
+	winexe_ne.o \
+	winexe_pe.o \
+	xmlparser.o
+
+# Include common rules
+include $(srcdir)/rules.mk
diff --git a/common/module.mk b/common/module.mk
index 95de5bb49ce..f26be66280f 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -39,27 +39,7 @@ MODULE_OBJS := \
 	unicode-bidi.o \
 	ustr.o \
 	util.o \
-	xpfloat.o \
-	compression/clickteam.o \
-	compression/dcl.o \
-	compression/gzio.o \
-	compression/installshield_cab.o \
-	compression/installshieldv3_archive.o \
-	compression/powerpacker.o \
-	compression/rnc_deco.o \
-	compression/stuffit.o \
-	compression/unarj.o \
-	compression/unzip.o \
-	compression/vise.o \
-	compression/zlib.o \
-	formats/iff_container.o \
-	formats/ini-file.o \
-	formats/json.o \
-	formats/quicktime.o \
-	formats/winexe.o \
-	formats/winexe_ne.o \
-	formats/winexe_pe.o \
-	formats/xmlparser.o
+	xpfloat.o
 
 ifdef ENABLE_EVENTRECORDER
 MODULE_OBJS += \
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 7387d0239f9..c76e31d50b3 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1608,6 +1608,8 @@ void ProjectProvider::createProject(BuildSetup &setup) {
 		createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/base", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/common", setup.defines, setup.testDirs, in, ex);
+		createModuleList(setup.srcDir + "/common/compression", setup.defines, setup.testDirs, in, ex);
+		createModuleList(setup.srcDir + "/common/formats", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/common/lua", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/engines", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/graphics", setup.defines, setup.testDirs, in, ex);
diff --git a/test/module.mk b/test/module.mk
index d1fc45452c2..6116d3ef6e9 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -28,7 +28,7 @@ TEST_LIBS += test/null_osystem.o \
 	backends/platform/sdl/win32/win32_wrapper.o
 endif
 
-TEST_LIBS +=	audio/libaudio.a math/libmath.a common/libcommon.a image/libimage.a graphics/libgraphics.a
+TEST_LIBS +=	audio/libaudio.a math/libmath.a common/formats/libformats.a common/compression/libcompression.a common/libcommon.a image/libimage.a graphics/libgraphics.a
 
 ifeq ($(ENABLE_WINTERMUTE), STATIC_PLUGIN)
 	TESTS += $(srcdir)/test/engines/wintermute/*.h