diff --git a/src/Att.cpp b/src/Att.cpp
index a25682492..fe12b423e 100644
--- a/src/Att.cpp
+++ b/src/Att.cpp
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "text.h"
-#include "color.h"
+#include "Color.h"
 #include "util.h"
 #include "Date.h"
 #include "Duration.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f5e4ce67..175f6a414 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,10 +2,10 @@ bin_PROGRAMS = task
 task_SOURCES = Att.cpp Cmd.cpp Config.cpp Context.cpp Date.cpp Duration.cpp   \
                Filter.cpp Grid.cpp Keymap.cpp Location.cpp Nibbler.cpp        \
                Record.cpp Sequence.cpp StringTable.cpp Subst.cpp Task.cpp     \
-               TDB.cpp Table.cpp Timer.cpp Permission.cpp color.cpp edit.cpp  \
+               TDB.cpp Table.cpp Timer.cpp Permission.cpp Color.cpp edit.cpp  \
                command.cpp import.cpp interactive.cpp recur.cpp report.cpp    \
                custom.cpp rules.cpp main.cpp text.cpp util.cpp                \
                Att.h Cmd.h Config.h Context.h Date.h Duration.h Filter.h      \
                Grid.h Keymap.h Location.h Nibbler.h Record.h Sequence.h       \
                StringTable.h Subst.h Task.h TDB.h Table.h Timer.h             \
-               Permission.h color.h i18n.h main.h text.h util.h
+               Permission.h Color.h i18n.h main.h text.h util.h
diff --git a/src/TDB.cpp b/src/TDB.cpp
index e00713128..3021e894c 100644
--- a/src/TDB.cpp
+++ b/src/TDB.cpp
@@ -37,7 +37,7 @@
 #include "TDB.h"
 #include "Table.h"
 #include "Timer.h"
-#include "color.h"
+#include "Color.h"
 #include "main.h"
 
 extern Context context;
diff --git a/src/Table.h b/src/Table.h
index 872e52a50..a951de59a 100644
--- a/src/Table.h
+++ b/src/Table.h
@@ -30,8 +30,8 @@
 #include <map>
 #include <vector>
 #include <string>
-#include <color.h>
-#include <Grid.h>
+#include "Color.h"
+#include "Grid.h"
 
 class Table
 {
diff --git a/src/main.h b/src/main.h
index 9e9082ba9..71d1734d3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -39,7 +39,7 @@
 #include "Context.h"
 #include "Table.h"
 #include "Date.h"
-#include "color.h"
+#include "Color.h"
 #include "../auto.h"
 
 // task.cpp
diff --git a/src/color.cpp b/src/old_color.cpp
similarity index 100%
rename from src/color.cpp
rename to src/old_color.cpp
diff --git a/src/color.h b/src/old_color.h
similarity index 100%
rename from src/color.h
rename to src/old_color.h