14 files changed, 1 insertions, 29 deletions
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c
index 78a9ad3e87..b3f04df317 100644
--- a/epan/dfilter/dfilter-macro.c
+++ b/epan/dfilter/dfilter-macro.c
@@ -22,9 +22,7 @@
  */
 
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index 60ceef288d..ea48ce8cad 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.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/epan/dfilter/dfunctions.c b/epan/dfilter/dfunctions.c
index f3edfafed4..816cd2abc3 100644
--- a/epan/dfilter/dfunctions.c
+++ b/epan/dfilter/dfunctions.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 <glib.h>
 
diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c
index ae85be565a..50c5ce139e 100644
--- a/epan/dfilter/dfvm.c
+++ b/epan/dfilter/dfvm.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 "dfvm.h"
 
diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c
index 0a60529328..b4afa15a96 100644
--- a/epan/dfilter/drange.c
+++ b/epan/dfilter/drange.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 "config.h"
 
 #include "drange.h"
 
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c
index 81469e8ba8..81e2c2369a 100644
--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.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 "dfilter-int.h"
 #include "gencode.h"
diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon
index a58b75406a..46c3d3ae7a 100644
--- a/epan/dfilter/grammar.lemon
+++ b/epan/dfilter/grammar.lemon
@@ -1,9 +1,7 @@
 /* $Id$ */
 
 %include {
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "dfilter-int.h"
 #include "syntax-tree.h"
diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l
index 88cb402565..ca7c3ae58a 100644
--- a/epan/dfilter/scanner.l
+++ b/epan/dfilter/scanner.l
@@ -37,9 +37,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/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 3db5873c13..5259f10cbb 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.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>
 
diff --git a/epan/dfilter/sttype-function.c b/epan/dfilter/sttype-function.c
index f91fa79c06..bcfa9b53f8 100644
--- a/epan/dfilter/sttype-function.c
+++ b/epan/dfilter/sttype-function.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 "syntax-tree.h"
 #include "sttype-function.h"
diff --git a/epan/dfilter/sttype-integer.c b/epan/dfilter/sttype-integer.c
index 13157f418c..bc6b946c88 100644
--- a/epan/dfilter/sttype-integer.c
+++ b/epan/dfilter/sttype-integer.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 "ftypes/ftypes.h"
 #include "syntax-tree.h"
diff --git a/epan/dfilter/sttype-pointer.c b/epan/dfilter/sttype-pointer.c
index 62573adaad..3da0e6b040 100644
--- a/epan/dfilter/sttype-pointer.c
+++ b/epan/dfilter/sttype-pointer.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 "ftypes/ftypes.h"
 #include "syntax-tree.h"
diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c
index 23dff6f80d..92ed7e4f7a 100644
--- a/epan/dfilter/sttype-range.c
+++ b/epan/dfilter/sttype-range.c
@@ -25,9 +25,7 @@
  * The code is different, but definitely inspired by his code.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 
diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c
index fa831c2454..14318149f0 100644
--- a/epan/dfilter/syntax-tree.c
+++ b/epan/dfilter/syntax-tree.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 "syntax-tree.h"