Cleanup: Corrected headers used in headers

src/acl.c

@@ -16,6 +16,7 @@
 
 #include "acl.h"
 #include "admin.h"
+#include "util.h"
 
 #include <stdio.h>
 

src/acl.h

@@ -19,7 +19,6 @@
 #include "common/httpp/httpp.h"
 
 #include "icecasttypes.h"
-#include "admin.h"
 
 typedef enum acl_policy_tag {
  /* Error on function call */

src/admin.c

@@ -40,6 +40,7 @@
 
 #include "logging.h"
 #include "auth.h"
+#include "acl.h"
 #ifdef _WIN32
 #define snprintf _snprintf
 #endif

src/admin.h

@@ -16,14 +16,9 @@
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include <stdint.h>
 
 #include "icecasttypes.h"
 #include "compat.h"
-#include "refbuf.h"
-#include "client.h"
-#include "source.h"
-#include "auth.h"
 
 /* types */
 #define ADMINTYPE_ERROR   (-1)

src/auth.h

@@ -21,10 +21,11 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include "icecasttypes.h"
+
-#include "cfgfile.h"
-#include "client.h"
 #include "common/thread/thread.h"
+#include "common/httpp/httpp.h"
+
+#include "icecasttypes.h"
 
 /* implemented */
 #define AUTH_TYPE_ANONYMOUS       "anonymous"

src/auth_static.c

@@ -18,6 +18,7 @@
 #include <string.h>
 
 #include "auth.h"
+#include "cfgfile.h"
 #include "client.h"
 
 #include "logging.h"

src/client.c

@@ -42,6 +42,7 @@
 #include "logging.h"
 
 #include "util.h"
+#include "acl.h"
 
 /* for ADMIN_COMMAND_ERROR */
 #include "admin.h"

src/client.h

@@ -19,14 +19,12 @@
 #ifndef __CLIENT_H__
 #define __CLIENT_H__
 
+#include "common/httpp/httpp.h"
+#include "common/httpp/encoding.h"
+
 #include "icecasttypes.h"
 #include "errors.h"
 #include "refbuf.h"
-#include "acl.h"
-#include "cfgfile.h"
-#include "admin.h"
-#include "common/httpp/httpp.h"
-#include "common/httpp/encoding.h"
 
 #define CLIENT_DEFAULT_ADMIN_FORMAT                     ADMIN_FORMAT_TRANSFORMED
 

src/connection.c

@@ -51,6 +51,7 @@
 #include "logging.h"
 #include "xslt.h"
 #include "fserve.h"
+#include "slave.h"
 #include "sighandler.h"
 
 #include "yp.h"
@@ -61,6 +62,7 @@
 #include "auth.h"
 #include "matchfile.h"
 #include "tls.h"
+#include "acl.h"
 
 #define CATMODULE "connection"
 

src/connection.h

@@ -21,7 +21,6 @@
 
 #include "icecasttypes.h"
 #include "compat.h"
-#include "common/httpp/httpp.h"
 #include "common/thread/thread.h"
 #include "common/net/sock.h"
 

src/curl.c

@@ -11,6 +11,7 @@
 #endif
 
 #include "curl.h"
+#include "cfgfile.h"
 
 #include "logging.h"
 #define CATMODULE "curl"

src/event.c

@@ -21,6 +21,8 @@
 #include "logging.h"
 #include "admin.h"
 #include "connection.h"
+#include "client.h"
+#include "cfgfile.h"
 
 #define CATMODULE "event"
 

src/event.h

@@ -9,18 +9,13 @@
 #ifndef __EVENT_H__
 #define __EVENT_H__
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include "common/httpp/httpp.h"
 
-#include "cfgfile.h"
+#include "common/thread/thread.h"
-#include "client.h"
+
-#include "source.h"
+#include "icecasttypes.h"
 
 /* implemented */
 #define EVENT_TYPE_LOG  "log"

src/event_exec.c

@@ -22,6 +22,7 @@
 
 #include "event.h"
 #include "global.h"
+#include "source.h"
 #include "logging.h"
 #define CATMODULE "event_exec"
 

src/event_log.c

@@ -13,6 +13,8 @@
 #include <string.h>
 
 #include "event.h"
+#include "util.h"
+#include "cfgfile.h"
 #include "logging.h"
 #define CATMODULE "event_log"
 

src/event_url.c

@@ -14,6 +14,8 @@
 
 #include "curl.h"
 #include "event.h"
+#include "cfgfile.h"
+#include "util.h"
 #include "logging.h"
 #define CATMODULE "event_url"
 

src/format.h

@@ -23,6 +23,7 @@
 #include "icecasttypes.h"
 #include "client.h"
 #include "refbuf.h"
+#include "cfgfile.h"
 #include "common/httpp/httpp.h"
 
 typedef enum _format_type_tag

src/format_mp3.c

@@ -32,6 +32,7 @@
 #include "refbuf.h"
 #include "source.h"
 #include "client.h"
+#include "connection.h"
 
 #include "stats.h"
 #include "format.h"

src/fserve.h

@@ -14,7 +14,8 @@
 #define __FSERVE_H__
 
 #include <stdio.h>
-#include "cfgfile.h"
+
+#include "icecasttypes.h"
 
 typedef void (*fserve_callback_t)(client_t *, void *);
 

src/logging.c

@@ -22,13 +22,13 @@
 #include "common/thread/thread.h"
 #include "common/httpp/httpp.h"
 
+#include "logging.h"
 #include "connection.h"
 #include "refbuf.h"
 #include "client.h"
 
 #include "compat.h"
 #include "cfgfile.h"
-#include "logging.h"
 #include "util.h"
 
 #ifdef _WIN32

src/logging.h

@@ -14,10 +14,10 @@
 #ifndef __LOGGING_H__
 #define __LOGGING_H__
 
-#include "cfgfile.h"
-#include "client.h"
 #include "common/log/log.h"
 
+#include "icecasttypes.h"
+
 /* declare the global log descriptors */
 
 extern int errorlog;

src/source.c

@@ -59,6 +59,9 @@
 #include "auth.h"
 #include "event.h"
 #include "compat.h"
+#include "connection.h"
+#include "slave.h"
+#include "acl.h"
 
 #undef CATMODULE
 #define CATMODULE "source"

src/source.h

@@ -14,15 +14,16 @@
 #ifndef __SOURCE_H__
 #define __SOURCE_H__
 
+#include <stdio.h>
+
+#include "common/thread/thread.h"
+#include "common/httpp/httpp.h"
+
 #include "icecasttypes.h"
-#include "cfgfile.h"
 #include "yp.h"
 #include "util.h"
 #include "format.h"
 #include "playlist.h"
-#include "common/thread/thread.h"
-
-#include <stdio.h>
 
 struct source_tag {
     mutex_t lock;

src/stats.h

@@ -13,14 +13,13 @@
 #ifndef __STATS_H__
 #define __STATS_H__
 
-#include "cfgfile.h"
-#include "connection.h"
-#include "common/httpp/httpp.h"
-#include "client.h"
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+#include "icecasttypes.h"
+#include "cfgfile.h"
+#include "refbuf.h"
 
 typedef struct _stats_node_tag
 {

src/tls.c

@@ -14,6 +14,11 @@
 #include <config.h>
 #endif
 
+#ifdef HAVE_OPENSSL
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#endif
+
 #include <stdlib.h>
 #include <strings.h>
 

src/tls.h

@@ -9,11 +9,6 @@
 #ifndef __TLS_H__
 #define __TLS_H__
 
-#ifdef HAVE_OPENSSL
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#endif
-
 #include "common/net/sock.h"
 
 /* Do we have TLS Support? */

src/xslt.h

@@ -11,28 +11,10 @@
  */
 
 #include <libxml/xmlmemory.h>
-#include <libxml/debugXML.h>
+#include <libxml/parser.h>
-#include <libxml/HTMLtree.h>
+#include <libxml/tree.h>
-#include <libxml/xmlIO.h>
-#include <libxslt/xslt.h>
-#include <libxslt/xsltInternals.h>
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
-
-
-#include "common/thread/thread.h"
-#include "common/avl/avl.h"
-#include "common/httpp/httpp.h"
-#include "common/net/sock.h"
-
-
-#include "connection.h"
-
-#include "global.h"
-#include "refbuf.h"
-#include "client.h"
-#include "stats.h"
 
+#include "icecasttypes.h"
 
 void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client);
 void xslt_initialize(void);