diff --git a/bpf/net/bpf_filter.c b/bpf/net/bpf_filter.c
index 7be384f59d..0ff31f9d46 100644
--- a/bpf/net/bpf_filter.c
+++ b/bpf/net/bpf_filter.c
@@ -39,7 +39,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/bpf_dump.c b/bpf_dump.c
index d5ab61e5e8..b59d60738f 100644
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <pcap.h>
diff --git a/bpf_image.c b/bpf_image.c
index 01ec536dfd..ec659dc1b2 100644
--- a/bpf_image.c
+++ b/bpf_image.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/dlpisubs.c b/dlpisubs.c
index f6022c67ab..cd85a40403 100644
--- a/dlpisubs.c
+++ b/dlpisubs.c
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifndef DL_IPATM
diff --git a/etherent.c b/etherent.c
index 5cfd1b4c3b..441920d60b 100644
--- a/etherent.c
+++ b/etherent.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/fad-getad.c b/fad-getad.c
index 6a012196e1..c2c3e43db7 100644
--- a/fad-getad.c
+++ b/fad-getad.c
@@ -33,7 +33,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/fad-gifc.c b/fad-gifc.c
index fe7ae6d893..3e5ec3df46 100644
--- a/fad-gifc.c
+++ b/fad-gifc.c
@@ -33,7 +33,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>
diff --git a/fad-glifc.c b/fad-glifc.c
index b0cb2a8519..e89279e965 100644
--- a/fad-glifc.c
+++ b/fad-glifc.c
@@ -33,7 +33,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>
diff --git a/gencode.c b/gencode.c
index d284981425..49011de219 100644
--- a/gencode.c
+++ b/gencode.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/grammar.y b/grammar.y
index 8e1d40a7ce..b7c90abb75 100644
--- a/grammar.y
+++ b/grammar.y
@@ -47,7 +47,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/inet.c b/inet.c
index 34da782f66..ef20bb4b61 100644
--- a/inet.c
+++ b/inet.c
@@ -33,7 +33,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/missing/strtok_r.c b/missing/strtok_r.c
index c9c94b95d8..5fca2f3d36 100644
--- a/missing/strtok_r.c
+++ b/missing/strtok_r.c
@@ -35,7 +35,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "portability.h"
diff --git a/nametoaddr.c b/nametoaddr.c
index 71280b31c4..0f55341a3b 100644
--- a/nametoaddr.c
+++ b/nametoaddr.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef DECNETLIB
diff --git a/optimize.c b/optimize.c
index 19980dc81d..21c9cd97b1 100644
--- a/optimize.c
+++ b/optimize.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/pcap-bpf.c b/pcap-bpf.c
index 7286d884ed..0bd1b08d96 100644
--- a/pcap-bpf.c
+++ b/pcap-bpf.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>			/* optionally get BSD define */
diff --git a/pcap-bt-linux.c b/pcap-bt-linux.c
index ac5e529b98..2486bf239e 100644
--- a/pcap-bt-linux.c
+++ b/pcap-bt-linux.c
@@ -33,7 +33,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "pcap-int.h"
diff --git a/pcap-bt-monitor-linux.c b/pcap-bt-monitor-linux.c
index 6c016a7ed7..8dd9b42ea0 100644
--- a/pcap-bt-monitor-linux.c
+++ b/pcap-bt-monitor-linux.c
@@ -30,7 +30,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/pcap-common.c b/pcap-common.c
index 6e1940042d..281203c76f 100644
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/pcap-dag.c b/pcap-dag.c
index 3f68cd6cee..03fdc6d809 100644
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>			/* optionally get BSD define */
diff --git a/pcap-dbus.c b/pcap-dbus.c
index 2fedaeff94..b1fb548ff4 100644
--- a/pcap-dbus.c
+++ b/pcap-dbus.c
@@ -29,7 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>
diff --git a/pcap-dlpi.c b/pcap-dlpi.c
index 08ad6cb10b..6c6e0ca78c 100644
--- a/pcap-dlpi.c
+++ b/pcap-dlpi.c
@@ -69,7 +69,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/pcap-enet.c b/pcap-enet.c
index 777d3e3a81..cd8cdbbb78 100644
--- a/pcap-enet.c
+++ b/pcap-enet.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/pcap-libdlpi.c b/pcap-libdlpi.c
index 21ee11e854..097dd51815 100644
--- a/pcap-libdlpi.c
+++ b/pcap-libdlpi.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/pcap-linux.c b/pcap-linux.c
index 34b08c01e8..ee4901c7d9 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -113,7 +113,7 @@
 #define _GNU_SOURCE
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c
index b8c4f0d2fd..a53cc37e0a 100644
--- a/pcap-netfilter-linux.c
+++ b/pcap-netfilter-linux.c
@@ -29,7 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "pcap-int.h"
diff --git a/pcap-netmap.c b/pcap-netmap.c
index 7c6401d35f..29995d8f8c 100644
--- a/pcap-netmap.c
+++ b/pcap-netmap.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <poll.h>
diff --git a/pcap-new.c b/pcap-new.c
index fcf5f6ff76..5b8c2be4dc 100644
--- a/pcap-new.c
+++ b/pcap-new.c
@@ -32,7 +32,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "pcap-int.h"	// for the details of the pcap_t structure
diff --git a/pcap-nit.c b/pcap-nit.c
index bb5fef7758..4d8f1a79a7 100644
--- a/pcap-nit.c
+++ b/pcap-nit.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/pcap-null.c b/pcap-null.c
index 887e218053..2334b9464f 100644
--- a/pcap-null.c
+++ b/pcap-null.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>			/* optionally get BSD define */
diff --git a/pcap-pf.c b/pcap-pf.c
index 6f1827c7d3..eb2baa12d0 100644
--- a/pcap-pf.c
+++ b/pcap-pf.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/pcap-rpcap.c b/pcap-rpcap.c
index d37d44f7ab..44ecf9f048 100644
--- a/pcap-rpcap.c
+++ b/pcap-rpcap.c
@@ -32,7 +32,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>		/* for strlen(), ... */
diff --git a/pcap-septel.c b/pcap-septel.c
index d97bc3ee7c..8f8bcb2766 100644
--- a/pcap-septel.c
+++ b/pcap-septel.c
@@ -15,7 +15,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>
diff --git a/pcap-sita.c b/pcap-sita.c
index 2a18400da6..6bb82ef9ae 100644
--- a/pcap-sita.c
+++ b/pcap-sita.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/pcap-snf.c b/pcap-snf.c
index aa661a47a0..906e59eecd 100644
--- a/pcap-snf.c
+++ b/pcap-snf.c
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/pcap-snit.c b/pcap-snit.c
index 234285f501..ef2cac02f9 100644
--- a/pcap-snit.c
+++ b/pcap-snit.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/pcap-snoop.c b/pcap-snoop.c
index 0872080504..76c2b857cd 100644
--- a/pcap-snoop.c
+++ b/pcap-snoop.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <sys/param.h>
diff --git a/pcap-tc.c b/pcap-tc.c
index a4cde6c0d1..fda16e179b 100644
--- a/pcap-tc.c
+++ b/pcap-tc.c
@@ -30,7 +30,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <pcap.h>
diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index 114fc401a2..c11bae947f 100644
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -34,7 +34,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "pcap-int.h"
diff --git a/pcap.c b/pcap.c
index b9ec322e98..643b909dc1 100644
--- a/pcap.c
+++ b/pcap.c
@@ -32,7 +32,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/rpcapd/daemon.c b/rpcapd/daemon.c
index 6a4faf4bd5..04b93bbe78 100755
--- a/rpcapd/daemon.c
+++ b/rpcapd/daemon.c
@@ -30,7 +30,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "ftmacros.h"
diff --git a/rpcapd/fileconf.c b/rpcapd/fileconf.c
index 701dd85c9a..afc9fa37a8 100755
--- a/rpcapd/fileconf.c
+++ b/rpcapd/fileconf.c
@@ -32,7 +32,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "ftmacros.h"
diff --git a/rpcapd/rpcapd.c b/rpcapd/rpcapd.c
index d00204ab37..0e6e47c30b 100755
--- a/rpcapd/rpcapd.c
+++ b/rpcapd/rpcapd.c
@@ -31,7 +31,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/savefile.c b/savefile.c
index f63b45b30f..695d7a20a8 100644
--- a/savefile.c
+++ b/savefile.c
@@ -29,7 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/scanner.l b/scanner.l
index 3bdf9c4562..346eb0708d 100644
--- a/scanner.l
+++ b/scanner.l
@@ -1,7 +1,7 @@
 %top {
 /* Must come first for _LARGE_FILE_API on AIX. */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 }
 
