Remove unnecessary #includes

27 files changed, 6 insertions, 40 deletions

diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 18fafe348..e899af196 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 5dd780bd6..e8f303287 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 e82769902..19a759c2f 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 ea535608d..788db8459 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 7b78c24ef..f2ea63a57 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 df0ab92f5..1e41ebd72 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 7bc1a6129..1f72c1c40 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 54516f63d..acb16a831 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 06e1fe627..821149caf 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 2e5f2f92b..35c9c6a2d 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 f91c0bf92..fac3c7b2b 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 014eadfc3..27a298cfa 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 4b862f9aa..c1f760467 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 212ff3cce..eb2e84214 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 70c0122c2..393d1f7db 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 f02d31a14..3ef387b64 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 faa98b79e..75445e063 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 6459d92d4..cba20e31e 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 50d552105..8365e93ea 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 c9e6fc485..8d9ef1d0b 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 6ed80a68d..3fad82a1f 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 9ed7a6535..3524296a7 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 52d0af35e..a6ad238c9 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 ef4ef56ef..b07ad789a 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 48ccf2951..ba1d2a083 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 ad85653db..e490d56d3 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 134c007d5..82e575727 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>