Cleanup: Corrected headers used in code

src/admin.c

@@ -23,6 +23,8 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+#include "admin.h"
+#include "compat.h"
 #include "cfgfile.h"
 #include "connection.h"
 #include "refbuf.h"
@@ -30,10 +32,8 @@
 #include "source.h"
 #include "global.h"
 #include "stats.h"
-#include "compat.h"
 #include "xslt.h"
 #include "fserve.h"
-#include "admin.h"
 #include "errors.h"
 
 #include "format.h"

src/cfgfile.c

@@ -27,16 +27,13 @@
 #include <libxml/parser.h>
 
 #include "common/thread/thread.h"
+
 #include "cfgfile.h"
 #include "global.h"
-#include "refbuf.h"
-#include "client.h"
 #include "logging.h"
 #include "util.h"
 #include "auth.h"
 #include "event.h"
-#include "tls.h"
-#include "slave.h"
 
 /* for config_reread_config() */
 #include "yp.h"
@@ -44,6 +41,7 @@
 #include "stats.h"
 #include "connection.h"
 #include "main.h"
+#include "slave.h"
 
 #define CATMODULE                       "CONFIG"
 #define CONFIG_DEFAULT_LOCATION         "Earth"

src/connection.c

@@ -33,31 +33,25 @@
 #include <winsock2.h>
 #endif
 
-#include "compat.h"
-
 #include "common/thread/thread.h"
 #include "common/avl/avl.h"
 #include "common/net/sock.h"
 #include "common/httpp/httpp.h"
 
+#include "compat.h"
+#include "connection.h"
 #include "cfgfile.h"
 #include "global.h"
 #include "util.h"
-#include "connection.h"
 #include "refbuf.h"
 #include "client.h"
 #include "errors.h"
 #include "stats.h"
 #include "logging.h"
-#include "xslt.h"
 #include "fserve.h"
 #include "slave.h"
-#include "sighandler.h"
 
-#include "yp.h"
 #include "source.h"
-#include "format.h"
-#include "format_mp3.h"
 #include "admin.h"
 #include "auth.h"
 #include "matchfile.h"

src/fserve.c

@@ -47,6 +47,8 @@
 #include "common/httpp/httpp.h"
 #include "common/net/sock.h"
 
+#include "fserve.h"
+#include "compat.h"
 #include "connection.h"
 #include "global.h"
 #include "refbuf.h"
@@ -58,9 +60,6 @@
 #include "cfgfile.h"
 #include "util.h"
 #include "admin.h"
-#include "compat.h"
-
-#include "fserve.h"
 
 #undef CATMODULE
 #define CATMODULE "fserve"

src/main.c

@@ -45,7 +45,6 @@
 #endif
 
 #include "common/thread/thread.h"
-#include "common/avl/avl.h"
 #include "common/net/sock.h"
 #include "common/net/resolver.h"
 #include "common/httpp/httpp.h"

src/matchfile.c

@@ -19,10 +19,11 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "common/avl/avl.h"
+
 #include "matchfile.h"
 #include "logging.h"
 #include "util.h" /* for MAX_LINE_LEN and get_line() */
-#include "common/avl/avl.h"
 #define CATMODULE "matchfile"
 
 struct matchfile_tag {

src/source.c

@@ -42,8 +42,9 @@
 #include "common/thread/thread.h"
 #include "common/avl/avl.h"
 #include "common/httpp/httpp.h"
-#include "common/net/sock.h"
 
+#include "source.h"
+#include "compat.h"
 #include "connection.h"
 #include "global.h"
 #include "refbuf.h"
@@ -53,13 +54,10 @@
 #include "logging.h"
 #include "cfgfile.h"
 #include "util.h"
-#include "source.h"
 #include "format.h"
 #include "fserve.h"
 #include "auth.h"
 #include "event.h"
-#include "compat.h"
-#include "connection.h"
 #include "slave.h"
 #include "acl.h"
 

src/stats.c

@@ -30,14 +30,13 @@
 #include "common/httpp/httpp.h"
 #include "common/net/sock.h"
 
+#include "stats.h"
 #include "connection.h"
-
 #include "source.h"
 #include "global.h"
 #include "refbuf.h"
 #include "client.h"
 #include "admin.h"
-#include "stats.h"
 #include "xslt.h"
 #include "util.h"
 #include "auth.h"

src/util.c

@@ -41,12 +41,12 @@
 #include "common/net/sock.h"
 #include "common/thread/thread.h"
 
-#include "cfgfile.h"
+#include "util.h"
 #include "compat.h"
+#include "cfgfile.h"
 #include "refbuf.h"
 #include "connection.h"
 #include "client.h"
-#include "util.h"
 #include "source.h"
 #include "admin.h"
 

src/xslt.c

@@ -46,13 +46,10 @@
 #include "common/httpp/httpp.h"
 #include "common/net/sock.h"
 
-#include "connection.h"
+#include "xslt.h"
-
-#include "global.h"
 #include "refbuf.h"
 #include "client.h"
 #include "errors.h"
-#include "config.h"
 #include "stats.h"
 #include "fserve.h"
 #include "util.h"

src/yp.c

@@ -21,13 +21,10 @@
 
 #include "common/thread/thread.h"
 
+#include "yp.h"
 #include "global.h"
 #include "curl.h"
-#include "connection.h"
-#include "refbuf.h"
-#include "client.h"
 #include "logging.h"
-#include "format.h"
 #include "source.h"
 #include "cfgfile.h"
 #include "stats.h"

src/yp.h

@@ -14,6 +14,8 @@
 #ifndef __YP_H__
 #define __YP_H__
 
+#include "icecasttypes.h"
+
 #define  YP_SERVER_NAME         1
 #define  YP_SERVER_DESC         2
 #define  YP_SERVER_GENRE        3