clean up CPP includes

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

src/audio.c

@@ -20,7 +20,6 @@
 #include "audioOutput.h"
 #include "log.h"
 #include "command.h"
-#include "playerData.h"
 #include "path.h"
 #include "ack.h"
 #include "myfprintf.h"

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>

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>

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)
 {

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>
 

src/inputPlugins/audiofile_plugin.c

@@ -22,12 +22,7 @@
 
 #ifdef HAVE_AUDIOFILE
 
-#include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../playerData.h"
-#include "../os_compat.h"
 
 #include <audiofile.h>
 

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 */
 

src/inputPlugins/mod_plugin.c

@@ -21,11 +21,7 @@
 #ifdef HAVE_MIKMOD
 
 #include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../playerData.h"
-#include "../os_compat.h"
 
 #include <mikmod.h>
 

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

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"
 

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>
 

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)

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>

src/inputPlugins/wavpack_plugin.c

@@ -23,12 +23,7 @@
 #ifdef HAVE_WAVPACK
 
 #include "../utils.h"
-#include "../audio.h"
 #include "../log.h"
-#include "../pcm_utils.h"
-#include "../playerData.h"
-#include "../outputBuffer.h"
-#include "../os_compat.h"
 #include "../path.h"
 
 #include <wavpack/wavpack.h>

src/outputBuffer.h

@@ -21,7 +21,6 @@
 
 #include "pcm_utils.h"
 #include "mpd_types.h"
-#include "decode.h"
 #include "inputStream.h"
 #include "replayGain.h"
 

src/player.c

@@ -20,16 +20,8 @@
 #include "path.h"
 #include "decode.h"
 #include "command.h"
-#include "interface.h"
-#include "playlist.h"
-#include "ls.h"
-#include "listen.h"
 #include "log.h"
-#include "utils.h"
-#include "directory.h"
-#include "volume.h"
 #include "playerData.h"
-#include "permission.h"
 #include "ack.h"
 #include "os_compat.h"
 #include "main_notify.h"

src/player.h

@@ -19,7 +19,7 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "decode.h"
+#include "notify.h"
 #include "mpd_types.h"
 #include "song.h"
 #include "os_compat.h"

src/playerData.h

@@ -19,10 +19,8 @@
 #ifndef PLAYER_DATA_H
 #define PLAYER_DATA_H
 
-#include "audio.h"
 #include "player.h"
 #include "decode.h"
-#include "mpd_types.h"
 #include "outputBuffer.h"
 
 extern unsigned int buffered_before_play;

src/sig_handlers.c

@@ -23,8 +23,6 @@
 #include "command.h"
 #include "signal_check.h"
 #include "log.h"
-#include "player.h"
-#include "decode.h"
 
 int handlePendingSignals(void)
 {