clean up CPP includes

src/audio.c

@@ -18,13 +18,12 @@
 
 #include "audio.h"
 #include "audioOutput.h"
-#include "conf.h"
 #include "log.h"
-#include "sig_handlers.h"
 #include "command.h"
 #include "playerData.h"
-#include "utils.h"
-#include "state_file.h"
+#include "path.h"
+#include "ack.h"
+#include "myfprintf.h"
 #include "os_compat.h"
 
 #define AUDIO_DEVICE_STATE	"audio_device_state:"

src/audio.h

@@ -19,8 +19,6 @@
 #ifndef AUDIO_H
 #define AUDIO_H
 
-#include "../config.h"
-
 #include "mpd_types.h"
 #include "tag.h"
 #include "os_compat.h"

src/buffer2array.h

@@ -19,8 +19,6 @@
 #ifndef BUFFER_2_ARRAY_H
 #define BUFFER_2_ARRAY_H
 
-#include "../config.h"
-
 /* tokenizes up to max elements in buffer (a null-terminated string) and
  * stores the result in array (which must be capable of holding up to
  * max elements).  Tokenization is based on C string quoting rules.

src/charConv.c

@@ -23,6 +23,8 @@
 #include "path.h"
 #include "os_compat.h"
 
+#include "../config.h"
+
 #ifdef HAVE_ICONV
 #include <iconv.h>
 static iconv_t char_conv_iconv;

src/charConv.h

@@ -19,8 +19,6 @@
 #ifndef CHAR_CONV_H
 #define CHAR_CONV_H
 
-#include "../config.h"
-
 int setCharSetConversion(const char *to, const char *from);
 
 char *char_conv_str(char *dest, const char *string);

src/command.c

@@ -28,9 +28,10 @@
 #include "permission.h"
 #include "buffer2array.h"
 #include "log.h"
-#include "tag.h"
 #include "utils.h"
 #include "storedPlaylist.h"
+#include "sllist.h"
+#include "ack.h"
 #include "os_compat.h"
 
 #define COMMAND_PLAY           	"play"

src/command.h

@@ -19,19 +19,15 @@
 #ifndef COMMAND_H
 #define COMMAND_H
 
-#include "../config.h"
-
-#include "list.h"
-#include "myfprintf.h"
-#include "log.h"
-#include "ack.h"
-#include "sllist.h"
+#include "gcc.h"
 #include "os_compat.h"
 
 #define COMMAND_RETURN_KILL	10
 #define COMMAND_RETURN_CLOSE	20
 #define COMMAND_MASTER_READY	30
 
+struct strnode;
+
 int processListOfCommands(int fd, int *permission, int *expired,
 			  int listOK, struct strnode *list);
 

src/conf.h

@@ -19,8 +19,6 @@
 #ifndef CONF_H
 #define CONF_H
 
-#include "../config.h"
-
 #define CONF_MUSIC_DIR                  "music_directory"
 #define CONF_PLAYLIST_DIR               "playlist_directory"
 #define CONF_DB_FILE                    "db_file"

src/dbUtils.h

@@ -19,8 +19,6 @@
 #ifndef DB_UTILS_H
 #define DB_UTILS_H
 
-#include "os_compat.h"
-
 #include "locate.h"
 
 int printAllIn(int fd, char *name);

src/decode.c

@@ -20,15 +20,10 @@
 
 #include "player.h"
 #include "playerData.h"
-#include "utils.h"
 #include "pcm_utils.h"
-#include "audio.h"
 #include "path.h"
 #include "log.h"
-#include "sig_handlers.h"
 #include "ls.h"
-#include "utf8.h"
-#include "os_compat.h"
 
 /* called inside decoder_task (inputPlugins) */
 void decoder_wakeup_player(void)

src/decode.h

@@ -19,17 +19,11 @@
 #ifndef DECODE_H
 #define DECODE_H
 
-#include "../config.h"
-#include "path.h"
-#include "tag.h"
 #include "song.h"
 
-#include "mpd_types.h"
 #include "audio.h"
 #include "notify.h"
 
-#include "os_compat.h"
-
 #define DECODE_TYPE_FILE	0
 #define DECODE_TYPE_URL		1
 

src/directory.c

