From 87af56ba850b132f8ce23bb5151d729dfd1dcb39 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Wed, 4 Jun 2014 13:59:15 -0400
Subject: [PATCH] Header file roundup

Create include/lib/ and include/gui/.  Move header files into the
appropriate directory.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 gui/collection.cpp             |  8 ++++----
 gui/collection_mgr.cpp         |  6 +++---
 gui/gui.cpp                    | 18 +++++++++---------
 gui/history.cpp                |  4 ++--
 gui/main.cpp                   | 12 ++++++------
 gui/model.cpp                  |  4 ++--
 gui/playlist.cpp               |  4 ++--
 gui/queue.cpp                  |  6 +++---
 gui/tabs.cpp                   | 10 +++++-----
 include/{ => gui}/ocarina.h    |  2 +-
 include/{ => gui}/tabs.h       |  4 ++--
 include/{ => lib}/audio.h      |  2 +-
 include/{ => lib}/callback.h   |  4 ++--
 include/{ => lib}/database.h   |  2 +-
 include/{ => lib}/database.hpp |  0
 include/{ => lib}/deck.h       |  2 +-
 include/{ => lib}/driver.h     |  0
 include/{ => lib}/error.h      |  0
 include/{ => lib}/file.h       |  0
 include/{ => lib}/filter.h     |  0
 include/{ => lib}/idle.h       |  0
 include/{ => lib}/idle.hpp     |  0
 include/{ => lib}/index.h      |  2 +-
 include/{ => lib}/library.h    |  4 ++--
 include/{ => lib}/playlist.h   |  4 ++--
 include/{ => lib}/print.h      |  0
 include/{ => lib}/queue.h      |  4 ++--
 include/{ => lib}/random.h     |  0
 include/{ => lib}/tags.h       |  2 +-
 include/{ => lib}/version.h    |  0
 lib/audio.cpp                  |  8 ++++----
 lib/callback.cpp               |  2 +-
 lib/database.cpp               |  2 +-
 lib/deck.cpp                   |  8 ++++----
 lib/driver.cpp                 |  2 +-
 lib/file.cpp                   |  4 ++--
 lib/filter.cpp                 |  4 ++--
 lib/idle.cpp                   |  2 +-
 lib/index.cpp                  |  2 +-
 lib/library.cpp                |  4 ++--
 lib/playlist.cpp               |  4 ++--
 lib/queue.cpp                  |  6 +++---
 lib/random.cpp                 |  2 +-
 lib/tags.cpp                   |  6 +++---
 tests/audio.cpp                |  6 +++---
 tests/database.cpp             |  2 +-
 tests/deck.cpp                 |  6 +++---
 tests/driver.cpp               |  2 +-
 tests/file.cpp                 |  2 +-
 tests/filter.cpp               |  2 +-
 tests/idle.cpp                 |  2 +-
 tests/index.cpp                |  2 +-
 tests/library.cpp              |  4 ++--
 tests/playlist.cpp             |  4 ++--
 tests/queue.cpp                |  8 ++++----
 tests/random.cpp               |  2 +-
 tests/tags.cpp                 |  2 +-
 tests/version.cpp              |  2 +-
 58 files changed, 103 insertions(+), 103 deletions(-)
 rename include/{ => gui}/ocarina.h (99%)
 rename include/{ => gui}/tabs.h (98%)
 rename include/{ => lib}/audio.h (95%)
 rename include/{ => lib}/callback.h (92%)
 rename include/{ => lib}/database.h (97%)
 rename include/{ => lib}/database.hpp (100%)
 rename include/{ => lib}/deck.h (96%)
 rename include/{ => lib}/driver.h (100%)
 rename include/{ => lib}/error.h (100%)
 rename include/{ => lib}/file.h (100%)
 rename include/{ => lib}/filter.h (100%)
 rename include/{ => lib}/idle.h (100%)
 rename include/{ => lib}/idle.hpp (100%)
 rename include/{ => lib}/index.h (96%)
 rename include/{ => lib}/library.h (88%)
 rename include/{ => lib}/playlist.h (90%)
 rename include/{ => lib}/print.h (100%)
 rename include/{ => lib}/queue.h (96%)
 rename include/{ => lib}/random.h (100%)
 rename include/{ => lib}/tags.h (98%)
 rename include/{ => lib}/version.h (100%)

