diff --git a/include/ui.hpp b/include/ui.hpp
deleted file mode 100644
index 53927897..00000000
--- a/include/ui.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-#include <ui/common.hpp>
-#include <color.hpp>
-
-
-namespace rack {
-
-
-/** General user interface widgets using Blendish
-*/
-namespace ui {
-
-
-void init();
-void destroy();
-void setTheme(NVGcolor bg, NVGcolor fg);
-
-
-} // namespace ui
-} // namespace rack
diff --git a/include/ui/common.hpp b/include/ui/common.hpp
index b66274bc..349aff1f 100644
--- a/include/ui/common.hpp
+++ b/include/ui/common.hpp
@@ -3,6 +3,7 @@
 #include <blendish.h>
 
 #include <common.hpp>
+#include <color.hpp>
 
 /** Useful for menu items with a "true" boolean state */
 #define CHECKMARK_STRING "✔"
@@ -10,3 +11,20 @@
 
 /** Useful for menu items that open a sub-menu */
 #define RIGHT_ARROW "▸"
+
+
+namespace rack {
+
+
+/** General user interface widgets using Blendish
+*/
+namespace ui {
+
+
+void init();
+void destroy();
+void setTheme(NVGcolor bg, NVGcolor fg);
+
+
+} // namespace ui
+} // namespace rack
diff --git a/src/ui.cpp b/src/ui/common.cpp
similarity index 98%
rename from src/ui.cpp
rename to src/ui/common.cpp
index cf957a0d..6cb981b5 100644
--- a/src/ui.cpp
+++ b/src/ui/common.cpp
@@ -1,4 +1,4 @@
-#include <ui.hpp>
+#include <ui/common.hpp>
 
 
 namespace rack {
diff --git a/standalone/main.cpp b/standalone/main.cpp
index e28aa1f3..83c0e066 100644
--- a/standalone/main.cpp
+++ b/standalone/main.cpp
@@ -16,7 +16,7 @@
 #include <window.hpp>
 #include <patch.hpp>
 #include <history.hpp>
-#include <ui.hpp>
+#include <ui/common.hpp>
 #include <system.hpp>
 #include <string.hpp>
 #include <library.hpp>