diff --git a/SConstruct b/SConstruct
index 893c0c669..c67cafc19 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1637,6 +1637,9 @@ class DXXArchive(DXXCommon):
 'arch/sdl/joy.cpp',
 'arch/sdl/rbaudio.cpp',
 'arch/sdl/window.cpp',
+'main/cli.cpp',
+'main/cmd.cpp',
+'main/cvar.cpp',
 'maths/fixc.cpp',
 'maths/rand.cpp',
 'maths/tables.cpp',
@@ -1797,15 +1800,12 @@ class DXXProgram(DXXCommon):
 'main/aipath.cpp',
 'main/automap.cpp',
 'main/bm.cpp',
-'main/cli.cpp',
-'main/cmd.cpp',
 'main/cntrlcen.cpp',
 'main/collide.cpp',
 'main/config.cpp',
 'main/console.cpp',
 'main/controls.cpp',
 'main/credits.cpp',
-'main/cvar.cpp',
 'main/digiobj.cpp',
 'main/effects.cpp',
 'main/endlevel.cpp',
diff --git a/similar/main/cli.cpp b/common/main/cli.cpp
similarity index 100%
rename from similar/main/cli.cpp
rename to common/main/cli.cpp
diff --git a/similar/main/cmd.cpp b/common/main/cmd.cpp
similarity index 100%
rename from similar/main/cmd.cpp
rename to common/main/cmd.cpp
diff --git a/similar/main/cvar.cpp b/common/main/cvar.cpp
similarity index 100%
rename from similar/main/cvar.cpp
rename to common/main/cvar.cpp