The sys/types.h header is brought in via the generic_types.h header. Adjust accordingly.

httperf/src/conn.c

@@ -39,10 +39,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
+#include <generic_types.h>
 #include <event.h>
 
-#include <generic_types.h>
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/core.c

@@ -44,18 +44,18 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <sys/types.h>
-#include <sys/resource.h>	/* grrr, must come after sys/types.h for BSD */
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#include <event.h>
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
 #include <generic_types.h>
+#include <sys/resource.h>	/* after sys/types.h for BSD (in generic_types.h) */
+#include <event.h>
+
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/gen/call_seq.c

@@ -38,9 +38,10 @@
 
 #include <assert.h>
 #include <sys/types.h>
-#include <event.h>
 
 #include <generic_types.h>
+#include <event.h>
+
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/gen/conn_rate.c

@@ -39,10 +39,10 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <event.h>
 
 #include <generic_types.h>
+#include <event.h>
+
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/gen/sess_cookie.c

@@ -49,10 +49,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
+#include <generic_types.h>
 #include <event.h>
 
-#include <generic_types.h>
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/gen/uri_wlog.c

@@ -75,11 +75,11 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
-#include <event.h>
 
 #include <generic_types.h>
+#include <event.h>
+
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/gen/wsess.c

@@ -42,10 +42,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <event.h>
 
 #include <generic_types.h>
+#include <event.h>
+
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/gen/wsesslog.c

@@ -81,10 +81,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <event.h>
 
 #include <generic_types.h>
+#include <event.h>
+
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/gen/wsesspage.c

@@ -47,10 +47,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <event.h>
 
 #include <generic_types.h>
+#include <event.h>
+
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/http.c

@@ -41,10 +41,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
+#include <generic_types.h>
 #include <event.h>
 
-#include <generic_types.h>
+
 #include <object.h>
 #include <timer.h>
 #include <call.h>

httperf/src/httperf.c

@@ -70,13 +70,11 @@
 #endif
 
 #include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-
-/* LIBEVENT */
-#include <event.h>
 
 #include <generic_types.h>
+#include <sys/resource.h>	/* after sys/types.h for BSD (in generic_types.h) */
+#include <event.h>
+
 #include <object.h>
 #include <timer.h>
 #include <conn.h>

httperf/src/idleconn.c

@@ -34,19 +34,17 @@
 #include <stdlib.h>
 #include <string.h>		/* For strrchr() */
 #include <signal.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 #include <inttypes.h>
-
 #include <sys/time.h>
-#include <sys/types.h>
+
+#include <generic_types.h>
 #include <event.h>
 #include <evdns.h>
 
-#include <generic_types.h>
 #include <list.h>
 
 /*

httperf/src/lib/ssl_writev.c

@@ -61,7 +61,7 @@ char *alloca ();
 
 #include <string.h>
 
-#include <sys/types.h>
+#include <generic_types.h>
 #include <sys/uio.h>
 
 #include <openssl/rsa.h>

httperf/src/object.c

@@ -40,10 +40,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
+#include <generic_types.h>
 #include <event.h>
 
-#include <generic_types.h>
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/sess.h

@@ -35,11 +35,6 @@
 #ifndef sess_h
 #define sess_h
 
-#include <sys/types.h>
-
-#include <httperf.h>
-#include <object.h>
-
 #ifdef HAVE_SSL
 # include <openssl/ssl.h>
 #endif

httperf/src/stat/basic.c

@@ -40,11 +40,11 @@
 #include <errno.h>
 #include <float.h>
 #include <stdio.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <event.h>
 
 #include <generic_types.h>
+#include <sys/resource.h>
+#include <event.h>
+
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/stat/print_reply.c

@@ -42,10 +42,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
+#include <generic_types.h>
 #include <event.h>
 
-#include <generic_types.h>
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>

httperf/src/stat/sess_stat.c

@@ -42,10 +42,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/types.h>
+#include <generic_types.h>
 #include <event.h>
 
-#include <generic_types.h>
 #include <object.h>
 #include <timer.h>
 #include <httperf.h>