From c6ea3652f55b9d1ab1c0c94f5f8ba0c0bca64a9d Mon Sep 17 00:00:00 2001
From: Guy Harris <gharris@sonic.net>
Date: Wed, 13 Nov 2024 13:43:25 -0800
Subject: [PATCH] Remove some apparently-unneeded includes.

Include <netinet/in.h> in pflog.h, as a case of include-what-you-use (it
needs address structures).
---
 gencode.c    |  7 -------
 grammar.y.in | 13 -------------
 pflog.h      |  4 ++++
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/gencode.c b/gencode.c
index 6a4e834b..4d5186f0 100644
--- a/gencode.c
+++ b/gencode.c
@@ -24,14 +24,7 @@
 #ifdef _WIN32
   #include <ws2tcpip.h>
 #else
-  #include <sys/socket.h>
-
-  #ifdef __NetBSD__
-    #include <sys/param.h>
-  #endif
-
   #include <netinet/in.h>
-  #include <arpa/inet.h>
 #endif /* _WIN32 */
 
 #include <stdlib.h>
diff --git a/grammar.y.in b/grammar.y.in
index 0182ae0c..578ccfb1 100644
--- a/grammar.y.in
+++ b/grammar.y.in
@@ -78,19 +78,6 @@
 
 #include <stdlib.h>
 
-#ifndef _WIN32
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif /* _WIN32 */
-
 #include <stdio.h>
 
 #include "diag-control.h"
diff --git a/pflog.h b/pflog.h
index b49d04fc..0687ae55 100644
--- a/pflog.h
+++ b/pflog.h
@@ -31,6 +31,10 @@
  * SUCH DAMAGE.
  */
 
+#ifndef _WIN32
+  #include <netinet/in.h>
+#endif
+
 /*
  * pflog headers, at least as they exist now.
  */
-- 
2.39.5