@@ -20,22 +20,18 @@
 
 #include "command.h"
 #include "conf.h"
-#include "dbUtils.h"
 #include "interface.h"
-#include "list.h"
 #include "listen.h"
 #include "log.h"
 #include "ls.h"
-#include "mpd_types.h"
 #include "path.h"
-#include "player.h"
 #include "playlist.h"
 #include "sig_handlers.h"
 #include "stats.h"
-#include "tagTracker.h"
 #include "utils.h"
 #include "volume.h"
-#include "ls.h"
+#include "ack.h"
+#include "myfprintf.h"
 
 #define DIRECTORY_DIR		"directory: "
 #define DIRECTORY_MTIME		"mtime: "

src/directory.h

@@ -19,10 +19,7 @@
 #ifndef DIRECTORY_H
 #define DIRECTORY_H
 
-#include "../config.h"
-
 #include "song.h"
-#include "list.h"
 
 typedef List DirectoryList;
 

src/inputPlugin.c

@@ -18,10 +18,6 @@
 
 #include "inputPlugin.h"
 
-#include "list.h"
-#include "myfprintf.h"
-#include "os_compat.h"
-
 static List *inputPlugin_list;
 
 void loadInputPlugin(InputPlugin * inputPlugin)

src/inputPlugin.h

@@ -19,11 +19,8 @@
 #ifndef INPUT_PLUGIN_H
 #define INPUT_PLUGIN_H
 
-#include "../config.h"
 #include "inputStream.h"
-#include "decode.h"
 #include "outputBuffer.h"
-#include "tag.h"
 
 /* valid values for streamTypes in the InputPlugin struct: */
 #define INPUT_PLUGIN_STREAM_FILE	0x01

src/inputPlugins/wavpack_plugin.c

@@ -29,6 +29,7 @@
 #include "../playerData.h"
 #include "../outputBuffer.h"
 #include "../os_compat.h"
+#include "../path.h"
 
 #include <wavpack/wavpack.h>
 

src/interface.c

@@ -19,16 +19,17 @@
 #include "interface.h"
 #include "command.h"
 #include "conf.h"
-#include "list.h"
 #include "log.h"
 #include "listen.h"
-#include "playlist.h"
 #include "permission.h"
 #include "sllist.h"
 #include "utils.h"
 #include "ioops.h"
+#include "myfprintf.h"
 #include "os_compat.h"
 
+#include "../config.h"
+
 #define GREETING				"OK MPD " PROTOCOL_VERSION "\n"
 
 #define INTERFACE_MAX_BUFFER_LENGTH			(40960)

src/interface.h

@@ -19,7 +19,6 @@
 #ifndef INTERFACE_H
 #define INTERFACE_H
 
-#include "../config.h"
 #include "os_compat.h"
 
 void initInterfaces(void);

src/list.c

@@ -18,7 +18,6 @@
 
 #include "list.h"
 #include "utils.h"
