6 files changed, 9 insertions, 35 deletions
diff --git a/epan/bitswap.c b/epan/bitswap.c
index 8871292b3e..0fa8198f9f 100644
--- a/epan/bitswap.c
+++ b/epan/bitswap.c
@@ -29,6 +29,8 @@
 
 #include <glib.h>
 
+#include "bitswap.h"
+
 /* "swaptab[i]" is the value of "i" with the bits reversed. */
 guint8 swaptab[256] = {
   0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index 20b90fc9c6..aded30f365 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -33,6 +33,7 @@
 #include "semcheck.h"
 #include "dfvm.h"
 #include <epan/epan_dissect.h>
+#include "dfilter.h"
 
 #define DFILTER_TOKEN_ID_OFFSET	1
 
diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon
index c9d66fba2b..08169369c2 100644
--- a/epan/dfilter/grammar.lemon
+++ b/epan/dfilter/grammar.lemon
@@ -11,6 +11,8 @@
 #include "sttype-test.h"
 #include "drange.h"
 
+#include "grammar.h"
+
 /* End of C code */
 }
 
diff --git a/epan/dissectors/packet-sna.h b/epan/dissectors/packet-sna.h
deleted file mode 100644
index 47056a5a46..0000000000
--- a/epan/dissectors/packet-sna.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* packet-sna.h
- * Definitions for SNA dissection.
- *
- * $Id$
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef __PACKET_SNA_H__
-#define __PACKET_SNA_H__
-
-/*
- * Structure used to represent an FID Type 4 address; gives the layout of the
- * data pointed to by an AT_SNA "address" structure if the size is
- * SNA_FID_TYPE_4_ADDR_LEN.
- */
-#define	SNA_FID_TYPE_4_ADDR_LEN	6
-struct sna_fid_type_4_addr {
-	guint32	saf;
-	guint16	ef;
-};
-
-#endif
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c
index 154ffe802d..c12c4fe8d2 100644
--- a/epan/ftypes/ftypes.c
+++ b/epan/ftypes/ftypes.c
@@ -28,6 +28,8 @@
 #include <glib.h>
 #include "../slab.h"
 
+#include "ftypes.h"
+
 /* Keep track of ftype_t's via their ftenum number */
 static ftype_t* type_list[FT_NUM_TYPES];
 
diff --git a/epan/stats_tree.c b/epan/stats_tree.c
index 693ce21e74..cb36ba2d26 100644
--- a/epan/stats_tree.c
+++ b/epan/stats_tree.c
@@ -31,6 +31,8 @@
 #include <epan/stats_tree_priv.h>
 #include <string.h>
 
+#include "stats_tree.h"
+
 /*
 TODO: 
    - sort out the sorting issue