diff --git a/gui/collection.cpp b/gui/collection.cpp
index 3585e469..1501c1ba 100644
--- a/gui/collection.cpp
+++ b/gui/collection.cpp
@@ -1,10 +1,10 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <deck.h>
-#include <library.h>
-#include <playlist.h>
-#include <tabs.h>
+#include <lib/deck.h>
+#include <lib/library.h>
+#include <lib/playlist.h>
+#include <gui/tabs.h>
 
 
 class CollectionTab : public Tab {
diff --git a/gui/collection_mgr.cpp b/gui/collection_mgr.cpp
index 8b1aa08e..edc79c97 100644
--- a/gui/collection_mgr.cpp
+++ b/gui/collection_mgr.cpp
@@ -1,9 +1,9 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <callback.h>
-#include <library.h>
-#include <ocarina.h>
+#include <lib/callback.h>
+#include <lib/library.h>
+#include <gui/ocarina.h>
 
 static void on_library_add(unsigned int id, Library *library);
 
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 0d934c6e..b38ab800 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -1,16 +1,16 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <audio.h>
-#include <callback.h>
-#include <deck.h>
-#include <driver.h>
-#include <idle.h>
-#include <playlist.h>
+#include <lib/audio.h>
+#include <lib/callback.h>
+#include <lib/deck.h>
+#include <lib/driver.h>
+#include <lib/idle.h>
+#include <lib/playlist.h>
+#include <lib/print.h>
 
-#include <ocarina.h>
-#include <print.h>
-#include <tabs.h>
+#include <gui/ocarina.h>
+#include <gui/tabs.h>
 
 static bool audio_playing = false;
 static Glib::RefPtr<Gtk::Builder> builder;
diff --git a/gui/history.cpp b/gui/history.cpp
index 60f45415..5357d706 100644
--- a/gui/history.cpp
+++ b/gui/history.cpp
@@ -1,8 +1,8 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <deck.h>
-#include <tabs.h>
+#include <lib/deck.h>
+#include <gui/tabs.h>
 
 
 class HistoryTab : public Tab {
diff --git a/gui/main.cpp b/gui/main.cpp
index ce5ffd6e..ba3d6ab4 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -1,12 +1,12 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <audio.h>
-#include <deck.h>
-#include <library.h>
-#include <ocarina.h>
-#include <playlist.h>
-#include <tabs.h>
+#include <lib/audio.h>
+#include <lib/deck.h>
+#include <lib/library.h>
+#include <lib/playlist.h>
+#include <gui/ocarina.h>
+#include <gui/tabs.h>
 
 const std::string share_file(const std::string &file)
 {
diff --git a/gui/model.cpp b/gui/model.cpp
index 9600ca12..93db7e95 100644
--- a/gui/model.cpp
+++ b/gui/model.cpp
@@ -4,8 +4,8 @@
  * See the example at:
  * https://git.gnome.org/browse/gtkmm-documentation/tree/examples/others/treemodelcustom
  */
-#include <audio.h>
-#include <ocarina.h>
+#include <lib/audio.h>
+#include <gui/ocarina.h>
 #include <stdlib.h>
 #include <sstream>
 
diff --git a/gui/playlist.cpp b/gui/playlist.cpp
index 6d452628..6ab27c36 100644
--- a/gui/playlist.cpp
+++ b/gui/playlist.cpp
@@ -1,8 +1,8 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <playlist.h>
-#include <tabs.h>
+#include <lib/playlist.h>
+#include <gui/tabs.h>
 
 
 static const std::string current_playlist();
diff --git a/gui/queue.cpp b/gui/queue.cpp
index b1ffe75b..fb2832b4 100644
--- a/gui/queue.cpp
+++ b/gui/queue.cpp
@@ -1,9 +1,9 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <callback.h>
-#include <deck.h>
-#include <tabs.h>
+#include <lib/callback.h>
+#include <lib/deck.h>
+#include <gui/tabs.h>
 
 #include <map>
 
diff --git a/gui/tabs.cpp b/gui/tabs.cpp
index 587acb5b..eec170a2 100644
--- a/gui/tabs.cpp
+++ b/gui/tabs.cpp
@@ -1,11 +1,11 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <callback.h>
-#include <deck.h>
-#include <filter.h>
-#include <playlist.h>
-#include <tabs.h>
+#include <lib/callback.h>
+#include <lib/deck.h>
+#include <lib/filter.h>
+#include <lib/playlist.h>
+#include <gui/tabs.h>
 
 #include <map>
 #include <sstream>
diff --git a/include/ocarina.h b/include/gui/ocarina.h
similarity index 99%
rename from include/ocarina.h
rename to include/gui/ocarina.h
index aafd3e15..c0327dfe 100644
--- a/include/ocarina.h
+++ b/include/gui/ocarina.h
@@ -4,7 +4,7 @@
 #ifndef OCARINA_H
 #define OCARINA_H
 
-#include <queue.h>
+#include <lib/queue.h>
 #include <gtkmm.h>
 
 
diff --git a/include/tabs.h b/include/gui/tabs.h
similarity index 98%
rename from include/tabs.h
rename to include/gui/tabs.h
index 90e20bc3..7fe1201a 100644
--- a/include/tabs.h
+++ b/include/gui/tabs.h
@@ -4,8 +4,8 @@
 #ifndef OCARINA_TABS_H
 #define OCARINA_TABS_H
 
-#include <ocarina.h>
-#include <queue.h>
+#include <gui/ocarina.h>
+#include <lib/queue.h>
 #include <set>
 
 class Tab {
diff --git a/include/audio.h b/include/lib/audio.h
similarity index 95%
rename from include/audio.h
rename to include/lib/audio.h
index 8b9dc6c9..5228150b 100644
--- a/include/audio.h
+++ b/include/lib/audio.h
@@ -4,7 +4,7 @@
 #ifndef OCARINA_AUDIO_H
 #define OCARINA_AUDIO_H
 
-#include <tags.h>
+#include <lib/tags.h>
 #include <string>
 
 namespace audio
diff --git a/include/callback.h b/include/lib/callback.h
similarity index 92%
rename from include/callback.h
rename to include/lib/callback.h
index af4b9427..90a0d647 100644
--- a/include/callback.h
+++ b/include/lib/callback.h
@@ -4,8 +4,8 @@
 #ifndef OCARINA_CALLBACK_H
 #define OCARINA_CALLBACK_H
 
-#include <library.h>
-#include <queue.h>
+#include <lib/library.h>
+#include <lib/queue.h>
 
 
 struct Callbacks {
diff --git a/include/database.h b/include/lib/database.h
similarity index 97%
rename from include/database.h
rename to include/lib/database.h
index 06cd7829..59b1d712 100644
--- a/include/database.h
+++ b/include/lib/database.h
@@ -4,7 +4,7 @@
 #ifndef OCARINA_DATABASE_H
 #define OCARINA_DATABASE_H
 
-#include <file.h>
+#include <lib/file.h>
 
 #include <map>
 #include <vector>
diff --git a/include/database.hpp b/include/lib/database.hpp
similarity index 100%
rename from include/database.hpp
rename to include/lib/database.hpp
diff --git a/include/deck.h b/include/lib/deck.h
similarity index 96%
rename from include/deck.h
rename to include/lib/deck.h
index 7deae73d..871bd9d5 100644
--- a/include/deck.h
+++ b/include/lib/deck.h
@@ -4,7 +4,7 @@
 #ifndef OCARINA_DECK_H
 #define OCARINA_DECK_H
 
-#include <queue.h>
+#include <lib/queue.h>
 #include <list>
 
 
diff --git a/include/driver.h b/include/lib/driver.h
similarity index 100%
rename from include/driver.h
rename to include/lib/driver.h
diff --git a/include/error.h b/include/lib/error.h
similarity index 100%
rename from include/error.h
rename to include/lib/error.h
diff --git a/include/file.h b/include/lib/file.h
similarity index 100%
rename from include/file.h
rename to include/lib/file.h
diff --git a/include/filter.h b/include/lib/filter.h
similarity index 100%
rename from include/filter.h
rename to include/lib/filter.h
diff --git a/include/idle.h b/include/lib/idle.h
similarity index 100%
rename from include/idle.h
rename to include/lib/idle.h
diff --git a/include/idle.hpp b/include/lib/idle.hpp
similarity index 100%
rename from include/idle.hpp
rename to include/lib/idle.hpp
diff --git a/include/index.h b/include/lib/index.h
similarity index 96%
rename from include/index.h
rename to include/lib/index.h
index f8ee53f5..b3e65bbf 100644
--- a/include/index.h
+++ b/include/lib/index.h
@@ -4,7 +4,7 @@
 #ifndef OCARINA_INDEX_H
 #define OCARINA_INDEX_H
 
-#include <database.h>
+#include <lib/database.h>
 
 #include <set>
 #include <string>
diff --git a/include/library.h b/include/lib/library.h
similarity index 88%
rename from include/library.h
rename to include/lib/library.h
index 73cea15e..a68be4df 100644
--- a/include/library.h
+++ b/include/lib/library.h
@@ -4,8 +4,8 @@
 #ifndef OCARINA_LIBRARY_H
 #define OCARINA_LIBRARY_H
 
-#include <queue.h>
-#include <tags.h>
+#include <lib/queue.h>
+#include <lib/tags.h>
 #include <string>
 
 namespace library
diff --git a/include/playlist.h b/include/lib/playlist.h
similarity index 90%
rename from include/playlist.h
rename to include/lib/playlist.h
index abd491c3..746ed59c 100644
--- a/include/playlist.h
+++ b/include/lib/playlist.h
@@ -4,8 +4,8 @@
 #ifndef OCARINA_PLAYLIST_H
 #define OCARINA_PLAYLIST_H
 
-#include <index.h>
-#include <queue.h>
+#include <lib/index.h>
+#include <lib/queue.h>
 
 #include <string>
 
diff --git a/include/print.h b/include/lib/print.h
similarity index 100%
rename from include/print.h
rename to include/lib/print.h
diff --git a/include/queue.h b/include/lib/queue.h
similarity index 96%
rename from include/queue.h
rename to include/lib/queue.h
index 451200be..18f65d34 100644
--- a/include/queue.h
+++ b/include/lib/queue.h
@@ -4,8 +4,8 @@
 #ifndef OCARINA_QUEUE_H
 #define OCARINA_QUEUE_H
 
-#include <file.h>
-#include <tags.h>
+#include <lib/file.h>
+#include <lib/tags.h>
 
 #include <vector>
 #include <list>
diff --git a/include/random.h b/include/lib/random.h
similarity index 100%
rename from include/random.h
rename to include/lib/random.h
diff --git a/include/tags.h b/include/lib/tags.h
similarity index 98%
rename from include/tags.h
rename to include/lib/tags.h
index 51f873c9..9d4b9e3f 100644
--- a/include/tags.h
+++ b/include/lib/tags.h
@@ -4,7 +4,7 @@
 #ifndef OCARINA_TAGS_H
 #define OCARINA_TAGS_H
 
-#include <database.h>
+#include <lib/database.h>
 
 
 enum sort_t {
diff --git a/include/version.h b/include/lib/version.h
similarity index 100%
rename from include/version.h
rename to include/lib/version.h
diff --git a/lib/audio.cpp b/lib/audio.cpp
index b1efcf3b..4bd0dccb 100644
--- a/lib/audio.cpp
+++ b/lib/audio.cpp
@@ -1,10 +1,10 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <audio.h>
-#include <callback.h>
-#include <deck.h>
-#include <driver.h>
+#include <lib/audio.h>
+#include <lib/callback.h>
+#include <lib/deck.h>
+#include <lib/driver.h>
 
 #include <sstream>
 #include <string.h>
diff --git a/lib/callback.cpp b/lib/callback.cpp
index 573853a3..46cb1f7c 100644
--- a/lib/callback.cpp
+++ b/lib/callback.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <callback.h>
+#include <lib/callback.h>
 
 
 static void no_op() {}
diff --git a/lib/database.cpp b/lib/database.cpp
index f520cf56..c9817a8d 100644
--- a/lib/database.cpp
+++ b/lib/database.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <database.h>
+#include <lib/database.h>
 
 
 DatabaseEntry :: DatabaseEntry()
diff --git a/lib/deck.cpp b/lib/deck.cpp
index 1940643e..aa35baca 100644
--- a/lib/deck.cpp
+++ b/lib/deck.cpp
@@ -1,10 +1,10 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <callback.h>
-#include <deck.h>
-#include <file.h>
-#include <library.h>
+#include <lib/callback.h>
+#include <lib/deck.h>
+#include <lib/file.h>
+#include <lib/library.h>
 
 
 class RecentQueue : public Queue
diff --git a/lib/driver.cpp b/lib/driver.cpp
index 609672bf..66963338 100644
--- a/lib/driver.cpp
+++ b/lib/driver.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <driver.h>
+#include <lib/driver.h>
 
 
 Driver :: Driver() {}
diff --git a/lib/file.cpp b/lib/file.cpp
index 479f5ebc..21165b13 100644
--- a/lib/file.cpp
+++ b/lib/file.cpp
@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <error.h>
-#include <file.h>
+#include <lib/error.h>
+#include <lib/file.h>
 
 #include <glib.h>
 
diff --git a/lib/filter.cpp b/lib/filter.cpp
index 9ca8bd66..a659d47b 100644
--- a/lib/filter.cpp
+++ b/lib/filter.cpp
@@ -2,8 +2,8 @@
  * Copyright 2013 (c) Anna Schumaker.
  */
 
-#include <filter.h>
-#include <index.h>
+#include <lib/filter.h>
+#include <lib/index.h>
 
 #include <algorithm>
 #include <list>
diff --git a/lib/idle.cpp b/lib/idle.cpp
index 08e389a4..2849e97a 100644
--- a/lib/idle.cpp
+++ b/lib/idle.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <idle.h>
+#include <lib/idle.h>
 
 #include <queue>
 
diff --git a/lib/index.cpp b/lib/index.cpp
index ff27f0f4..2f55f67e 100644
--- a/lib/index.cpp
+++ b/lib/index.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <index.h>
+#include <lib/index.h>
 
 
 IndexEntry :: IndexEntry() {}
diff --git a/lib/library.cpp b/lib/library.cpp
index 04675513..b7404d96 100644
--- a/lib/library.cpp
+++ b/lib/library.cpp
@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <idle.h>
-#include <library.h>
+#include <lib/idle.h>
+#include <lib/library.h>
 
 #include <glib.h>
 
diff --git a/lib/playlist.cpp b/lib/playlist.cpp
index c4b3b1aa..ab02bb7d 100644
--- a/lib/playlist.cpp
+++ b/lib/playlist.cpp
@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <library.h>
-#include <playlist.h>
+#include <lib/library.h>
+#include <lib/playlist.h>
 
 
 class PlaylistQueue : public Queue {
diff --git a/lib/queue.cpp b/lib/queue.cpp
index 50cd64fa..89c6823e 100644
--- a/lib/queue.cpp
+++ b/lib/queue.cpp
@@ -1,9 +1,9 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <callback.h>
-#include <queue.h>
-#include <random.h>
+#include <lib/callback.h>
+#include <lib/queue.h>
+#include <lib/random.h>
 
 #include <algorithm>
 #include <sstream>
diff --git a/lib/random.cpp b/lib/random.cpp
index 3488e277..6e515d60 100644
--- a/lib/random.cpp
+++ b/lib/random.cpp
@@ -3,7 +3,7 @@
  */
 #ifdef CONFIG_TEST
 
-#include <random.h>
+#include <lib/random.h>
 
 static unsigned int _random_value = 0;
 
diff --git a/lib/tags.cpp b/lib/tags.cpp
index 027d0386..945f85c8 100644
--- a/lib/tags.cpp
+++ b/lib/tags.cpp
@@ -2,9 +2,9 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 
-#include <tags.h>
-#include <filter.h>
-#include <print.h>
+#include <lib/tags.h>
+#include <lib/filter.h>
+#include <lib/print.h>
 
 #include <sstream>
 #include <taglib/tag.h>
diff --git a/tests/audio.cpp b/tests/audio.cpp
index b3c50a43..5679b1bc 100644
--- a/tests/audio.cpp
+++ b/tests/audio.cpp
@@ -1,9 +1,9 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <audio.h>
-#include <driver.h>
-#include <library.h>
+#include <lib/audio.h>
+#include <lib/driver.h>
+#include <lib/library.h>
 #include "test.h"
 
 Track *TRACK_NULL = NULL;
diff --git a/tests/database.cpp b/tests/database.cpp
index a72e228c..310d8187 100644
--- a/tests/database.cpp
+++ b/tests/database.cpp
@@ -3,7 +3,7 @@
  * Test a Database
  */
 
-#include <database.h>
+#include <lib/database.h>
 #include "test.h"
 
 #include <sstream>
diff --git a/tests/deck.cpp b/tests/deck.cpp
index 7057ac7c..139fdf29 100644
--- a/tests/deck.cpp
+++ b/tests/deck.cpp
@@ -1,9 +1,9 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <callback.h>
-#include <deck.h>
-#include <library.h>
+#include <lib/callback.h>
+#include <lib/deck.h>
+#include <lib/library.h>
 #include "test.h"
 
 static Queue *Q_NULL = NULL;
diff --git a/tests/driver.cpp b/tests/driver.cpp
index a396a6f7..130da86f 100644
--- a/tests/driver.cpp
+++ b/tests/driver.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <driver.h>
+#include <lib/driver.h>
 #include "test.h"
 
 static TestDriver *DRIVER_NULL = NULL;
diff --git a/tests/file.cpp b/tests/file.cpp
index 0219194d..8f0bcaf4 100644
--- a/tests/file.cpp
+++ b/tests/file.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <file.h>
+#include <lib/file.h>
 #include "test.h"
 
 
diff --git a/tests/filter.cpp b/tests/filter.cpp
index ce6e63d7..b24865dc 100644
--- a/tests/filter.cpp
+++ b/tests/filter.cpp
@@ -3,7 +3,7 @@
  * Test the filtering code
  */
 
-#include <filter.h>
+#include <lib/filter.h>
 #include "test.h"
 
 static void do_test_lowercase(const std::string &text, const std::string &lc)
diff --git a/tests/idle.cpp b/tests/idle.cpp
index 8b13f4b3..69aac7b1 100644
--- a/tests/idle.cpp
+++ b/tests/idle.cpp
@@ -3,7 +3,7 @@
  * Test the idle queue
  */
 
-#include <idle.h>
+#include <lib/idle.h>
 #include "test.h"
 
 #include <sstream>
diff --git a/tests/index.cpp b/tests/index.cpp
index 0001dfde..891aead0 100644
--- a/tests/index.cpp
+++ b/tests/index.cpp
@@ -3,7 +3,7 @@
  * Test a Database
  */
 
-#include <index.h>
+#include <lib/index.h>
 #include "test.h"
 
 #include <sstream>
diff --git a/tests/library.cpp b/tests/library.cpp
index 0838dd9c..044e0aa0 100644
--- a/tests/library.cpp
+++ b/tests/library.cpp
@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <idle.h>
-#include <library.h>
+#include <lib/idle.h>
+#include <lib/library.h>
 #include "test.h"
 
 static Queue *Q_NULL = NULL;
diff --git a/tests/playlist.cpp b/tests/playlist.cpp
index c8763aa0..6d354563 100644
--- a/tests/playlist.cpp
+++ b/tests/playlist.cpp
@@ -1,8 +1,8 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <library.h>
-#include <playlist.h>
+#include <lib/library.h>
+#include <lib/playlist.h>
 #include "test.h"
 
 static IndexEntry *IDX_NULL = NULL;
diff --git a/tests/queue.cpp b/tests/queue.cpp
index 59da0f69..ba96e97f 100644
--- a/tests/queue.cpp
+++ b/tests/queue.cpp
@@ -1,10 +1,10 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <callback.h>
-#include <queue.h>
-#include <random.h>
-#include <tags.h>
+#include <lib/callback.h>
+#include <lib/queue.h>
+#include <lib/random.h>
+#include <lib/tags.h>
 #include "test.h"
 
 
diff --git a/tests/random.cpp b/tests/random.cpp
index 1d714404..c2eb1215 100644
--- a/tests/random.cpp
+++ b/tests/random.cpp
@@ -2,7 +2,7 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 
-#include <random.h>
+#include <lib/random.h>
 #include "test.h"
 
 #include <sstream>
diff --git a/tests/tags.cpp b/tests/tags.cpp
index f0f9a745..9493a16b 100644
--- a/tests/tags.cpp
+++ b/tests/tags.cpp
@@ -3,7 +3,7 @@
  * Test a DatabaseEntry
  */
 
-#include <tags.h>
+#include <lib/tags.h>
 #include "test.h"
 
 static Library *LIB_NULL = NULL;
diff --git a/tests/version.cpp b/tests/version.cpp
index 727438a9..1cefb1d7 100644
--- a/tests/version.cpp
+++ b/tests/version.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <version.h>
+#include <lib/version.h>
 #include "test.h"
 
 #ifdef CONFIG_DEBUG