diff --git a/scripts/build.app.c++-qt/build.monolithic b/scripts/build.app.c++-qt/build.monolithic
index 9fb05f8..3f5ef15 100644
--- a/scripts/build.app.c++-qt/build.monolithic
+++ b/scripts/build.app.c++-qt/build.monolithic
@@ -8,7 +8,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
     PREMOC="${SRC}.premoc.cpp"
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.cpp)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.cpp)"
     make_monolithic ${PREMOC} C || return 1
 
     if [ "${PREMOC}" -nt "${SRC}" ]
diff --git a/scripts/build.app.c++/build.monolithic b/scripts/build.app.c++/build.monolithic
index ba32701..162bbbd 100644
--- a/scripts/build.app.c++/build.monolithic
+++ b/scripts/build.app.c++/build.monolithic
@@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
 
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.cpp)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.cpp)"
     make_monolithic ${SRC} C || return 1
 
     @CNAME@_MONOLITHIC=1
diff --git a/scripts/build.firmware.gpasm/build.monolithic b/scripts/build.firmware.gpasm/build.monolithic
index 68df7a9..a264ab1 100644
--- a/scripts/build.firmware.gpasm/build.monolithic
+++ b/scripts/build.firmware.gpasm/build.monolithic
@@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
 
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopSource,BottomSource}.asm)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.asm)"
     make_monolithic ${SRC} none || return 1
 
     @CNAME@_MONOLITHIC=1
diff --git a/scripts/build.firmware.sdcc/build.monolithic b/scripts/build.firmware.sdcc/build.monolithic
index 9065ded..bab3dcb 100644
--- a/scripts/build.firmware.sdcc/build.monolithic
+++ b/scripts/build.firmware.sdcc/build.monolithic
@@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
 
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)"
     make_monolithic ${SRC} C || return 1
 
     @CNAME@_MONOLITHIC=1
diff --git a/scripts/build.lib.c++/build.monolithic b/scripts/build.lib.c++/build.monolithic
index 5435506..56f3024 100644
--- a/scripts/build.lib.c++/build.monolithic
+++ b/scripts/build.lib.c++/build.monolithic
@@ -8,10 +8,10 @@ MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
 
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.h)"
     make_monolithic ${HDR} Ch || return 1
 
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.cpp)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.cpp)"
     make_monolithic ${SRC} C || return 1
 
     @CNAME@_MONOLITHIC=1
diff --git a/scripts/build.lib.c/build.monolithic b/scripts/build.lib.c/build.monolithic
index ef8f88d..5a934b5 100644
--- a/scripts/build.lib.c/build.monolithic
+++ b/scripts/build.lib.c/build.monolithic
@@ -8,10 +8,10 @@ MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
 
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.h)"
     make_monolithic ${HDR} Ch || return 1
 
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)"
     make_monolithic ${SRC} C || return 1
 
     @CNAME@_MONOLITHIC=1
diff --git a/scripts/build.module.c/build.monolithic b/scripts/build.module.c/build.monolithic
index 54fdd56..f85cdda 100644
--- a/scripts/build.module.c/build.monolithic
+++ b/scripts/build.module.c/build.monolithic
@@ -8,7 +8,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.module src/@NAME@/build.monolithic"
 
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)"
     make_monolithic ${SRC} C || return 1
 
     @CNAME@_MONOLITHIC=1