Cleanup: remove duplicate includes

Remove duplicate includes of system files already pulled in by compat/types.h

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 56e6c2fafac94849286b5503847bf19bf9f84367..e9c3e1803211f19e88b6520e59a9e3faa4640267 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -114,9 +114,6 @@
 #if HAVE_LIST
 #include <list>
 #endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #if HAVE_PWD_H
 #include <pwd.h>
 #endif

diff --git a/src/eui/Eui48.cc b/src/eui/Eui48.cc
index c825ad4ae18f231a95064d43280b0ebc2995a9f4..d7d9ab7a785f1ea9375f7a7d95e2505e39661816 100644 (file)
--- a/src/eui/Eui48.cc
+++ b/src/eui/Eui48.cc
@@ -63,9 +63,6 @@ struct arpreq {
 #include <Iphlpapi.h>
 #endif
 
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif

diff --git a/src/fatal.cc b/src/fatal.cc
index 3e0af1a7365b1b0b1a7597b1bc58125efbe2d154..e6f3c74106eb128c6b9a935a20db02ba5ae2029e 100644 (file)
--- a/src/fatal.cc
+++ b/src/fatal.cc
@@ -37,9 +37,6 @@
 #if HAVE_STDIO_H
 #include <stdio.h>
 #endif
-#if HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 static void
 fatal_common(const char *message)

diff --git a/src/fd.cc b/src/fd.cc
index 29fac197e487f83a71de75a0728437b0399cabce..41f9d2ce8e9874968188b842f944ad3eb9a1566b 100644 (file)
--- a/src/fd.cc
+++ b/src/fd.cc
@@ -42,7 +42,7 @@
 
 // Solaris and possibly others lack MSG_NOSIGNAL optimization
 // TODO: move this into compat/? Use a dedicated compat file to avoid dragging
-// sys/types.h and sys/socket.h into the rest of Squid??
+// sys/socket.h into the rest of Squid??
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif

diff --git a/src/win32.h b/src/win32.h
index d222c21882460f7e98f91be8444e92582e22fe44..b32c8c5bf9f99eae1246ba15654df8cc0f0df398 100644 (file)
--- a/src/win32.h
+++ b/src/win32.h
@@ -41,12 +41,6 @@
 #if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
-#if HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 
 void WIN32_ExceptionHandlerInit(void);