Only include config.h in C files, to avoid multiple inclusion.

svn path=/trunk/; revision=30182

11 files changed, 35 insertions, 8 deletions

diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index e373407c12..112862d98d 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -25,6 +25,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "packet-h248.h"
 #include <epan/tap.h>
 #include "packet-tpkt.h"
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 09e6070451..3cfcec1f59 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -33,6 +33,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "packet-h248.h"
 #include <epan/tap.h>
 #include "packet-tpkt.h"
diff --git a/epan/dissectors/packet-h248_10.c b/epan/dissectors/packet-h248_10.c
index 2cd927dc42..a48cc622f2 100644
--- a/epan/dissectors/packet-h248_10.c
+++ b/epan/dissectors/packet-h248_10.c
@@ -29,6 +29,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "packet-h248.h"
 #define PNAME  "H.248.10"
 #define PSNAME "H248CHP"
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index e679782fe5..a17a37c486 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.c
@@ -25,6 +25,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "packet-h248.h"
 #define PNAME  "H.248 3GPP"
 #define PSNAME "H2483GPP"
diff --git a/epan/dissectors/packet-h248_7.c b/epan/dissectors/packet-h248_7.c
index 1ea9137cbc..d94ad99b32 100644
--- a/epan/dissectors/packet-h248_7.c
+++ b/epan/dissectors/packet-h248_7.c
@@ -26,6 +26,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "packet-h248.h"
 
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index 928ca0e042..79a8dc93cf 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -25,6 +25,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "packet-h248.h"
 #define PNAME  "H.248 Annex C"
 #define PSNAME "H248C"
diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c
index 92b344c5c4..2eb4eb69b3 100644
--- a/epan/dissectors/packet-h248_annex_e.c
+++ b/epan/dissectors/packet-h248_annex_e.c
@@ -25,6 +25,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "packet-h248.h"
 #define PNAME  "H.248 Annex E"
 #define PSNAME "H248E"
diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index de03b56687..ef26613a62 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -27,6 +27,10 @@
  * Ref ITU-T Rec. Q.1950 (12/2002)
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "packet-h248.h"
 #include "packet-isup.h"
 
diff --git a/epan/dissectors/packet-mstp.h b/epan/dissectors/packet-mstp.h
index a2aeed18f5..4dd448d631 100644
--- a/epan/dissectors/packet-mstp.h
+++ b/epan/dissectors/packet-mstp.h
@@ -26,10 +26,6 @@
 #ifndef __MSTP_H__
 #define __MSTP_H__
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/epan/gcp.c b/epan/gcp.c
index c044b54dcb..b3fe7fd51a 100644
--- a/epan/gcp.c
+++ b/epan/gcp.c
@@ -29,6 +29,10 @@
   *  - avoid persistent tracking of NULL and ALL contexts
   */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "gcp.h"
 
 static emem_tree_t* msgs = NULL;
diff --git a/epan/gcp.h b/epan/gcp.h
index e0532a27ab..ee16a2f084 100644
--- a/epan/gcp.h
+++ b/epan/gcp.h
@@ -24,10 +24,6 @@
 #ifndef __GCP_H_
 #define __GCP_H_
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>