diff --git a/sf-pcap-ng.c b/sf-pcap-ng.c
index b81f9875de..768e96b780 100644
--- a/sf-pcap-ng.c
+++ b/sf-pcap-ng.c
@@ -22,7 +22,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/sf-pcap.c b/sf-pcap.c
index 67929c0f35..d83bb10405 100644
--- a/sf-pcap.c
+++ b/sf-pcap.c
@@ -29,7 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/sockutils.c b/sockutils.c
index 33e2cc6c7c..b3806b5ff9 100644
--- a/sockutils.c
+++ b/sockutils.c
@@ -31,7 +31,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 /*
diff --git a/tests/filtertest.c b/tests/filtertest.c
index e9a74c6ccf..314cc7ae31 100644
--- a/tests/filtertest.c
+++ b/tests/filtertest.c
@@ -26,7 +26,7 @@ The Regents of the University of California.  All rights reserved.\n";
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <pcap.h>
diff --git a/tests/findalldevstest.c b/tests/findalldevstest.c
index 88bc349687..2d4086205c 100644
--- a/tests/findalldevstest.c
+++ b/tests/findalldevstest.c
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/tests/valgrindtest.c b/tests/valgrindtest.c
index 86bef7decc..9d9e9a29e0 100644
--- a/tests/valgrindtest.c
+++ b/tests/valgrindtest.c
@@ -50,7 +50,7 @@ The Regents of the University of California.  All rights reserved.\n";
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <stdio.h>