We always HAVE_CONFIG_H so don't bother checking whether we have it or not.

svn path=/trunk/; revision=45015

50 files changed, 0 insertions, 100 deletions

diff --git a/wiretap/5views.c b/wiretap/5views.c
index 834deb519a..f746c45548 100644
--- a/wiretap/5views.c
+++ b/wiretap/5views.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include <time.h>
diff --git a/wiretap/aethra.c b/wiretap/aethra.c
index e4ab651f3c..0f83be815e 100644
--- a/wiretap/aethra.c
+++ b/wiretap/aethra.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include "wtap-int.h"
diff --git a/wiretap/ascendtext.c b/wiretap/ascendtext.c
index 385d28b085..0907bca42d 100644
--- a/wiretap/ascendtext.c
+++ b/wiretap/ascendtext.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "ascendtext.h"
diff --git a/wiretap/atm.c b/wiretap/atm.c
index fa6ae88d93..97d406bdfa 100644
--- a/wiretap/atm.c
+++ b/wiretap/atm.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "atm.h"
 
diff --git a/wiretap/ber.c b/wiretap/ber.c
index f08293faa7..22a1336877 100644
--- a/wiretap/ber.c
+++ b/wiretap/ber.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c
index 9bf453fe9e..c23bf2cc1e 100644
--- a/wiretap/btsnoop.c
+++ b/wiretap/btsnoop.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include "wtap-int.h"
diff --git a/wiretap/buffer.c b/wiretap/buffer.c
index 865a74ab87..e6df387af1 100644
--- a/wiretap/buffer.c
+++ b/wiretap/buffer.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c
index a01c5d0584..9fbf23bead 100644
--- a/wiretap/catapult_dct2000.c
+++ b/wiretap/catapult_dct2000.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/wiretap/commview.c b/wiretap/commview.c
index 61364eaa69..fb97f3d2eb 100644
--- a/wiretap/commview.c
+++ b/wiretap/commview.c
@@ -30,9 +30,7 @@
  *    http://www.tamos.com/htmlhelp/commview/logformat.htm
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 #include <stdio.h>
diff --git a/wiretap/cosine.c b/wiretap/cosine.c
index 3e590291a1..ebd11709b2 100644
--- a/wiretap/cosine.c
+++ b/wiretap/cosine.c
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "cosine.h"
diff --git a/wiretap/csids.c b/wiretap/csids.c
index 8f330cf9e8..b8d24a83b1 100644
--- a/wiretap/csids.c
+++ b/wiretap/csids.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "csids.h"
diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c
index e0b6b0fd8b..c6c51b351f 100644
--- a/wiretap/daintree-sna.c
+++ b/wiretap/daintree-sna.c
@@ -46,9 +46,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 #include <stdio.h>
diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c
index 54719767e1..867bb40221 100644
--- a/wiretap/dbs-etherwatch.c
+++ b/wiretap/dbs-etherwatch.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "dbs-etherwatch.h"
diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c
index 5eec026bc4..ac58b5785f 100644
--- a/wiretap/dct3trace.c
+++ b/wiretap/dct3trace.c
@@ -26,9 +26,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "dct3trace.h"
diff --git a/wiretap/erf.c b/wiretap/erf.c
index 9e431f3020..fdb0f23fbf 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -42,9 +42,7 @@
  *      http://www.endace.com/support/EndaceRecordFormat.pdf
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c
index 6c4f976c45..6c5c78a82e 100644
--- a/wiretap/eyesdn.c
+++ b/wiretap/eyesdn.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "eyesdn.h"
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index ddbfe1a082..1850405bd1 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
index f4d83d96b6..7e89bb6fbd 100644
--- a/wiretap/file_wrappers.c
+++ b/wiretap/file_wrappers.c
@@ -41,9 +41,7 @@
  *  3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/wiretap/hcidump.c b/wiretap/hcidump.c
index 5454514906..cf7ca8df90 100644
--- a/wiretap/hcidump.c
+++ b/wiretap/hcidump.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c
index b87cd8211f..647ce51d62 100644
--- a/wiretap/i4btrace.c
+++ b/wiretap/i4btrace.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <errno.h>
diff --git a/wiretap/ipfix.c b/wiretap/ipfix.c
index 473b8eebab..2d7d0d3f68 100644
--- a/wiretap/ipfix.c
+++ b/wiretap/ipfix.c
@@ -60,9 +60,7 @@
  * as far as the dissector is concerned.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c
