include cleanup using iwyu

5 files changed, 12 insertions, 6 deletions

diff --git a/src/system/EPollFD.hxx b/src/system/EPollFD.hxx
index 41f7ec377..a6ea51d18 100644
--- a/src/system/EPollFD.hxx
+++ b/src/system/EPollFD.hxx
@@ -23,6 +23,7 @@
 #include <assert.h>
 #include <sys/epoll.h>
 #include <unistd.h>
+#include <stdint.h>
 
 #include "check.h"
 
diff --git a/src/system/Resolver.cxx b/src/system/Resolver.cxx
index 5e6ea590b..8f4f4dcda 100644
--- a/src/system/Resolver.cxx
+++ b/src/system/Resolver.cxx
@@ -27,6 +27,9 @@
 #ifndef WIN32
 #include <sys/socket.h>
 #include <netdb.h>
+#ifdef HAVE_TCP
+#include <netinet/in.h>
+#endif
 #else
 #include <ws2tcpip.h>
 #include <winsock.h>
diff --git a/src/system/Resolver.hxx b/src/system/Resolver.hxx
index 62ef455a1..ec557d1a0 100644
--- a/src/system/Resolver.hxx
+++ b/src/system/Resolver.hxx
@@ -27,8 +27,9 @@
 struct sockaddr;
 struct addrinfo;
 class Error;
+class Domain;
 
-extern const class Domain resolver_domain;
+extern const Domain resolver_domain;
 
 /**
  * Converts the specified socket address into a string in the form
@@ -42,7 +43,7 @@ extern const class Domain resolver_domain;
  */
 gcc_malloc
 char *
-sockaddr_to_string(const struct sockaddr *sa, size_t length, Error &error);
+sockaddr_to_string(const sockaddr *sa, size_t length, Error &error);
 
 /**
  * Resolve a specification in the form "host", "host:port",
@@ -54,7 +55,7 @@ sockaddr_to_string(const struct sockaddr *sa, size_t length, Error &error);
  * @return an #addrinfo linked list that must be freed with
  * freeaddrinfo(), or NULL on error
  */
-struct addrinfo *
+addrinfo *
 resolve_host_port(const char *host_port, unsigned default_port,
 		  int flags, int socktype,
 		  Error &error);
diff --git a/src/system/SignalFD.cxx b/src/system/SignalFD.cxx
index b89775dcd..d5953056d 100644
--- a/src/system/SignalFD.cxx
+++ b/src/system/SignalFD.cxx
@@ -20,7 +20,6 @@
 #include "config.h"
 #ifdef USE_SIGNALFD
 #include "SignalFD.hxx"
-#include "fd_util.h"
 #include "FatalError.hxx"
 
 #include <assert.h>
diff --git a/src/system/SocketError.hxx b/src/system/SocketError.hxx
index 22fbd2441..28e1bace0 100644
--- a/src/system/SocketError.hxx
+++ b/src/system/SocketError.hxx
@@ -21,7 +21,7 @@
 #define MPD_SOCKET_ERROR_HXX
 
 #include "Compiler.h"
-#include "util/Error.hxx"
+#include "util/Error.hxx" // IWYU pragma: export
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -31,11 +31,13 @@ typedef DWORD socket_error_t;
 typedef int socket_error_t;
 #endif
 
+class Domain;
+
 /**
  * A #Domain for #Error for socket I/O errors.  The code is an errno
  * value (or WSAGetLastError() on Windows).
  */
-extern const class Domain socket_domain;
+extern const Domain socket_domain;
 
 gcc_pure
 static inline socket_error_t