clean up CPP includes

Include only headers which are really required.  This speeds up
compilation and helps detect cross-layer accesses.

[ew: minor fixups to not break on new core]

17 files changed, 2 insertions, 63 deletions

diff --git a/src/inputPlugin.h b/src/inputPlugin.h
index 2f337acef..161a0db59 100644
--- a/src/inputPlugin.h
+++ b/src/inputPlugin.h
@@ -22,6 +22,7 @@
 #include "inputStream.h"
 #include "outputBuffer.h"
 #include "metadata_pipe.h"
+#include "decode.h"
 
 /* valid values for streamTypes in the InputPlugin struct: */
 #define INPUT_PLUGIN_STREAM_FILE	0x01
diff --git a/src/inputPlugins/_flac_common.c b/src/inputPlugins/_flac_common.c
index 3655fd478..6890c7c50 100644
--- a/src/inputPlugins/_flac_common.c
+++ b/src/inputPlugins/_flac_common.c
@@ -26,12 +26,6 @@
 #include "_flac_common.h"
 
 #include "../log.h"
-#include "../tag.h"
-#include "../inputStream.h"
-#include "../outputBuffer.h"
-#include "../decode.h"
-#include "../replayGain.h"
-#include "../os_compat.h"
 
 #include <FLAC/format.h>
 #include <FLAC/metadata.h>
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h
index 5c147a064..6fe5bd744 100644
--- a/src/inputPlugins/_flac_common.h
+++ b/src/inputPlugins/_flac_common.h
@@ -26,10 +26,6 @@
 
 #if defined(HAVE_FLAC) || defined(HAVE_OGGFLAC)
 
-#include "../tag.h"
-#include "../inputStream.h"
-#include "../outputBuffer.h"
-#include "../decode.h"
 #include <FLAC/export.h>
 #if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
 #  include <FLAC/seekable_stream_decoder.h>
diff --git a/src/inputPlugins/_ogg_common.c b/src/inputPlugins/_ogg_common.c
index d24b2b47b..a7525c2de 100644
--- a/src/inputPlugins/_ogg_common.c
+++ b/src/inputPlugins/_ogg_common.c
@@ -28,7 +28,6 @@
   (defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7)
 
 #include "../utils.h"
