In "plugins/plugin_api.h", don't include stuff required for the plugin

address table if we don't need the plugin address table, so as to catch
plugin dissectors that don't directly include stuff they need -
eventually, the plugin address table stuff should completely go away, so
we don't want dissectors depending on it.

Fix those dissectors caught by this.

Don't include "simple_dialog.h" in the ASN.1 dissector - it doesn't use
it.

svn path=/trunk/; revision=12140

6 files changed, 17 insertions, 6 deletions

diff --git a/plugins/acn/packet-acn.c b/plugins/acn/packet-acn.c
index 52ee837ca5..34f803cced 100644
--- a/plugins/acn/packet-acn.c
+++ b/plugins/acn/packet-acn.c
@@ -33,19 +33,23 @@
 #include "plugins/plugin_api.h"
 
 #include "moduleinfo.h"
-#include "acn.h"
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <gmodule.h>
 #include <ctype.h>
 #include <time.h>
 #include <string.h>
+
+#include <glib.h>
+#include <gmodule.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
 
+#include "acn.h"
+
 #include "plugins/plugin_api_defs.h"
 
 /* Define version if we are not building ethereal statically */
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 0e7ada9700..0a3a8faddd 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -83,8 +83,8 @@
 #include <epan/strutil.h>
 #include <epan/filesystem.h>
 #include <epan/report_err.h>
+#include <epan/dissectors/packet-tcp.h>
 #include "asn1.h"
-#include "simple_dialog.h"
 
 #include "plugins/plugin_api_defs.h"
 
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 4287aa7fd9..34a41728fd 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -43,6 +43,8 @@
 #include <gmodule.h>
 #include <epan/packet.h>
 #include <epan/proto.h>
+#include <epan/conversation.h>
+#include <epan/xdlc.h>
 
 #include "plugins/plugin_api_defs.h"
 
diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c
index 158c9ac96a..dd46c9089c 100644
--- a/plugins/irda/packet-sir.c
+++ b/plugins/irda/packet-sir.c
@@ -23,10 +23,11 @@
 #endif
 #include "moduleinfo.h"
 #include "plugins/plugin_api.h"
-#include <epan/crc16.h>
 
 #include <gmodule.h>
 
+#include <epan/packet.h>
+#include <epan/crc16.h>
 
 /** Serial infrared port. */
 #define TCP_PORT_SIR 6417
diff --git a/plugins/lwres/packet-lwres.c b/plugins/lwres/packet-lwres.c
index 1329ad9493..c30373b1c1 100644
--- a/plugins/lwres/packet-lwres.c
+++ b/plugins/lwres/packet-lwres.c
@@ -30,13 +30,17 @@
 
 #include "plugins/plugin_api.h"
 #include "moduleinfo.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmodule.h>
 #include <ctype.h>
 #include <time.h>
 #include <string.h>
+
+#include <epan/packet.h>
 #include <epan/prefs.h>
+
 #include "plugins/plugin_api_defs.h"
 
 #define LWRES_LWPACKET_LENGTH           (4 * 5 + 2 * 4)
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index c2e651138b..ec57a7276b 100644
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -41,8 +41,6 @@
 /* file generted by plugin_gen.py */
 #include "Xplugin_api.h"
 
-#endif
-
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/report_err.h>
@@ -63,6 +61,8 @@
 #include "epan/except.h"
 #include "epan/filesystem.h"
 
+#endif /* PLUGINS_NEED_ADDRESS_TABLE */
+
 #include "plugin_table.h"
 
 #ifdef PLUGINS_NEED_ADDRESS_TABLE