From 8fabffe18c07945caa17939e996c80fb38a04f6a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 28 May 2011 00:19:59 -0400
Subject: [PATCH] Code Cleanup

- Eliminated '#include "x"' by changing all to '#include <x>'.
---
 src/API.h                  |  2 +-
 src/Att.h                  |  2 +-
 src/Color.cpp              |  6 +++---
 src/Config.cpp             | 14 +++++++-------
 src/Config.h               |  2 +-
 src/DOM.cpp                |  2 +-
 src/Date.cpp               |  8 ++++----
 src/Directory.cpp          |  2 +-
 src/Duration.cpp           |  6 +++---
 src/File.h                 |  2 +-
 src/Filter.cpp             |  6 +++---
 src/Filter.h               |  6 +++---
 src/Hooks.cpp              |  6 +++---
 src/Hooks.h                |  4 ++--
 src/Location.cpp           |  2 +-
 src/Path.cpp               |  4 ++--
 src/Permission.cpp         |  8 ++++----
 src/Permission.h           |  2 +-
 src/Record.cpp             | 10 +++++-----
 src/Record.h               |  2 +-
 src/Sequence.cpp           | 10 +++++-----
 src/Subst.h                |  2 +-
 src/TDB.cpp                | 22 +++++++++++-----------
 src/TDB.h                  |  6 +++---
 src/TDB2.cpp               | 22 +++++++++++-----------
 src/TDB2.h                 |  6 +++---
 src/Task.h                 |  6 +++---
 src/Taskmod.cpp            |  2 +-
 src/Timer.cpp              |  4 ++--
 src/Transport.cpp          | 10 +++++-----
 src/Transport.h            |  2 +-
 src/TransportCurl.cpp      |  6 +++---
 src/TransportRSYNC.cpp     |  2 +-
 src/TransportSSH.cpp       |  2 +-
 src/Uri.cpp                |  4 ++--
 src/columns/CMakeLists.txt |  3 ++-
 src/command.cpp            | 20 ++++++++++----------
 src/diag.cpp               |  4 ++--
 src/edit.cpp               | 14 +++++++-------
 src/export.cpp             | 10 +++++-----
 src/feedback.cpp           |  2 +-
 src/i18n.h                 |  2 +-
 src/import.cpp             |  2 +-
 src/interactive.cpp        |  8 ++++----
 src/main.cpp               |  2 +-
 src/main.h                 |  8 ++++----
 src/recur.cpp              | 12 ++++++------
 src/rules.cpp              | 10 +++++-----
 src/rx.cpp                 |  2 +-
 src/text.h                 |  2 +-
 src/util.cpp               | 12 ++++++------
 src/util.h                 |  4 ++--
 test/CMakeLists.txt        |  3 ++-
 test/dom.t.cpp             |  2 +-
 test/filt.t.cpp            |  8 ++++----
 test/list.t.cpp            |  6 +++---
 test/t.benchmark.t.cpp     |  6 +++---
 test/t.t.cpp               |  4 ++--
 test/tdb2.t.cpp            |  4 ++--
 test/test.cpp              |  2 +-
 test/text.t.cpp            |  8 ++++----
 test/util.t.cpp            |  6 +++---
 62 files changed, 185 insertions(+), 183 deletions(-)

diff --git a/src/API.h b/src/API.h
index ef43209f4..d3fe362b9 100644
--- a/src/API.h
+++ b/src/API.h
@@ -28,7 +28,7 @@
 #define INCLUDED_API
 #define L10N                                           // Localization complete.
 
-#include "../cmake.h"
+#include <../cmake.h>
 #ifdef HAVE_LIBLUA
 
 #include <vector>
diff --git a/src/Att.h b/src/Att.h
index e005e684b..e39af544c 100644
--- a/src/Att.h
+++ b/src/Att.h
@@ -30,7 +30,7 @@
 
 #include <string>
 #include <vector>