-#include "../os_compat.h"
 
 ogg_stream_type ogg_stream_type_detect(InputStream * inStream)
 {
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index 98329a4b3..dd255903a 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -23,11 +23,7 @@
 #define AAC_MAX_CHANNELS	6
 
 #include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../inputStream.h"
-#include "../outputBuffer.h"
-#include "../os_compat.h"
 
 #include <faad.h>
 
diff --git a/src/inputPlugins/audiofile_plugin.c b/src/inputPlugins/audiofile_plugin.c
index 114a87786..7f748fc1b 100644
--- a/src/inputPlugins/audiofile_plugin.c
+++ b/src/inputPlugins/audiofile_plugin.c
@@ -22,11 +22,7 @@
 
 #ifdef HAVE_AUDIOFILE
 
-#include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../os_compat.h"
 
 #include <audiofile.h>
 
diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c
index 5c27cab39..de0648c90 100644
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/inputPlugins/flac_plugin.c
@@ -22,12 +22,6 @@
 
 #include "../utils.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../inputStream.h"
-#include "../outputBuffer.h"
-#include "../replayGain.h"
-#include "../audio.h"
-#include "../os_compat.h"
 
 /* this code was based on flac123, from flac-tools */
 
diff --git a/src/inputPlugins/mod_plugin.c b/src/inputPlugins/mod_plugin.c
index 9f9da6273..df938f0ed 100644
--- a/src/inputPlugins/mod_plugin.c
+++ b/src/inputPlugins/mod_plugin.c
@@ -21,10 +21,7 @@
 #ifdef HAVE_MIKMOD
 
 #include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../os_compat.h"
 
 #include <mikmod.h>
 
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index c36cab6f0..684655f97 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -20,7 +20,6 @@
 
 #ifdef HAVE_MAD
 
-#include "../pcm_utils.h"
 #include <mad.h>
 
 #ifdef HAVE_ID3TAG
@@ -29,12 +28,8 @@
 
 #include "../log.h"
 #include "../utils.h"
-#include "../replayGain.h"
-#include "../tag.h"
 #include "../conf.h"
 
-#include "../os_compat.h"
-
 #define FRAMES_CUSHION    2000
 
 #define READ_BUFFER_SIZE  40960
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c
index bf200c534..66dbbfdba 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -21,13 +21,7 @@
 #ifdef HAVE_FAAD
 
 #include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../inputStream.h"
-#include "../outputBuffer.h"
-#include "../decode.h"
-#include "../os_compat.h"
 
 #include "../mp4ff/mp4ff.h"
 
diff --git a/src/inputPlugins/mpc_plugin.c b/src/inputPlugins/mpc_plugin.c
index 116e471ff..ea27d1dbf 100644
--- a/src/inputPlugins/mpc_plugin.c
+++ b/src/inputPlugins/mpc_plugin.c
@@ -21,13 +21,7 @@
 #ifdef HAVE_MPCDEC
 
 #include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../inputStream.h"
-#include "../outputBuffer.h"
-#include "../replayGain.h"
-#include "../os_compat.h"
 
 #include <mpcdec/mpcdec.h>
 
diff --git a/src/inputPlugins/oggflac_plugin.c b/src/inputPlugins/oggflac_plugin.c
index 6c5998afe..87444d261 100644
--- a/src/inputPlugins/oggflac_plugin.c
+++ b/src/inputPlugins/oggflac_plugin.c
@@ -27,12 +27,6 @@
 
 #include "../utils.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../inputStream.h"
-#include "../outputBuffer.h"
-#include "../replayGain.h"
-#include "../audio.h"
-#include "../os_compat.h"
 
 static void oggflac_cleanup(FlacData * data,
 			    OggFLAC__SeekableStreamDecoder * decoder)
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c
index 567515d23..7612b1db5 100644
--- a/src/inputPlugins/oggvorbis_plugin.c
+++ b/src/inputPlugins/oggvorbis_plugin.c
@@ -25,13 +25,7 @@
 #include "_ogg_common.h"
 
 #include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../inputStream.h"
-#include "../outputBuffer.h"
-#include "../replayGain.h"
-#include "../os_compat.h"
 
 #ifndef HAVE_TREMOR
 #include <vorbis/vorbisfile.h>
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c
index f1491d095..4199dd946 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/inputPlugins/wavpack_plugin.c
@@ -23,11 +23,7 @@
 #ifdef HAVE_WAVPACK
 
 #include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../outputBuffer.h"
-#include "../os_compat.h"
 #include "../path.h"
 
 #include <wavpack/wavpack.h>
diff --git a/src/outputBuffer.c b/src/outputBuffer.c
index 27bb18b44..fd6b115f6 100644
--- a/src/outputBuffer.c
+++ b/src/outputBuffer.c
@@ -27,6 +27,7 @@
 #include "player_error.h"
 #include "log.h"
 #include "action_status.h"
+#include "decode.h"
 
 /* typically have 2048-4096 of these structs, so pack tightly */
 struct ob_chunk {
diff --git a/src/outputBuffer.h b/src/outputBuffer.h
index 15e46da60..3fc440af3 100644
--- a/src/outputBuffer.h
+++ b/src/outputBuffer.h
@@ -21,7 +21,6 @@
 
 #include "pcm_utils.h"
 #include "mpd_types.h"
-#include "decode.h"
 #include "inputStream.h"
 #include "replayGain.h"
 
diff --git a/src/sig_handlers.c b/src/sig_handlers.c
index 2d2e08278..6b28cb675 100644
--- a/src/sig_handlers.c
+++ b/src/sig_handlers.c
@@ -23,7 +23,6 @@
 #include "command.h"
 #include "signal_check.h"
 #include "log.h"
-#include "decode.h"
 
 int handlePendingSignals(void)
 {