From 432d3e5d628785402430e2342c53d1ade93005d8 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@NoWheyCreamery.com>
Date: Sat, 24 Sep 2016 11:02:59 -0400
Subject: [PATCH] core: Add useful headers to core.h

This way we don't need to keep including the same core libraries in
almost every file.

Implements #83: Include useful headers in core/core.h
Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>
---
 core/core.c                   | 4 ----
 gui/ocarina.c                 | 1 -
 include/core/core.h           | 4 +++-
 tests/core/audio.c            | 3 ---
 tests/gui/artwork.c           | 2 --
 tests/gui/audio.c             | 3 ---
 tests/gui/filter.c            | 2 --
 tests/gui/model.c             | 3 ---
 tests/gui/playlist.c          | 2 --
 tests/gui/playlists/artist.c  | 1 -
 tests/gui/playlists/library.c | 1 -
 tests/gui/playlists/system.c  | 2 --
 tests/gui/playlists/user.c    | 1 -
 tests/gui/sidebar.c           | 2 --
 tests/gui/treeview.c          | 3 ---
 15 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/core/core.c b/core/core.c
index 8d533027..bc703a71 100644
--- a/core/core.c
+++ b/core/core.c
@@ -2,10 +2,6 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 #include <core/core.h>
-#include <core/idle.h>
-#include <core/settings.h>
-#include <core/tags/tags.h>
-
 
 static bool core_defragment(void *data)
 {
diff --git a/gui/ocarina.c b/gui/ocarina.c
index 6e70501e..6b93ed57 100644
--- a/gui/ocarina.c
+++ b/gui/ocarina.c
@@ -2,7 +2,6 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 #include <core/core.h>
-#include <core/audio.h>
 #include <gui/audio.h>
 #include <gui/builder.h>
 #include <gui/filter.h>
diff --git a/include/core/core.h b/include/core/core.h
index 1f69d670..e991d5e1 100644
--- a/include/core/core.h
+++ b/include/core/core.h
@@ -4,8 +4,10 @@
 #ifndef OCARINA_CORE_CORE_H
 #define OCARINA_CORE_CORE_H
 #include <core/audio.h>
-#include <core/playlist.h>
 #include <core/idle.h>
+#include <core/playlist.h>
+#include <core/settings.h>
+#include <core/tags/tags.h>
 #include <stdbool.h>
 
 /* Called to initialize all core Ocarina components. */
diff --git a/tests/core/audio.c b/tests/core/audio.c
index fcc76e3f..cb4f9663 100644
--- a/tests/core/audio.c
+++ b/tests/core/audio.c
@@ -1,9 +1,6 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
-#include <core/audio.h>
-#include <core/idle.h>
-#include <core/playlist.h>
 #include <core/core.h>
 #include <tests/test.h>
 
diff --git a/tests/gui/artwork.c b/tests/gui/artwork.c
index 02de67d0..3c5020c3 100644
--- a/tests/gui/artwork.c
+++ b/tests/gui/artwork.c
@@ -1,9 +1,7 @@
 /*
  * Copyright 2016 (c) Anna Schumaker.
  */
-#include <core/audio.h>
 #include <core/core.h>
-#include <core/idle.h>
 #include <gui/artwork.h>
 #include <gui/filter.h>
 #include <gui/model.h>
diff --git a/tests/gui/audio.c b/tests/gui/audio.c
index bbbeb88d..d9cbc938 100644
--- a/tests/gui/audio.c
+++ b/tests/gui/audio.c
@@ -1,10 +1,7 @@
 /*
  * Copyright 2015 (c) Anna Schumaker.
  */
-#include <core/audio.h>
 #include <core/core.h>
-#include <core/idle.h>
-#include <core/playlist.h>
 #include <core/string.h>
 #include <gui/audio.h>
 #include <gui/builder.h>
diff --git a/tests/gui/filter.c b/tests/gui/filter.c
index f9e2a081..cde9783e 100644
--- a/tests/gui/filter.c
+++ b/tests/gui/filter.c
@@ -1,9 +1,7 @@
 /*
  * Copyright 2016 (c) Anna Schumaker.
  */
-#include <core/audio.h>
 #include <core/core.h>
-#include <core/idle.h>
 #include <gui/filter.h>
 #include <gui/model.h>
 #include <gui/window.h>
diff --git a/tests/gui/model.c b/tests/gui/model.c
index b31cb2e8..3a12f465 100644
--- a/tests/gui/model.c
+++ b/tests/gui/model.c
@@ -1,10 +1,7 @@
 /*
  * Copyright 2016 (c) Anna Schumaker.
  */
-#include <core/audio.h>
-#include <core/idle.h>
 #include <core/core.h>
-#include <core/playlist.h>
 #include <gui/builder.h>
 #include <gui/model.h>
 #include <tests/test.h>
diff --git a/tests/gui/playlist.c b/tests/gui/playlist.c
index d4194cd5..2ce48a42 100644
--- a/tests/gui/playlist.c
+++ b/tests/gui/playlist.c
@@ -2,8 +2,6 @@
  * Copyright 2016 (c) Anna Schumaker.
  */
 #include <core/core.h>
-#include <core/idle.h>
-#include <core/settings.h>
 #include <gui/filter.h>
 #include <gui/model.h>
 #include <gui/playlist.h>
diff --git a/tests/gui/playlists/artist.c b/tests/gui/playlists/artist.c
index 9f6bcacf..8c76f9bc 100644
--- a/tests/gui/playlists/artist.c
+++ b/tests/gui/playlists/artist.c
@@ -2,7 +2,6 @@
  * Copyright 2016 (c) Anna Schumaker.
  */
 #include <core/core.h>
-#include <core/idle.h>
 #include <gui/builder.h>
 #include <gui/filter.h>
 #include <gui/model.h>
diff --git a/tests/gui/playlists/library.c b/tests/gui/playlists/library.c
index a9b94350..2c8481b4 100644
--- a/tests/gui/playlists/library.c
+++ b/tests/gui/playlists/library.c
@@ -2,7 +2,6 @@
  * Copyright 2016 (c) Anna Schumaker.
  */
 #include <core/core.h>
-#include <core/idle.h>
 #include <gui/builder.h>
 #include <gui/filter.h>
 #include <gui/model.h>
diff --git a/tests/gui/playlists/system.c b/tests/gui/playlists/system.c
index 802e7186..1fa8e11c 100644
--- a/tests/gui/playlists/system.c
+++ b/tests/gui/playlists/system.c
@@ -1,9 +1,7 @@
 /*
  * Copyright 2016 (c) Anna Schumaker.
  */
-#include <core/audio.h>
 #include <core/core.h>
-#include <core/idle.h>
 #include <gui/filter.h>
 #include <gui/model.h>
 #include <gui/playlist.h>
diff --git a/tests/gui/playlists/user.c b/tests/gui/playlists/user.c
index 7e512db4..39404afb 100644
--- a/tests/gui/playlists/user.c
+++ b/tests/gui/playlists/user.c
@@ -2,7 +2,6 @@
  * Copyright 2016 (c) Anna Schumaker.
  */
 #include <core/core.h>
-#include <core/idle.h>
 #include <gui/builder.h>
 #include <gui/filter.h>
 #include <gui/model.h>
diff --git a/tests/gui/sidebar.c b/tests/gui/sidebar.c
index ef8ba50d..49448f2b 100644
--- a/tests/gui/sidebar.c
+++ b/tests/gui/sidebar.c
@@ -2,8 +2,6 @@
  * Copyright 2015 (c) Anna Schumaker.
  */
 #include <core/core.h>
-#include <core/idle.h>
-#include <core/settings.h>
 #include <gui/filter.h>
 #include <gui/model.h>
 #include <gui/sidebar.h>
diff --git a/tests/gui/treeview.c b/tests/gui/treeview.c
index 66d57ab0..c2f9ea2a 100644
--- a/tests/gui/treeview.c
+++ b/tests/gui/treeview.c
@@ -1,10 +1,7 @@
 /*
  * Copyright 2016 (c) Anna Schumaker.
  */
-#include <core/audio.h>
 #include <core/core.h>
-#include <core/idle.h>
-#include <core/settings.h>
 #include <gui/filter.h>
 #include <gui/model.h>
 #include <gui/treeview.h>