diff --git a/Makefile b/Makefile
index 8a1c3c4..b221234 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ DEMO = \
 	 demo.cc \
 	 main.cc \
 	 opemu.cc \
-	 syncview.cc \
+	 ui-sequencer.cc \
 # END DEMO
 
 PARSERCHECK = \
diff --git a/camera.hh b/camera.hh
index 2979dd9..6f3b31c 100644
--- a/camera.hh
+++ b/camera.hh
@@ -1,5 +1,5 @@
 #pragma once
-#include "mousectrl.hh"
+#include "ui-mousectrl.hh"
 
 
 /*= T_Camera =================================================================*/
diff --git a/main.cc b/main.cc
index a27992a..37a95b0 100644
--- a/main.cc
+++ b/main.cc
@@ -6,10 +6,10 @@
 #include "window.hh"
 #include "shaders.hh"
 #include "odbg.hh"
-#include "ops.hh"
+#include "opemu.hh"
 #include "rendertarget.hh"
 #include "sync.hh"
-#include "syncview.hh"
+#include "ui-sequencer.hh"
 #include "undo.hh"
 
 
diff --git a/sync.hh b/sync.hh
index 085ac3c..e069f1e 100644
--- a/sync.hh
+++ b/sync.hh
@@ -1,7 +1,7 @@
 #pragma once
 #include "filewatcher.hh"
 #include "utilities.hh"
-#include "mousectrl.hh"
+#include "ui-mousectrl.hh"
 
 #include <ebcl/SRDParserConfig.hh>
 #include <ebcl/Sets.hh>
diff --git a/mousectrl.hh b/ui-mousectrl.hh
similarity index 100%
rename from mousectrl.hh
rename to ui-mousectrl.hh
diff --git a/syncview.cc b/ui-sequencer.cc
similarity index 99%
rename from syncview.cc
rename to ui-sequencer.cc
index 481fe03..257c5d1 100644
--- a/syncview.cc
+++ b/ui-sequencer.cc
@@ -1,5 +1,6 @@
 #include "externals.hh"
-#include "syncview.hh"
+#include "ui-sequencer.hh"
+#include "sync.hh"
 #include "globals.hh"
 #include "window.hh"
 #include "syncedit.hh"
diff --git a/syncview.hh b/ui-sequencer.hh
similarity index 73%
rename from syncview.hh
rename to ui-sequencer.hh
index d501294..ac99677 100644
--- a/syncview.hh
+++ b/ui-sequencer.hh
@@ -1,5 +1,7 @@
 #pragma once
-#include "sync.hh"
+#ifndef REAL_BUILD
+# include "externals.hh"
+#endif
 
 
 class T_SyncView : public ebcl::A_PrivateImplementation
diff --git a/window.hh b/window.hh
index b4bd029..dd41d06 100644
--- a/window.hh
+++ b/window.hh
@@ -1,6 +1,6 @@
 #pragma once
 #include "ui-dialogs.hh"
-#include "mousectrl.hh"
+#include "ui-mousectrl.hh"
 #include "ui-actions.hh"