index 58834a0af9..ee343aa3e6 100644
--- a/wiretap/iptrace.c
+++ b/wiretap/iptrace.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
diff --git a/wiretap/iseries.c b/wiretap/iseries.c
index 3aa697e46c..3dea66fd7f 100644
--- a/wiretap/iseries.c
+++ b/wiretap/iseries.c
@@ -131,9 +131,7 @@ Number  S/R  Length    Timer                        MAC Address   MAC Address
                            A00216D06A200000 020405B40402080A  1104B6C000000000 010303000B443BF1   **..*J .....*......**.........D;**
 */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "iseries.h"
diff --git a/wiretap/k12.c b/wiretap/k12.c
index a78eba0b87..c33a43b626 100644
--- a/wiretap/k12.c
+++ b/wiretap/k12.c
@@ -25,9 +25,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index abde1abcf6..e699615d76 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <stdlib.h>
 #include <errno.h>
 #include "wtap-int.h"
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 08cf091ce2..bec6cf6435 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/wiretap/mime_file.c b/wiretap/mime_file.c
index 510d98ef77..16ba58a751 100644
--- a/wiretap/mime_file.c
+++ b/wiretap/mime_file.c
@@ -29,9 +29,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/wiretap/mp2t.c b/wiretap/mp2t.c
index 749dc6ba2a..aa31ee2f1b 100644
--- a/wiretap/mp2t.c
+++ b/wiretap/mp2t.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c
index f42dc65b4c..8eec67974b 100644
--- a/wiretap/mpeg.c
+++ b/wiretap/mpeg.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 9977d40f4d..436a6d95fd 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include "wtap-int.h"
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index 1902f8406a..d0765ae49b 100644
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include "wtap-int.h"
diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c
index 24e033c3c2..8eb1843fe9 100644
--- a/wiretap/netscreen.c
+++ b/wiretap/netscreen.c
@@ -24,9 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "netscreen.h"
diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index 23ebbbbe44..ec75055fd7 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <errno.h>
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c
index 2bdf1e6a60..fbd32639c5 100644
--- a/wiretap/network_instruments.c
+++ b/wiretap/network_instruments.c
@@ -19,9 +19,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <errno.h>
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index a3c04faac9..e05440dcca 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 #include <string.h>
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index 3aedd00d77..246d6b5acc 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -54,9 +54,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 #include <string.h>
diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c
index ba80f55b63..03974b1bfb 100644
--- a/wiretap/packetlogger.c
+++ b/wiretap/packetlogger.c
@@ -27,9 +27,7 @@
  * USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 #include <stdio.h>
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index 1b52422f01..470a0d699a 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -24,9 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index aaaebba808..c7a5ee6982 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -29,9 +29,7 @@
  *   http://wiki.wireshark.org/Development/PcapNg
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c
index 73f3ee03d8..5dfbd5ac2c 100644
--- a/wiretap/peekclassic.c
+++ b/wiretap/peekclassic.c
@@ -35,9 +35,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include "wtap-int.h"
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c
index 5898427ecd..96558786b4 100644
--- a/wiretap/peektagged.c
+++ b/wiretap/peektagged.c
@@ -32,9 +32,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c
index 28fb64f124..97e3edde47 100644
--- a/wiretap/pppdump.c
+++ b/wiretap/pppdump.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "pppdump.h"
diff --git a/wiretap/radcom.c b/wiretap/radcom.c
index fb53f7355e..828ebf4438 100644
--- a/wiretap/radcom.c
+++ b/wiretap/radcom.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 #include <string.h>
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index 4a74c4533b..fd12e29004 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include "wtap-int.h"
diff --git a/wiretap/tnef.c b/wiretap/tnef.c
index 0328264985..c62ab49754 100644
--- a/wiretap/tnef.c
+++ b/wiretap/tnef.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 
diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c
index 288d242565..784d430be4 100644
--- a/wiretap/toshiba.c
+++ b/wiretap/toshiba.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "toshiba.h"
diff --git a/wiretap/visual.c b/wiretap/visual.c
index 6fc6b27b95..078396a49f 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include <errno.h>
 #include <string.h>
 #include "wtap-int.h"
diff --git a/wiretap/vms.c b/wiretap/vms.c
index ac3d7fe638..293654b6f0 100644
--- a/wiretap/vms.c
+++ b/wiretap/vms.c
@@ -27,9 +27,7 @@
  *   TCPIPTRACE_FRAGMENTS_HAVE_HEADER_LINE to expect the first line to be
  *   at the start of every packet.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 #include "wtap-int.h"
 #include "buffer.h"
 #include "vms.h"
diff --git a/wiretap/vwr.c b/wiretap/vwr.c
index 6244910b38..bd565b1fbf 100644
--- a/wiretap/vwr.c
+++ b/wiretap/vwr.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 #include <string.h>
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 204c1e2b00..893847b86b 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -20,9 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 #include <errno.h>