diff --git a/Makefile b/Makefile
index 39224cb..bf47db7 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ IMGUI = imgui.cpp imgui_draw.cpp
 
 COMMON = \
 	 common.cc \
+	 c-camera.cc \
 	 c-filewatcher.cc \
 	 c-utilities.cc \
 	 c-undo.cc \
@@ -30,8 +31,6 @@ COMMON = \
 	 c-syncedit.cc \
 	 c-syncoverrides.cc \
 	 \
-	 camera.cc \
-	 \
 	 ui.cc \
 	 ui-actions.cc \
 	 ui-app.cc \
@@ -39,6 +38,7 @@ COMMON = \
 	 ui-dialogs.cc \
 	 ui-imgui-sdl.cc \
 	 ui-odbg.cc \
+	 ui-opemu.cc \
 	 ui-overrides.cc \
 	 ui-profiling.cc \
 	 ui-rendertarget.cc \
@@ -52,7 +52,6 @@ COMMON = \
 DEMO = \
 	 demo.cc \
 	 main.cc \
-	 ui-opemu.cc \
 # END DEMO
 
 PARSERCHECK = \
diff --git a/camera.cc b/c-camera.cc
similarity index 98%
rename from camera.cc
rename to c-camera.cc
index e9c7a6c..a407429 100644
--- a/camera.cc
+++ b/c-camera.cc
@@ -1,5 +1,5 @@
 #include "externals.hh"
-#include "camera.hh"
+#include "c-camera.hh"
 #include "c-utilities.hh"
 
 #include <glm/gtc/matrix_access.hpp>
diff --git a/camera.hh b/c-camera.hh
similarity index 100%
rename from camera.hh
rename to c-camera.hh
diff --git a/c-syncoverrides.hh b/c-syncoverrides.hh
index bb639d8..5730050 100644
--- a/c-syncoverrides.hh
+++ b/c-syncoverrides.hh
@@ -1,6 +1,6 @@
 #pragma once
+#include "c-camera.hh"
 #include "c-sync.hh"
-#include "camera.hh"
 
 namespace sov {
 
diff --git a/ui-utilities.cc b/ui-utilities.cc
index 7bbf63e..1a8fcd8 100644
--- a/ui-utilities.cc
+++ b/ui-utilities.cc
@@ -1,6 +1,6 @@
 #include "externals.hh"
+#include "c-camera.hh"
 #include "c-utilities.hh"
-#include "camera.hh"
 #include "ui-utilities.hh"
 
 #include <imgui_internal.h>