From ca68b1c80a29cb4862c6b732b339a5cbcfcecf51 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 8 Oct 2008 10:49:26 +0200
Subject: [PATCH] CPP include cleanup

Include only headers which are really used.
---
 src/log.h          | 2 --
 src/playerData.c   | 4 ++--
 src/song.h         | 3 ---
 src/tag_internal.h | 2 ++
 src/utf8.h         | 1 -
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/log.h b/src/log.h
index 4026df282..734c4756c 100644
--- a/src/log.h
+++ b/src/log.h
@@ -19,9 +19,7 @@
 #ifndef LOG_H
 #define LOG_H
 
-#include "../config.h"
 #include "gcc.h"
-#include "os_compat.h"
 
 #define LOG_LEVEL_LOW		0
 #define LOG_LEVEL_SECURE	1
diff --git a/src/playerData.c b/src/playerData.c
index 948c59570..fd87843ab 100644
--- a/src/playerData.c
+++ b/src/playerData.c
@@ -17,11 +17,11 @@
  */
 
 #include "playerData.h"
-#include "player_control.h"
 #include "outputBuffer.h"
 #include "conf.h"
 #include "log.h"
-#include "utils.h"
+
+#include <stdlib.h>
 
 #define DEFAULT_BUFFER_SIZE         2048
 #define DEFAULT_BUFFER_BEFORE_PLAY  10
diff --git a/src/song.h b/src/song.h
index 658921324..72262eeec 100644
--- a/src/song.h
+++ b/src/song.h
@@ -20,7 +20,6 @@
 #define SONG_H
 
 #include "os_compat.h"
-#include "gcc.h"
 
 #define SONG_BEGIN	"songList begin"
 #define SONG_END	"songList end"
@@ -28,8 +27,6 @@
 #define SONG_FILE	"file: "
 #define SONG_TIME	"Time: "
 
-struct client;
-
 struct song {
 	struct tag *tag;
 	struct directory *parentDir;
diff --git a/src/tag_internal.h b/src/tag_internal.h
index eed3e0793..8cb0bfe11 100644
--- a/src/tag_internal.h
+++ b/src/tag_internal.h
@@ -19,6 +19,8 @@
 #ifndef TAG_INTERNAL_H
 #define TAG_INTERNAL_H
 
+#include <stdint.h>
+
 extern int8_t ignoreTagItems[TAG_NUM_OF_ITEM_TYPES];
 
 #endif
diff --git a/src/utf8.h b/src/utf8.h
index 353977bef..6203aa611 100644
--- a/src/utf8.h
+++ b/src/utf8.h
@@ -31,5 +31,4 @@ char *utf8_to_latin1(char *dest, const char *utf8);
 
 char *latin1_to_utf8(char *dest, const char *utf8);
 
-
 #endif