From dd9265ac78b56c378bc7ca47920be9d9d93392b7 Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Mon, 13 Jun 2011 15:04:33 +0200
Subject: Remove unnecessary #includes

---
 src/pulse/client-conf.c        | 1 -
 src/pulse/context.c            | 7 -------
 src/pulse/error.c              | 6 +-----
 src/pulse/error.h              | 1 -
 src/pulse/ext-device-manager.c | 1 -
 src/pulse/ext-device-manager.h | 1 +
 src/pulse/ext-stream-restore.c | 1 -
 src/pulse/ext-stream-restore.h | 1 +
 src/pulse/format.h             | 1 +
 src/pulse/glib-mainloop.c      | 1 -
 src/pulse/i18n.h               | 1 -
 src/pulse/introspect.c         | 3 ---
 src/pulse/mainloop-api.c       | 1 -
 src/pulse/mainloop-api.h       | 1 -
 src/pulse/mainloop-signal.c    | 2 --
 src/pulse/mainloop.c           | 2 --
 src/pulse/proplist.c           | 1 -
 src/pulse/rtclock.h            | 3 +--
 src/pulse/sample.c             | 1 -
 src/pulse/sample.h             | 1 -
 src/pulse/scache.c             | 1 -
 src/pulse/simple.c             | 1 -
 src/pulse/subscribe.c          | 2 --
 src/pulse/thread-mainloop.c    | 1 -
 src/pulse/util.c               | 2 --
 src/pulse/util.h               | 1 -
 src/pulse/volume.c             | 1 +
 27 files changed, 6 insertions(+), 40 deletions(-)

(limited to 'src/pulse')

diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 18fafe34..e899af19 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <string.h>
 
 #include <pulse/xmalloc.h>
 #include <pulse/i18n.h>
diff --git a/src/pulse/context.c b/src/pulse/context.c
index 5dd780bd..e8f30328 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -32,23 +32,17 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <signal.h>
-#include <limits.h>
-#include <locale.h>
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
 
-#ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 
 #include <pulse/version.h>
 #include <pulse/xmalloc.h>
-#include <pulse/utf8.h>
 #include <pulse/util.h>
 #include <pulse/i18n.h>
 #include <pulse/mainloop.h>
@@ -70,7 +64,6 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
 #include <pulsecore/socket.h>
-#include <pulsecore/socket-util.h>
 #include <pulsecore/creds.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/proplist-util.h>
diff --git a/src/pulse/error.c b/src/pulse/error.c
index e8276990..19a759c2 100644
--- a/src/pulse/error.c
+++ b/src/pulse/error.c
@@ -27,14 +27,10 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
-#include <pulse/xmalloc.h>
+#include <pulse/def.h>
 #include <pulse/i18n.h>
 
