diff --git a/src/nostalgia/player/app.cpp b/src/nostalgia/player/app.cpp
index 4191b0ab..cd69fa19 100644
--- a/src/nostalgia/player/app.cpp
+++ b/src/nostalgia/player/app.cpp
@@ -157,8 +157,6 @@ static ox::Error runScene(turbine::Context &tctx) {
 	return turbine::run(tctx);
 }
 
-namespace olympic {
-
 ox::Error run(
 		[[maybe_unused]] ox::StringView project,
 		[[maybe_unused]] ox::StringView appName,
@@ -172,5 +170,3 @@ ox::Error run(
 	oxRequireM(tctx, turbine::init(std::move(fs), project));
 	return runTileSheetSetTest(*tctx);
 }
-
-}
\ No newline at end of file
diff --git a/src/olympic/applib/applib.cpp b/src/olympic/applib/applib.cpp
index 0c4693b4..142a5380 100644
--- a/src/olympic/applib/applib.cpp
+++ b/src/olympic/applib/applib.cpp
@@ -17,6 +17,10 @@
 #define OLYMPIC_APP_VERSION "dev build"
 #endif
 
+#ifndef OLYMPIC_GUI_APP
+#define OLYMPIC_GUI_APP 0
+#endif
+
 #ifndef OLYMPIC_PROJECT_NAMESPACE
 #define OLYMPIC_PROJECT_NAMESPACE project
 #endif
@@ -34,8 +38,8 @@
 #endif
 
 namespace olympic {
-
 ox::String appVersion = ox::String(OLYMPIC_APP_VERSION);
+}
 
 ox::Error run(
 		ox::StringView project,
@@ -43,8 +47,6 @@ ox::Error run(
 		ox::StringView projectDataDir,
 		ox::SpanView<char const*> argv) noexcept;
 
-}
-
 namespace OLYMPIC_PROJECT_NAMESPACE {
 void registerKeelModules() noexcept;
 void registerStudioModules() noexcept;
@@ -64,7 +66,7 @@ int main(int argc, char const**argv) {
 #if OLYMPIC_LOAD_STUDIO_MODULES
 	OLYMPIC_PROJECT_NAMESPACE::registerStudioModules();
 #endif
-	auto const err = olympic::run(
+	auto const err = run(
 			OLYMPIC_PROJECT_NAME,
 			OLYMPIC_APP_NAME,
 			OLYMPIC_PROJECT_DATADIR,
diff --git a/src/olympic/keel/src/pack-applib.cpp b/src/olympic/keel/src/pack-applib.cpp
index 3f480f0f..d963382c 100644
--- a/src/olympic/keel/src/pack-applib.cpp
+++ b/src/olympic/keel/src/pack-applib.cpp
@@ -97,8 +97,6 @@ static ox::Error run(ox::SpanView<char const*> argv, ox::StringView projectDataD
 	return pack(argSrc, argRomBin, argManifest, projectDataDir);
 }
 
-namespace olympic {
-
 ox::Error run(
 		[[maybe_unused]] ox::StringView project,
 		[[maybe_unused]] ox::StringView appName,
@@ -106,5 +104,3 @@ ox::Error run(
 		ox::SpanView<char const*> argv) noexcept {
 	return ::run(argv, projectDataDir);
 }
-
-}
diff --git a/src/olympic/studio/applib/src/main.cpp b/src/olympic/studio/applib/src/main.cpp
index b2574500..3f5c1060 100644
--- a/src/olympic/studio/applib/src/main.cpp
+++ b/src/olympic/studio/applib/src/main.cpp
@@ -67,8 +67,6 @@ static ox::Error run(
 
 }
 
-namespace olympic {
-
 ox::Error run(
 		ox::StringView project,
 		ox::StringView appName,
@@ -76,5 +74,3 @@ ox::Error run(
 		ox::SpanView<char const*> args) noexcept {
 	return studio::run(ox::sfmt("{} {}", project, appName), projectDataDir, args);
 }
-
-}