-#include "os_compat.h"
 
 static void makeListNodesArray(List * list)
 {

src/list.h

@@ -19,7 +19,6 @@
 #ifndef LIST_H
 #define LIST_H
 
-#include "../config.h"
 #include "os_compat.h"
 
 /* used to make a list where free() will be used to free data in list */

src/listen.c

@@ -23,6 +23,8 @@
 #include "utils.h"
 #include "os_compat.h"
 
+#include "../config.h"
+
 #define MAXHOSTNAME 	1024
 
 #define ALLOW_REUSE	1

src/listen.h

@@ -19,7 +19,6 @@
 #ifndef LISTEN_H
 #define LISTEN_H
 
-#include "../config.h"
 #include "os_compat.h"
 
 extern int boundPort;

src/locate.c

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "path.h"
 #include "locate.h"
+#include "path.h"
 #include "utils.h"
 
 #define LOCATE_TAG_FILE_KEY     "file"

src/ls.h

@@ -19,10 +19,7 @@
 #ifndef LS_H
 #define LS_H
 
-#include "../config.h"
-
 #include "inputPlugin.h"
-#include "os_compat.h"
 
 int lsPlaylists(int fd, const char *utf8path);
 

src/mpd_types.h

@@ -20,7 +20,6 @@
 #define MPD_TYPES_H
 
 #include "../config.h"
-#include "os_compat.h"
 
 typedef unsigned char mpd_uint8;
 typedef signed char mpd_sint8;

src/myfprintf.c

@@ -19,8 +19,6 @@
 #include "myfprintf.h"
 #include "interface.h"
 #include "path.h"
-#include "log.h"
-#include "conf.h"
 #include "utils.h"
 #include "os_compat.h"
 

src/myfprintf.h

@@ -19,7 +19,6 @@
 #ifndef MYFPRINTF_H
 #define MYFPRINTF_H
 
-#include "../config.h"
 #include "gcc.h"
 #include "os_compat.h"
 

src/normalize.c

@@ -16,10 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "normalize.h"
 #include "compress.h"
 #include "conf.h"
-#include "normalize.h"
-#include "os_compat.h"
 
 #define DEFAULT_VOLUME_NORMALIZATION 0
 

src/os_compat.h

@@ -19,6 +19,8 @@
 #ifndef OS_COMPAT_H
 #define OS_COMPAT_H
 
+#include "../config.h"
+
 /*
  * This includes OS-wide headers that can be expected to be available
  * on any machine that mpd can be compiled on for any UNIX-like OS.

src/outputBuffer.c

@@ -18,13 +18,8 @@
 
 #include "outputBuffer.h"
 
-#include "pcm_utils.h"
-#include "playerData.h"
 #include "utils.h"
-#include "log.h"
 #include "normalize.h"
-#include "conf.h"
-#include "os_compat.h"
 
 void initOutputBuffer(OutputBuffer * cb, unsigned int size)
 {

src/outputBuffer.h

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

src/path.h

@@ -19,7 +19,6 @@
 #ifndef PATH_H
 #define PATH_H
 
-#include "../config.h"
 #include "os_compat.h"
 
 #if !defined(MPD_PATH_MAX)

src/permission.h

@@ -19,8 +19,6 @@
 #ifndef PERMISSION_H
 #define PERMISSION_H
 
-#include "../config.h"
-
 #define PERMISSION_NONE    0
 #define PERMISSION_READ    1
 #define PERMISSION_ADD     2

src/player.c

@@ -30,7 +30,7 @@
 #include "volume.h"
 #include "playerData.h"
 #include "permission.h"
-#include "sig_handlers.h"
+#include "ack.h"
 #include "os_compat.h"
 
 static void playerCloseAudio(void);

src/player.h

@@ -19,8 +19,6 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "../config.h"
-
 #include "decode.h"
 #include "mpd_types.h"
 #include "song.h"

src/playerData.c

@@ -20,7 +20,6 @@
 #include "conf.h"
 #include "log.h"
 #include "utils.h"
-#include "os_compat.h"
 
 unsigned int buffered_before_play;
 

src/playerData.h

@@ -19,8 +19,6 @@
 #ifndef PLAYER_DATA_H
 #define PLAYER_DATA_H
 
-#include "../config.h"
-
 #include "audio.h"
 #include "player.h"
 #include "decode.h"

src/playlist.c

@@ -26,9 +26,10 @@
 #include "log.h"
 #include "path.h"
 #include "utils.h"
-#include "sig_handlers.h"
 #include "state_file.h"
 #include "storedPlaylist.h"
+#include "ack.h"
+#include "myfprintf.h"
 #include "os_compat.h"
 
 #define PLAYLIST_STATE_STOP		0

src/playlist.h

@@ -19,10 +19,7 @@
 #ifndef PLAYLIST_H
 #define PLAYLIST_H
 
-#include "../config.h"
-
 #include "dbUtils.h"
-#include "os_compat.h"
 
 #define PLAYLIST_FILE_SUFFIX 	"m3u"
 #define PLAYLIST_COMMENT	'#'

src/sig_handlers.c

@@ -18,8 +18,6 @@
  */
 
 #include "sig_handlers.h"
-#include "player.h"
-#include "playerData.h"
 #include "playlist.h"
 #include "directory.h"
 #include "command.h"
@@ -27,7 +25,6 @@
 #include "log.h"
 #include "player.h"
 #include "decode.h"
-#include "os_compat.h"
 
 int handlePendingSignals(void)
 {

src/sig_handlers.h

@@ -19,8 +19,6 @@
 #ifndef SIG_HANDLERS_H
 #define SIG_HANDLERS_H
 
-#include "../config.h"
-
 int handlePendingSignals(void);
 
 void initSigHandlers(void);

src/signal_check.h

@@ -20,8 +20,6 @@
 #ifndef SIGNAL_CHECK_H
 #define SIGNAL_CHECK_H
 
-#include "os_compat.h"
-
 void signal_handle(int sig);
 void signal_unhandle(int sig);
 int signal_is_pending(int sig);

src/sllist.c

@@ -18,7 +18,6 @@
 
 /* a very simple singly-linked-list structure for queues/buffers */
 
-#include "os_compat.h"
 #include "sllist.h"
 #include "utils.h"
 

src/sllist.h

@@ -21,6 +21,8 @@
 #ifndef SLLIST_H
 #define SLLIST_H
 
+#include "os_compat.h"
+
 /* just free the entire structure if it's free-able, the 'data' member
  * should _NEVER_ be explicitly freed
  *

src/stats.c

@@ -21,7 +21,6 @@
 #include "directory.h"
 #include "myfprintf.h"
 #include "player.h"
-#include "tag.h"
 #include "tagTracker.h"
 #include "os_compat.h"
 

src/stats.h

@@ -19,8 +19,6 @@
 #ifndef STATS_H
 #define STATS_H
 
-#include "../config.h"
-
 typedef struct _Stats {
 	unsigned long daemonStart;
 	int numberOfSongs;

src/storedPlaylist.c

@@ -17,10 +17,8 @@
  */
 
 #include "storedPlaylist.h"
-#include "log.h"
 #include "path.h"
 #include "utils.h"
-#include "playlist.h"
 #include "ack.h"
 #include "command.h"
 #include "ls.h"

src/storedPlaylist.h

@@ -22,7 +22,6 @@
 #include "song.h"
 #include "list.h"
 #include "playlist.h"
-#include "path.h"
 
 List *loadStoredPlaylist(int fd, const char *utf8path);
 

src/tag.c

@@ -17,17 +17,13 @@
  */
 
 #include "tag.h"
-#include "path.h"
 #include "myfprintf.h"
 #include "utils.h"
 #include "utf8.h"
 #include "log.h"
-#include "inputStream.h"
 #include "conf.h"
 #include "charConv.h"
 #include "tagTracker.h"
-#include "mpd_types.h"
-#include "gcc.h"
 #include "song.h"
 #include "os_compat.h"
 

src/tagTracker.c

@@ -18,11 +18,10 @@
 
 #include "tagTracker.h"
 
+#include "tag.h"
 #include "tree.h"
-#include "log.h"
 #include "utils.h"
 #include "myfprintf.h"
-#include "os_compat.h"
 
 static Tree *tagTrees[TAG_NUM_OF_ITEM_TYPES];
 

src/tagTracker.h

@@ -19,8 +19,6 @@
 #ifndef TAG_TRACKER_H
 #define TAG_TRACKER_H
 
-#include "tag.h"
-
 char *getTagItemString(int type, char *string);
 
 void removeTagItemString(int type, char *string);

src/utils.c

@@ -19,7 +19,8 @@
 #include "utils.h"
 #include "log.h"
 #include "conf.h"
-#include "os_compat.h"
+
+#include "../config.h"
 
 char *myFgets(char *buffer, int bufferSize, FILE * fp)
 {

src/utils.h

@@ -19,7 +19,6 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#include "../config.h"
 #include "gcc.h"
 #include "os_compat.h"
 

src/volume.c

@@ -21,11 +21,13 @@
 #include "conf.h"
 #include "log.h"
 #include "player.h"
-#include "state_file.h"
 #include "gcc.h"
 #include "utils.h"
+#include "ack.h"
 #include "os_compat.h"
 
+#include "../config.h"
+
 #ifdef HAVE_OSS
 #include <sys/soundcard.h>
 #endif

src/volume.h

@@ -19,7 +19,6 @@
 #ifndef VOLUME_H
 #define VOLUME_H
 
-#include "../config.h"
 #include "os_compat.h"
 
 #define VOLUME_MIXER_OSS	"oss"