-#include "Nibbler.h"
+#include <Nibbler.h>
 
 class Att
 {
diff --git a/src/Color.cpp b/src/Color.cpp
index a0993708e..df21cdda7 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -29,9 +29,9 @@
 #include <sstream>
 #include <vector>
 #include <algorithm>
-#include "Color.h"
-#include "text.h"
-#include "i18n.h"
+#include <Color.h>
+#include <text.h>
+#include <i18n.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 static struct
diff --git a/src/Config.cpp b/src/Config.cpp
index 8ef274890..fd3aa6377 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -33,13 +33,13 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <pwd.h>
-#include "Directory.h"
-#include "Date.h"
-#include "File.h"
-#include "Config.h"
-#include "text.h"
-#include "util.h"
-#include "../cmake.h"
+#include <Directory.h>
+#include <Date.h>
+#include <File.h>
+#include <Config.h>
+#include <text.h>
+#include <util.h>
+#include <cmake.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // This string is used in two ways:
diff --git a/src/Config.h b/src/Config.h
index 33b9d39cd..07d6ff1a8 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -31,7 +31,7 @@
 #include <map>
 #include <vector>
 #include <string>
-#include "File.h"
+#include <File.h>
 
 class Config : public std::map <std::string, std::string>
 {
diff --git a/src/DOM.cpp b/src/DOM.cpp
index 6e080b476..0be0c2bdc 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -30,7 +30,7 @@
 #include <text.h>
 #include <i18n.h>
 #include <DOM.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 #ifdef HAVE_LIBLUA
 extern "C"
diff --git a/src/Date.cpp b/src/Date.cpp
index 3de267ed8..9d6b1f2b0 100644
--- a/src/Date.cpp
+++ b/src/Date.cpp
@@ -30,10 +30,10 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "Date.h"
-#include "text.h"
-#include "util.h"
-#include "Context.h"
+#include <Date.h>
+#include <text.h>
+#include <util.h>
+#include <Context.h>
 
 extern Context context;
 
diff --git a/src/Directory.cpp b/src/Directory.cpp
index 41592e20f..9ae2d18ac 100644
--- a/src/Directory.cpp
+++ b/src/Directory.cpp
@@ -31,7 +31,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <Directory.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Directory::Directory ()
diff --git a/src/Duration.cpp b/src/Duration.cpp
index 977f64129..3ce20f57c 100644
--- a/src/Duration.cpp
+++ b/src/Duration.cpp
@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "text.h"
-#include "util.h"
-#include "Duration.h"
+#include <text.h>
+#include <util.h>
+#include <Duration.h>
 
 static const char* durations[] =
 {
diff --git a/src/File.h b/src/File.h
index 6bcaef9ee..2c5ccc292 100644
--- a/src/File.h
+++ b/src/File.h
@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 #include <sys/stat.h>
-#include "Path.h"
+#include <Path.h>
 
 class File : public Path
 {
diff --git a/src/Filter.cpp b/src/Filter.cpp
index b4f91a51e..0288351bd 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -26,9 +26,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <sstream>
-#include "Filter.h"
-#include "util.h"
-#include "main.h"
+#include <Filter.h>
+#include <util.h>
+#include <main.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 // For every Att in the filter, lookup the equivalent in Record, and perform a
diff --git a/src/Filter.h b/src/Filter.h
index 09ce95d9c..b7567d08b 100644
--- a/src/Filter.h
+++ b/src/Filter.h
@@ -29,9 +29,9 @@
 #define L10N                                           // Localization complete.
 
 #include <vector>
-#include "Att.h"
-#include "Task.h"
-#include "Record.h"
+#include <Att.h>
+#include <Task.h>
+#include <Record.h>
 
 class Filter : public std::vector <Att>
 {
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index 18337cfde..65da22182 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -27,9 +27,9 @@
 
 #include <iostream>
 #include <algorithm>
-#include "Context.h"
-#include "Hooks.h"
-#include "Timer.h"
+#include <Context.h>
+#include <Hooks.h>
+#include <Timer.h>
 
 extern Context context;
 
diff --git a/src/Hooks.h b/src/Hooks.h
index 1c1a5c917..b1d6e5004 100644
--- a/src/Hooks.h
+++ b/src/Hooks.h
@@ -30,8 +30,8 @@
 
 #include <vector>
 #include <string>
-#include "API.h"
-#include "../cmake.h"
+#include <API.h>
+#include <cmake.h>
 
 // Hook class representing a single hook, which is just a three-way map.
 class Hook
diff --git a/src/Location.cpp b/src/Location.cpp
index 27f955178..357e2639a 100644
--- a/src/Location.cpp
+++ b/src/Location.cpp
@@ -25,7 +25,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Location.h"
+#include <Location.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Location::Location ()
diff --git a/src/Path.cpp b/src/Path.cpp
index 9264d5154..95e8031ef 100644
--- a/src/Path.cpp
+++ b/src/Path.cpp
@@ -31,8 +31,8 @@
 #include <sys/stat.h>
 #include <pwd.h>
 #include <unistd.h>
-#include "Path.h"
-#include "../cmake.h"
+#include <Path.h>
+#include <cmake.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Path::Path ()
diff --git a/src/Permission.cpp b/src/Permission.cpp
index ec3a5aab5..4b706f272 100644
--- a/src/Permission.cpp
+++ b/src/Permission.cpp
@@ -26,10 +26,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <iostream>
-#include "Permission.h"
-#include "Context.h"
-#include "util.h"
-#include "i18n.h"
+#include <Permission.h>
+#include <Context.h>
+#include <util.h>
+#include <i18n.h>
 
 extern Context context;
 
diff --git a/src/Permission.h b/src/Permission.h
index 9083e5c70..10a68c791 100644
--- a/src/Permission.h
+++ b/src/Permission.h
@@ -29,7 +29,7 @@
 #define L10N                                           // Localization complete.
 
 #include <string>
-#include "Task.h"
+#include <Task.h>
 
 class Permission
 {
diff --git a/src/Record.cpp b/src/Record.cpp
index 1fceef55d..a31b59ecc 100644
--- a/src/Record.cpp
+++ b/src/Record.cpp
@@ -28,11 +28,11 @@
 #include <iostream>
 #include <sstream>
 #include <stdlib.h>
-#include "util.h"
-#include "Nibbler.h"
-#include "Context.h"
-#include "i18n.h"
-#include "Record.h"
+#include <util.h>
+#include <Nibbler.h>
+#include <Context.h>
+#include <i18n.h>
+#include <Record.h>
 
 extern Context context;
 
diff --git a/src/Record.h b/src/Record.h
index 38961273e..c09740ea9 100644
--- a/src/Record.h
+++ b/src/Record.h
@@ -31,7 +31,7 @@
 #include <vector>
 #include <map>
 #include <string>
-#include "Att.h"
+#include <Att.h>
 
 class Record : public std::map <std::string, Att>
 {
diff --git a/src/Sequence.cpp b/src/Sequence.cpp
index e6aa63742..ad3a51135 100644
--- a/src/Sequence.cpp
+++ b/src/Sequence.cpp
@@ -29,11 +29,11 @@
 #include <string>
 #include <algorithm>
 #include <ctype.h>
-#include "util.h"
-#include "text.h"
-#include "i18n.h"
-#include "Context.h"
-#include "Sequence.h"
+#include <util.h>
+#include <text.h>
+#include <i18n.h>
+#include <Context.h>
+#include <Sequence.h>
 
 extern Context context;
 
diff --git a/src/Subst.h b/src/Subst.h
index 32c4fc0b3..28d5800fd 100644
--- a/src/Subst.h
+++ b/src/Subst.h
@@ -29,7 +29,7 @@
 #define L10N                                           // Localization complete.
 
 #include <string>
-#include "Att.h"
+#include <Att.h>
 
 class Subst
 {
diff --git a/src/TDB.cpp b/src/TDB.cpp
index fded58080..d0a10e701 100644
--- a/src/TDB.cpp
+++ b/src/TDB.cpp
@@ -35,19 +35,19 @@
 #include <stdio.h>
 #include <sys/file.h>
 #include <stdlib.h>
-#include "text.h"
-#include "util.h"
-#include "TDB.h"
-#include "Directory.h"
-#include "File.h"
-#include "ViewText.h"
-#include "Timer.h"
-#include "Color.h"
-#include "main.h"
+#include <text.h>
+#include <util.h>
+#include <TDB.h>
+#include <Directory.h>
+#include <File.h>
+#include <ViewText.h>
+#include <Timer.h>
+#include <Color.h>
+#include <main.h>
 
 #define NDEBUG
-#include "assert.h"
-#include "Taskmod.h"
+#include <assert.h>
+#include <Taskmod.h>
 
 #define DEBUG_OUTPUT 0
 
diff --git a/src/TDB.h b/src/TDB.h
index c9a87baa9..494d0074f 100644
--- a/src/TDB.h
+++ b/src/TDB.h
@@ -31,9 +31,9 @@
 #include <map>
 #include <vector>
 #include <string>
-#include "Location.h"
-#include "Filter.h"
-#include "Task.h"
+#include <Location.h>
+#include <Filter.h>
+#include <Task.h>
 
 // Length of longest line.
 #define T_LINE_MAX 32768
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index c3697a21d..03830bfea 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -279,19 +279,19 @@ void TDB2::commit ()
 #include <stdio.h>
 #include <sys/file.h>
 #include <stdlib.h>
-#include "text.h"
-#include "util.h"
-#include "TDB.h"
-#include "Directory.h"
-#include "File.h"
-#include "ViewText.h"
-#include "Timer.h"
-#include "Color.h"
-#include "main.h"
+#include <text.h>
+#include <util.h>
+#include <TDB.h>
+#include <Directory.h>
+#include <File.h>
+#include <ViewText.h>
+#include <Timer.h>
+#include <Color.h>
+#include <main.h>
 
 #define NDEBUG
-#include "assert.h"
-#include "Taskmod.h"
+#include <assert.h>
+#include <Taskmod.h>
 
 #define DEBUG_OUTPUT 0
 
diff --git a/src/TDB2.h b/src/TDB2.h
index e942a784d..26df5bda6 100644
--- a/src/TDB2.h
+++ b/src/TDB2.h
@@ -102,9 +102,9 @@ private:
 
 
 /*
-#include "Location.h"
-#include "Filter.h"
-#include "Task.h"
+#include <Location.h>
+#include <Filter.h>
+#include <Task.h>
 
 // Length of longest line.
 #define T_LINE_MAX 32768
diff --git a/src/Task.h b/src/Task.h
index a195fae61..67ca87e50 100644
--- a/src/Task.h
+++ b/src/Task.h
@@ -29,9 +29,9 @@
 #define L10N                                           // Localization complete.
 
 #include <string>
-#include "Record.h"
-#include "Subst.h"
-#include "Sequence.h"
+#include <Record.h>
+#include <Subst.h>
+#include <Sequence.h>
 
 class Task : public Record
 {
diff --git a/src/Taskmod.cpp b/src/Taskmod.cpp
index cf33512bb..6b312fcac 100644
--- a/src/Taskmod.cpp
+++ b/src/Taskmod.cpp
@@ -28,7 +28,7 @@
 #include <sstream>
 #include <iostream>
 #include <assert.h>
-#include "Taskmod.h"
+#include <Taskmod.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Taskmod::Taskmod ()
diff --git a/src/Timer.cpp b/src/Timer.cpp
index d5b59d18f..ea6d127c6 100644
--- a/src/Timer.cpp
+++ b/src/Timer.cpp
@@ -27,8 +27,8 @@
 #include <iostream>
 #include <iomanip>
 #include <sstream>
-#include "Timer.h"
-#include "Context.h"
+#include <Timer.h>
+#include <Context.h>
 
 extern Context context;
 
diff --git a/src/Transport.cpp b/src/Transport.cpp
index 6af97159b..35c50049b 100644
--- a/src/Transport.cpp
+++ b/src/Transport.cpp
@@ -27,11 +27,11 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include "util.h"
-#include "Transport.h"
-#include "TransportSSH.h"
-#include "TransportRSYNC.h"
-#include "TransportCurl.h"
+#include <util.h>
+#include <Transport.h>
+#include <TransportSSH.h>
+#include <TransportRSYNC.h>
+#include <TransportCurl.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 Transport::Transport (const Uri& uri)
diff --git a/src/Transport.h b/src/Transport.h
index e128df01d..2c4d53387 100644
--- a/src/Transport.h
+++ b/src/Transport.h
@@ -30,7 +30,7 @@
 
 #include <string>
 #include <vector>
-#include "Uri.h"
+#include <Uri.h>
 
 class Transport {
 public:
diff --git a/src/TransportCurl.cpp b/src/TransportCurl.cpp
index bd8a4f97a..0623e3d7c 100644
--- a/src/TransportCurl.cpp
+++ b/src/TransportCurl.cpp
@@ -25,9 +25,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "TransportCurl.h"
-#include "text.h"
-#include "util.h"
+#include <TransportCurl.h>
+#include <text.h>
+#include <util.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 TransportCurl::TransportCurl(const Uri& uri) : Transport(uri)
diff --git a/src/TransportRSYNC.cpp b/src/TransportRSYNC.cpp
index beb327790..1777c1f52 100644
--- a/src/TransportRSYNC.cpp
+++ b/src/TransportRSYNC.cpp
@@ -25,7 +25,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "TransportRSYNC.h"
+#include <TransportRSYNC.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 TransportRSYNC::TransportRSYNC(const Uri& uri) : Transport(uri)
diff --git a/src/TransportSSH.cpp b/src/TransportSSH.cpp
index b50d193a6..53815e303 100644
--- a/src/TransportSSH.cpp
+++ b/src/TransportSSH.cpp
@@ -25,7 +25,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "TransportSSH.h"
+#include <TransportSSH.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 TransportSSH::TransportSSH(const Uri& uri) : Transport(uri)
diff --git a/src/Uri.cpp b/src/Uri.cpp
index 67786f622..a159e1b50 100644
--- a/src/Uri.cpp
+++ b/src/Uri.cpp
@@ -25,8 +25,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Context.h"
-#include "Uri.h"
+#include <Context.h>
+#include <Uri.h>
 
 extern Context context;
 
diff --git a/src/columns/CMakeLists.txt b/src/columns/CMakeLists.txt
index ebd76e594..38b6aa68a 100644
--- a/src/columns/CMakeLists.txt
+++ b/src/columns/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
-include_directories (${CMAKE_SOURCE_DIR}/src
+include_directories (${CMAKE_SOURCE_DIR}
+                     ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
                      ${TASK_INCLUDE_DIRS})
diff --git a/src/command.cpp b/src/command.cpp
index abaf6949d..87ead7bcf 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -36,17 +36,17 @@
 #include <pwd.h>
 #include <time.h>
 
-#include "Permission.h"
-#include "Directory.h"
-#include "Nibbler.h"
-#include "text.h"
-#include "util.h"
-#include "main.h"
-#include "Transport.h"
-#include "ViewText.h"
-#include "../cmake.h"
+#include <Permission.h>
+#include <Directory.h>
+#include <Nibbler.h>
+#include <text.h>
+#include <util.h>
+#include <main.h>
+#include <Transport.h>
+#include <ViewText.h>
+#include <cmake.h>
 #ifdef HAVE_COMMIT
-#include "../commit.h"
+#include <commit.h>
 #endif
 
 extern Context context;
diff --git a/src/diag.cpp b/src/diag.cpp
index 20714b773..bf4c9fdb2 100644
--- a/src/diag.cpp
+++ b/src/diag.cpp
@@ -38,9 +38,9 @@
 #include <File.h>
 #include <main.h>
 #include <util.h>
-#include "../cmake.h"
+#include <cmake.h>
 #ifdef HAVE_COMMIT
-#include "../commit.h"
+#include <commit.h>
 #endif
 
 #ifdef HAVE_LIBLUA
diff --git a/src/edit.cpp b/src/edit.cpp
index 8d265728a..1d1369f1c 100644
--- a/src/edit.cpp
+++ b/src/edit.cpp
@@ -33,13 +33,13 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
-#include "Directory.h"
-#include "File.h"
-#include "Date.h"
-#include "Duration.h"
-#include "text.h"
-#include "util.h"
-#include "main.h"
+#include <Directory.h>
+#include <File.h>
+#include <Date.h>
+#include <Duration.h>
+#include <text.h>
+#include <util.h>
+#include <main.h>
 
 extern Context context;
 
diff --git a/src/export.cpp b/src/export.cpp
index cd3c052b8..be3cc8f39 100644
--- a/src/export.cpp
+++ b/src/export.cpp
@@ -29,11 +29,11 @@
 #include <sstream>
 #include <stdlib.h>
 
-#include "Att.h"
-#include "text.h"
-#include "util.h"
-#include "main.h"
-#include "../cmake.h"
+#include <Att.h>
+#include <text.h>
+#include <util.h>
+#include <main.h>
+#include <cmake.h>
 
 extern Context context;
 
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 31f49cdea..fc90a8d43 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -35,7 +35,7 @@
 #include <main.h>
 #include <text.h>
 #include <util.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 extern Context context;
 
diff --git a/src/i18n.h b/src/i18n.h
index da18dfdf6..a64939918 100644
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -40,7 +40,7 @@
 #define INCLUDED_I18N
 #define L10N                                           // Localization complete.
 
-#include "../cmake.h"
+#include <cmake.h>
 
 #if PACKAGE_LANGUAGE == LANGUAGE_EN_US
 #include <en-US.h>
diff --git a/src/import.cpp b/src/import.cpp
index 93b7ec41b..7aaed6e7b 100644
--- a/src/import.cpp
+++ b/src/import.cpp
@@ -34,7 +34,7 @@
 #include <text.h>
 #include <util.h>
 #include <main.h>
-#include "Transport.h"
+#include <Transport.h>
 
 extern Context context;
 
diff --git a/src/interactive.cpp b/src/interactive.cpp
index c3d0294bd..cc946c971 100644
--- a/src/interactive.cpp
+++ b/src/interactive.cpp
@@ -28,10 +28,10 @@
 #include <sstream>
 #include <stdio.h>
 #include <sys/ioctl.h>
-#include "Context.h"
-#include "main.h"
-#include "i18n.h"
-#include "../cmake.h"
+#include <Context.h>
+#include <main.h>
+#include <i18n.h>
+#include <cmake.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 int Context::getWidth ()
diff --git a/src/main.cpp b/src/main.cpp
index d4db3f5dd..b797a4f64 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@
 
 #include <i18n.h>
 #include <Context.h>
-#include "../cmake.h"
+#include <cmake.h>
 
 Context context;
 
diff --git a/src/main.h b/src/main.h
index 1ec87a858..0e5e1d837 100644
--- a/src/main.h
+++ b/src/main.h
@@ -36,10 +36,10 @@
 #include <vector>
 #include <map>
 #include <sys/types.h>
-#include "Context.h"
-#include "Date.h"
-#include "Color.h"
-#include "../cmake.h"
+#include <Context.h>
+#include <Date.h>
+#include <Color.h>
+#include <cmake.h>
 
 // recur.cpp
 void handleRecurrence ();
diff --git a/src/recur.cpp b/src/recur.cpp
index a81895181..229a0fa21 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -37,12 +37,12 @@
 #include <pwd.h>
 #include <time.h>
 
-#include "Context.h"
-#include "Date.h"
-#include "Duration.h"
-#include "text.h"
-#include "util.h"
-#include "main.h"
+#include <Context.h>
+#include <Date.h>
+#include <Duration.h>
+#include <text.h>
+#include <util.h>
+#include <main.h>
 
 // Global context for use by all.
 extern Context context;
diff --git a/src/rules.cpp b/src/rules.cpp
index baafc24dd..7b60109fc 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -26,11 +26,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
 #include <stdlib.h>
-#include "Context.h"
-#include "Date.h"
-#include "text.h"
-#include "util.h"
-#include "main.h"
+#include <Context.h>
+#include <Date.h>
+#include <text.h>
+#include <util.h>
+#include <main.h>
 
 #define L10N                                           // Localization complete.
 
diff --git a/src/rx.cpp b/src/rx.cpp
index c2efab4c4..9cee95d87 100644
--- a/src/rx.cpp
+++ b/src/rx.cpp
@@ -27,7 +27,7 @@
 
 #include <stdlib.h>
 #include <regex.h>
-#include "rx.h"
+#include <rx.h>
 
 #define L10N                                           // Localization complete.
 
diff --git a/src/text.h b/src/text.h
index e34e00370..ec0ce1d03 100644
--- a/src/text.h
+++ b/src/text.h
@@ -30,7 +30,7 @@
 
 #include <string>
 #include <vector>
-#include "../cmake.h"
+#include <cmake.h>
 
 // text.cpp, Non-UTF-8 aware.
 void wrapText (std::vector <std::string>&, const std::string&, const int);
diff --git a/src/util.cpp b/src/util.cpp
index d15149338..6648a28b2 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -40,12 +40,12 @@
 #include <pwd.h>
 #include <errno.h>
 
-#include "Date.h"
-#include "text.h"
-#include "main.h"
-#include "i18n.h"
-#include "util.h"
-#include "../cmake.h"
+#include <Date.h>
+#include <text.h>
+#include <main.h>
+#include <i18n.h>
+#include <util.h>
+#include <cmake.h>
 
 extern Context context;
 
diff --git a/src/util.h b/src/util.h
index efddad296..b1410bcca 100644
--- a/src/util.h
+++ b/src/util.h
@@ -32,8 +32,8 @@
 #include <vector>
 #include <map>
 #include <sys/types.h>
-#include "Task.h"
-#include "../cmake.h"
+#include <Task.h>
+#include <cmake.h>
 
 #ifndef min
 #define min(a,b) ((a) < (b) ? (a) : (b))
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6069bbf67..5f049d899 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
-include_directories (${CMAKE_SOURCE_DIR}/src
+include_directories (${CMAKE_SOURCE_DIR}
+                     ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands
                      ${CMAKE_SOURCE_DIR}/src/columns
                      ${CMAKE_SOURCE_DIR}/test
diff --git a/test/dom.t.cpp b/test/dom.t.cpp
index 1efaef05e..0183a2ca7 100644
--- a/test/dom.t.cpp
+++ b/test/dom.t.cpp
@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
 #include <unistd.h>
-#include "../cmake.h"
+#include <cmake.h>
 #include <main.h>
 #include <test.h>
 
diff --git a/test/filt.t.cpp b/test/filt.t.cpp
index a0d8d1c81..0a7e7d4d8 100644
--- a/test/filt.t.cpp
+++ b/test/filt.t.cpp
@@ -24,10 +24,10 @@
 //     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
-#include "main.h"
-#include "test.h"
-#include "Filter.h"
-#include "Task.h"
+#include <main.h>
+#include <test.h>
+#include <Filter.h>
+#include <Task.h>
 
 Context context;
 
diff --git a/test/list.t.cpp b/test/list.t.cpp
index 425bb87b3..dd8ebdd07 100644
--- a/test/list.t.cpp
+++ b/test/list.t.cpp
@@ -25,9 +25,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
-#include "Context.h"
-#include "main.h"
-#include "test.h"
+#include <Context.h>
+#include <main.h>
+#include <test.h>
 
 Context context;
 
diff --git a/test/t.benchmark.t.cpp b/test/t.benchmark.t.cpp
index 9677882bf..78c2f61e4 100644
--- a/test/t.benchmark.t.cpp
+++ b/test/t.benchmark.t.cpp
@@ -25,9 +25,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <sys/time.h>
-#include "Task.h"
-#include "main.h"
-#include "test.h"
+#include <Task.h>
+#include <main.h>
+#include <test.h>
 
 Context context;
 
diff --git a/test/t.t.cpp b/test/t.t.cpp
index 5454d841d..9244ddb04 100644
--- a/test/t.t.cpp
+++ b/test/t.t.cpp
@@ -24,8 +24,8 @@
 //     USA
 //
 ////////////////////////////////////////////////////////////////////////////////
-#include "main.h"
-#include "test.h"
+#include <main.h>
+#include <test.h>
 
 Context context;
 
diff --git a/test/tdb2.t.cpp b/test/tdb2.t.cpp
index a9715bb37..f41e515c5 100644
--- a/test/tdb2.t.cpp
+++ b/test/tdb2.t.cpp
@@ -27,8 +27,8 @@
 #include <iostream>
 #include <unistd.h>
 
-#include "main.h"
-#include "test.h"
+#include <main.h>
+#include <test.h>
 
 Context context;
 
diff --git a/test/test.cpp b/test/test.cpp
index cd8d2d8c5..bb524a42a 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -31,7 +31,7 @@
 #include <main.h>
 #include <util.h>
 #include <text.h>
-#include "test.h"
+#include <test.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 UnitTest::UnitTest ()
diff --git a/test/text.t.cpp b/test/text.t.cpp
index fe9941bda..a5ec1e7ea 100644
--- a/test/text.t.cpp
+++ b/test/text.t.cpp
@@ -25,10 +25,10 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
-#include "main.h"
-#include "text.h"
-#include "utf8.h"
-#include "test.h"
+#include <main.h>
+#include <text.h>
+#include <utf8.h>
+#include <test.h>
 
 Context context;
 
diff --git a/test/util.t.cpp b/test/util.t.cpp
index ff50c7f7a..a9b8ff0f6 100644
--- a/test/util.t.cpp
+++ b/test/util.t.cpp
@@ -25,9 +25,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 #include <iostream>
-#include "main.h"
-#include "util.h"
-#include "test.h"
+#include <main.h>
+#include <util.h>
+#include <test.h>
 
 Context context;