diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 4d31cfbe29..c8734da59b 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -33,7 +33,6 @@
 #include "enums.h"
 #include "waveview.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace ARDOUR {
 	class AudioRegion;
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 75974a7dbe..1e66b29321 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -47,7 +47,6 @@
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "utils.h"
-#include "color.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index c8c9d5c4f6..bd56b371a3 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -28,7 +28,6 @@
 #include <ardour/location.h>
 #include "enums.h"
 #include "simplerect.h"
-#include "color.h"
 #include "streamview.h"
 
 namespace Gdk {
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index 291a900e8b..9354895f47 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -38,7 +38,6 @@
 #include "enums.h"
 #include "route_time_axis.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace ARDOUR {
 	class Session;
diff --git a/gtk2_ardour/color.h b/gtk2_ardour/color.h
deleted file mode 100644
index b1b730c7fa..0000000000
--- a/gtk2_ardour/color.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-    Copyright (C) 2000-2007 Paul Davis 
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __gtk_ardour_color_h__
-#define __gtk_ardour_color_h__
-
-#include <sigc++/signal.h>
-
-extern sigc::signal<void>                  ColorsChanged;
-extern sigc::signal<void,uint32_t> ColorChanged;
-
-#endif /* __gtk_ardour_color_h__ */
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 45be72abed..971abbe3ae 100644
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -48,7 +48,6 @@
 #include "canvas_impl.h"
 #include "simplerect.h"
 #include "waveview.h"
-#include "color.h"
 
 using namespace std;
 using namespace ARDOUR;
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 08fc136da6..e850fec519 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -42,7 +42,6 @@
 #include "tempo_dialog.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
-#include "color.h"
 #include "time_axis_view.h"
 #include "ardour_ui.h"
 
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index ff8505046b..a177821b96 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -24,7 +24,6 @@
 #include "public_editor.h"
 #include "utils.h"
 #include "canvas_impl.h"
-#include "color.h"
 #include "ardour_ui.h"
 
 #include "i18n.h"
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 4a00102cec..e8175fe069 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -33,7 +33,6 @@
 #include "automation_line.h"
 #include "enums.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace ARDOUR {
 	class MidiRegion;
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index b3d976ae2e..e80d942431 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -44,7 +44,6 @@
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "utils.h"
-#include "color.h"
 #include "simplerect.h"
 
 using namespace std;
diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 480b968e50..bed1daa357 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -25,7 +25,6 @@
 #include <ardour/location.h>
 #include "enums.h"
 #include "simplerect.h"
-#include "color.h"
 #include "streamview.h"
 
 namespace Gdk {
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 6f4777e152..b41ca852fe 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -38,7 +38,6 @@
 #include "enums.h"
 #include "route_time_axis.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace ARDOUR {
 	class Session;
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 523f5e57b2..87b384bcd7 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -31,6 +31,7 @@
 #include <ardour/audiosource.h>
 #include <ardour/audio_diskstream.h>
 
+#include "ardour_ui.h"
 #include "streamview.h"
 #include "region_view.h"
 #include "route_time_axis.h"
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 26d7cdde86..4bbd68eef0 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -31,7 +31,6 @@
 #include "enums.h"
 #include "waveview.h"
 #include "canvas.h"
-#include "color.h"
 
 class TimeAxisView;
 class RegionEditor;
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 9e33d46e2a..55c7cee983 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -38,7 +38,6 @@
 #include "enums.h"
 #include "time_axis_view.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace ARDOUR {
 	class Session;
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index b18e5efb42..5220b80c10 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -40,7 +40,6 @@
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "utils.h"
-#include "color.h"
 
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 15e354bdab..389000c7ef 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -26,7 +26,6 @@
 #include "enums.h"
 #include "simplerect.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace Gdk {
 	class Color;
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 299971f1ee..c4f86dee5d 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -40,7 +40,6 @@
 #include "enums.h"
 #include "editing.h"
 #include "canvas.h"
-#include "color.h"
 
 namespace ARDOUR {
 	class Session;