-#include <pulsecore/core-util.h>
-#include <pulsecore/native-common.h>
-
 #include "error.h"
 
 const char*pa_strerror(int error) {
diff --git a/src/pulse/error.h b/src/pulse/error.h
index ea535608..788db845 100644
--- a/src/pulse/error.h
+++ b/src/pulse/error.h
@@ -23,7 +23,6 @@
   USA.
 ***/
 
-#include <inttypes.h>
 #include <pulse/cdecl.h>
 #include <pulse/version.h>
 
diff --git a/src/pulse/ext-device-manager.c b/src/pulse/ext-device-manager.c
index 7b78c24e..f2ea63a5 100644
--- a/src/pulse/ext-device-manager.c
+++ b/src/pulse/ext-device-manager.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <pulse/context.h>
-#include <pulse/gccmacro.h>
 #include <pulse/xmalloc.h>
 #include <pulse/fork-detect.h>
 #include <pulse/operation.h>
diff --git a/src/pulse/ext-device-manager.h b/src/pulse/ext-device-manager.h
index df0ab92f..1e41ebd7 100644
--- a/src/pulse/ext-device-manager.h
+++ b/src/pulse/ext-device-manager.h
@@ -23,6 +23,7 @@
   USA.
 ***/
 
+#include <pulse/cdecl.h>
 #include <pulse/context.h>
 #include <pulse/version.h>
 
diff --git a/src/pulse/ext-stream-restore.c b/src/pulse/ext-stream-restore.c
index 7bc1a612..1f72c1c4 100644
--- a/src/pulse/ext-stream-restore.c
+++ b/src/pulse/ext-stream-restore.c
@@ -24,7 +24,6 @@
 #endif
 
 #include <pulse/context.h>
-#include <pulse/gccmacro.h>
 #include <pulse/fork-detect.h>
 #include <pulse/operation.h>
 
diff --git a/src/pulse/ext-stream-restore.h b/src/pulse/ext-stream-restore.h
index 54516f63..acb16a83 100644
--- a/src/pulse/ext-stream-restore.h
+++ b/src/pulse/ext-stream-restore.h
@@ -22,6 +22,7 @@
   USA.
 ***/
 
+#include <pulse/cdecl.h>
 #include <pulse/context.h>
 #include <pulse/version.h>
 #include <pulse/volume.h>
diff --git a/src/pulse/format.h b/src/pulse/format.h
index 06e1fe62..821149ca 100644
--- a/src/pulse/format.h
+++ b/src/pulse/format.h
@@ -25,6 +25,7 @@
 ***/
 
 #include <pulse/cdecl.h>
+#include <pulse/gccmacro.h>
 #include <pulse/proplist.h>
 #include <pulse/sample.h>
 #include <pulse/channelmap.h>
diff --git a/src/pulse/glib-mainloop.c b/src/pulse/glib-mainloop.c
index 2e5f2f92..35c9c6a2 100644
--- a/src/pulse/glib-mainloop.c
+++ b/src/pulse/glib-mainloop.c
@@ -26,7 +26,6 @@
 #include <pulse/xmalloc.h>
 #include <pulse/timeval.h>
 
-#include <pulsecore/idxset.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
 #include <pulsecore/llist.h>
diff --git a/src/pulse/i18n.h b/src/pulse/i18n.h
index f91c0bf9..fac3c7b2 100644
--- a/src/pulse/i18n.h
+++ b/src/pulse/i18n.h
@@ -23,7 +23,6 @@
 ***/
 
 #include <pulse/cdecl.h>
-#include <pulse/gccmacro.h>
 #include <pulse/version.h>
 
 PA_C_DECL_BEGIN
diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c
index 014eadfc..27a298cf 100644
--- a/src/pulse/introspect.c
+++ b/src/pulse/introspect.c
@@ -24,10 +24,7 @@
 #include <config.h>
 #endif
 
-#include <string.h>
-
 #include <pulse/context.h>
-#include <pulse/gccmacro.h>
 #include <pulse/xmalloc.h>
 #include <pulse/fork-detect.h>
 
diff --git a/src/pulse/mainloop-api.c b/src/pulse/mainloop-api.c
index 4b862f9a..c1f76046 100644
--- a/src/pulse/mainloop-api.c
+++ b/src/pulse/mainloop-api.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 
 #include <pulse/xmalloc.h>
-#include <pulse/gccmacro.h>
 #include <pulse/i18n.h>
 
 #include <pulsecore/macro.h>
diff --git a/src/pulse/mainloop-api.h b/src/pulse/mainloop-api.h
index 212ff3cc..eb2e8421 100644
--- a/src/pulse/mainloop-api.h
+++ b/src/pulse/mainloop-api.h
@@ -26,7 +26,6 @@
 #include <sys/time.h>
 
 #include <pulse/cdecl.h>
-#include <pulse/sample.h>
 #include <pulse/version.h>
 
 /** \file
diff --git a/src/pulse/mainloop-signal.c b/src/pulse/mainloop-signal.c
index 70c0122c..393d1f7d 100644
--- a/src/pulse/mainloop-signal.c
+++ b/src/pulse/mainloop-signal.c
@@ -30,14 +30,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
 #endif
 
 #include <pulse/xmalloc.h>
-#include <pulse/gccmacro.h>
 #include <pulse/i18n.h>
 
 #include <pulsecore/core-error.h>
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index f02d31a1..3ef387b6 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -25,10 +25,8 @@
 #endif
 
 #include <stdio.h>
-#include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
 #include <fcntl.h>
 #include <errno.h>
 
diff --git a/src/pulse/proplist.c b/src/pulse/proplist.c
index faa98b79..75445e06 100644
--- a/src/pulse/proplist.c
+++ b/src/pulse/proplist.c
@@ -28,7 +28,6 @@
 
 #include <pulse/xmalloc.h>
 #include <pulse/utf8.h>
-#include <pulse/i18n.h>
 
 #include <pulsecore/hashmap.h>
 #include <pulsecore/strbuf.h>
diff --git a/src/pulse/rtclock.h b/src/pulse/rtclock.h
index 6459d92d..cba20e31 100644
--- a/src/pulse/rtclock.h
+++ b/src/pulse/rtclock.h
@@ -23,8 +23,7 @@
 ***/
 
 #include <pulse/cdecl.h>
-#include <pulse/def.h>
-#include <pulse/gccmacro.h>
+#include <pulse/sample.h>
 
 /** \file
  *  Monotonic clock utilities. */
diff --git a/src/pulse/sample.c b/src/pulse/sample.c
index 50d55210..8365e93e 100644
--- a/src/pulse/sample.c
+++ b/src/pulse/sample.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <stdio.h>
-#include <math.h>
 #include <string.h>
 
 #include <pulse/timeval.h>
diff --git a/src/pulse/sample.h b/src/pulse/sample.h
index c9e6fc48..8d9ef1d0 100644
--- a/src/pulse/sample.h
+++ b/src/pulse/sample.h
@@ -26,7 +26,6 @@
 #include <inttypes.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <math.h>
 
 #include <pulse/gccmacro.h>
 #include <pulse/cdecl.h>
diff --git a/src/pulse/scache.c b/src/pulse/scache.c
index 6ed80a68..3fad82a1 100644
--- a/src/pulse/scache.c
+++ b/src/pulse/scache.c
@@ -25,7 +25,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 
 #include <pulse/utf8.h>
 #include <pulse/fork-detect.h>
diff --git a/src/pulse/simple.c b/src/pulse/simple.c
index 9ed7a653..3524296a 100644
--- a/src/pulse/simple.c
+++ b/src/pulse/simple.c
@@ -32,7 +32,6 @@
 #include <pulse/thread-mainloop.h>
 #include <pulse/xmalloc.h>
 
-#include <pulsecore/native-common.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 
diff --git a/src/pulse/subscribe.c b/src/pulse/subscribe.c
index 52d0af35..a6ad238c 100644
--- a/src/pulse/subscribe.c
+++ b/src/pulse/subscribe.c
@@ -25,8 +25,6 @@
 
 #include <stdio.h>
 
-#include <pulse/gccmacro.h>
-
 #include <pulsecore/macro.h>
 #include <pulsecore/pstream-util.h>
 
diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
index ef4ef56e..b07ad789 100644
--- a/src/pulse/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -36,7 +36,6 @@
 #include <pulse/i18n.h>
 
 #include <pulsecore/log.h>
-#include <pulsecore/hashmap.h>
 #include <pulsecore/thread.h>
 #include <pulsecore/mutex.h>
 #include <pulsecore/macro.h>
diff --git a/src/pulse/util.c b/src/pulse/util.c
index 48ccf295..ba1d2a08 100644
--- a/src/pulse/util.c
+++ b/src/pulse/util.c
@@ -58,8 +58,6 @@
 #include <pulse/timeval.h>
 
 #include <pulsecore/socket.h>
-#include <pulsecore/core-error.h>
-#include <pulsecore/log.h>
 #include <pulsecore/core-util.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/usergroup.h>
diff --git a/src/pulse/util.h b/src/pulse/util.h
index ad85653d..e490d56d 100644
--- a/src/pulse/util.h
+++ b/src/pulse/util.h
@@ -26,7 +26,6 @@
 #include <stddef.h>
 
 #include <pulse/cdecl.h>
-#include <pulse/gccmacro.h>
 #include <pulse/version.h>
 
 /** \file
diff --git a/src/pulse/volume.c b/src/pulse/volume.c
index 134c007d..82e57572 100644
--- a/src/pulse/volume.c
+++ b/src/pulse/volume.c
@@ -25,6 +25,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <math.h>
 
 #include <pulse/i18n.h>
 
-- 
cgit