228 files changed, 29 insertions, 29 deletions
diff --git a/plugins/Custom.m4.example b/plugins/Custom.m4.example
index 34bb80a4c3..adbf02fa16 100644
--- a/plugins/Custom.m4.example
+++ b/plugins/Custom.m4.example
@@ -1,3 +1,3 @@
 #
 
-m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/foo/Makefile])
+m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/epan/foo/Makefile])
diff --git a/plugins/Custom.make.example b/plugins/Custom.make.example
index d17d062bc5..d3020ae430 100644
--- a/plugins/Custom.make.example
+++ b/plugins/Custom.make.example
@@ -1,7 +1,7 @@
 #
 
 _CUSTOM_SUBDIRS_ = \
-	foo
+	epan/foo
 
 _CUSTOM_EXTRA_DIST_ = \
 	Custom.m4 \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 481cc29f17..267e8873ae 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -23,19 +23,19 @@
 
 SUBDIRS = \
 	$(_CUSTOM_SUBDIRS_) \
-	docsis		\
-	ethercat	\
-	gryphon		\
-	irda		\
-	mate		\
-	opcua		\
-	profinet	\
-	stats_tree	\
-	transum		\
-	unistim		\
-	wimax		\
-	wimaxasncp	\
-	wimaxmacphy
+	epan/docsis		\
+	epan/ethercat		\
+	epan/gryphon		\
+	epan/irda		\
+	epan/mate		\
+	epan/opcua		\
+	epan/profinet		\
+	epan/stats_tree		\
+	epan/transum		\
+	epan/unistim		\
+	epan/wimax		\
+	epan/wimaxasncp		\
+	epan/wimaxmacphy
 
 EXTRA_DIST = \
 	$(_CUSTOM_EXTRA_DIST_) \
diff --git a/plugins/docsis/AUTHORS b/plugins/epan/docsis/AUTHORS
index b9ad1a9152..b9ad1a9152 100644
--- a/plugins/docsis/AUTHORS
+++ b/plugins/epan/docsis/AUTHORS
diff --git a/plugins/docsis/CMakeLists.txt b/plugins/epan/docsis/CMakeLists.txt
index 190a6491eb..190a6491eb 100644
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/epan/docsis/CMakeLists.txt
diff --git a/plugins/docsis/ChangeLog b/plugins/epan/docsis/ChangeLog
index 9251dbc0e2..9251dbc0e2 100644
--- a/plugins/docsis/ChangeLog
+++ b/plugins/epan/docsis/ChangeLog
diff --git a/plugins/docsis/Makefile.am b/plugins/epan/docsis/Makefile.am
index d81ed2e767..3137cbab87 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/epan/docsis/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = docsis
diff --git a/plugins/docsis/README b/plugins/epan/docsis/README
index 2e083a81c8..2e083a81c8 100644
--- a/plugins/docsis/README
+++ b/plugins/epan/docsis/README
diff --git a/plugins/docsis/packet-docsis.c b/plugins/epan/docsis/packet-docsis.c
index 1e7d7725d9..1e7d7725d9 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/epan/docsis/packet-docsis.c
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/epan/docsis/packet-macmgmt.c
index aa0cbb29e4..aa0cbb29e4 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/epan/docsis/packet-macmgmt.c
diff --git a/plugins/docsis/packet-tlv.c b/plugins/epan/docsis/packet-tlv.c
index 2976bcc5d8..2976bcc5d8 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/epan/docsis/packet-tlv.c
diff --git a/plugins/docsis/packet-tlv.h b/plugins/epan/docsis/packet-tlv.h
index 80f362645c..80f362645c 100644
--- a/plugins/docsis/packet-tlv.h
+++ b/plugins/epan/docsis/packet-tlv.h
diff --git a/plugins/docsis/packet-vendor.c b/plugins/epan/docsis/packet-vendor.c
index 08f00c63ab..08f00c63ab 100644
--- a/plugins/docsis/packet-vendor.c
+++ b/plugins/epan/docsis/packet-vendor.c
diff --git a/plugins/ethercat/AUTHORS b/plugins/epan/ethercat/AUTHORS
index 8e9f8dae72..8e9f8dae72 100644
--- a/plugins/ethercat/AUTHORS
+++ b/plugins/epan/ethercat/AUTHORS
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/epan/ethercat/CMakeLists.txt
index 6c227b46ec..6c227b46ec 100644
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/epan/ethercat/CMakeLists.txt
diff --git a/plugins/ethercat/Makefile.am b/plugins/epan/ethercat/Makefile.am
index a924abbdec..e9cde19249 100644
--- a/plugins/ethercat/Makefile.am
+++ b/plugins/epan/ethercat/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = ethercat
diff --git a/plugins/ethercat/packet-ams.c b/plugins/epan/ethercat/packet-ams.c
index f91c344aa6..f91c344aa6 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/epan/ethercat/packet-ams.c
diff --git a/plugins/ethercat/packet-ams.h b/plugins/epan/ethercat/packet-ams.h
index fc1d4e9857..fc1d4e9857 100644
--- a/plugins/ethercat/packet-ams.h
+++ b/plugins/epan/ethercat/packet-ams.h
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/epan/ethercat/packet-ecatmb.c
index 0f34931852..0f34931852 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/epan/ethercat/packet-ecatmb.c
diff --git a/plugins/ethercat/packet-ecatmb.h b/plugins/epan/ethercat/packet-ecatmb.h
index 1e58f3a815..1e58f3a815 100644
--- a/plugins/ethercat/packet-ecatmb.h
+++ b/plugins/epan/ethercat/packet-ecatmb.h
diff --git a/plugins/ethercat/packet-esl.c b/plugins/epan/ethercat/packet-esl.c
index 38049d63b2..38049d63b2 100644
--- a/plugins/ethercat/packet-esl.c
+++ b/plugins/epan/ethercat/packet-esl.c
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/epan/ethercat/packet-ethercat-datagram.c
index e7f48ba645..e7f48ba645 100644
--- a/plugins/ethercat/packet-ethercat-datagram.c
+++ b/plugins/epan/ethercat/packet-ethercat-datagram.c
diff --git a/plugins/ethercat/packet-ethercat-datagram.h b/plugins/epan/ethercat/packet-ethercat-datagram.h
index 3e6c2b1e15..3e6c2b1e15 100644
--- a/plugins/ethercat/packet-ethercat-datagram.h
+++ b/plugins/epan/ethercat/packet-ethercat-datagram.h
diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/epan/ethercat/packet-ethercat-frame.c
index bf59d6ca45..bf59d6ca45 100644
--- a/plugins/ethercat/packet-ethercat-frame.c
+++ b/plugins/epan/ethercat/packet-ethercat-frame.c
diff --git a/plugins/ethercat/packet-ethercat-frame.h b/plugins/epan/ethercat/packet-ethercat-frame.h
index 087219f294..087219f294 100644
--- a/plugins/ethercat/packet-ethercat-frame.h
+++ b/plugins/epan/ethercat/packet-ethercat-frame.h
diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/epan/ethercat/packet-ioraw.c
index 125de9ebbe..125de9ebbe 100644
--- a/plugins/ethercat/packet-ioraw.c
+++ b/plugins/epan/ethercat/packet-ioraw.c
diff --git a/plugins/ethercat/packet-ioraw.h b/plugins/epan/ethercat/packet-ioraw.h
index 4c45b12e59..4c45b12e59 100644
--- a/plugins/ethercat/packet-ioraw.h
+++ b/plugins/epan/ethercat/packet-ioraw.h
diff --git a/plugins/ethercat/packet-nv.c b/plugins/epan/ethercat/packet-nv.c
index 10e2750fe9..10e2750fe9 100644
--- a/plugins/ethercat/packet-nv.c
+++ b/plugins/epan/ethercat/packet-nv.c
diff --git a/plugins/ethercat/packet-nv.h b/plugins/epan/ethercat/packet-nv.h
index 5fe9e681ae..5fe9e681ae 100644
--- a/plugins/ethercat/packet-nv.h
+++ b/plugins/epan/ethercat/packet-nv.h
diff --git a/plugins/gryphon/AUTHORS b/plugins/epan/gryphon/AUTHORS
index e2fa6a7963..e2fa6a7963 100644
--- a/plugins/gryphon/AUTHORS
+++ b/plugins/epan/gryphon/AUTHORS
diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/epan/gryphon/CMakeLists.txt
index d6ecb662f4..d6ecb662f4 100644
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/epan/gryphon/CMakeLists.txt
diff --git a/plugins/gryphon/Makefile.am b/plugins/epan/gryphon/Makefile.am
index c87bc8f915..81495fdd7c 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/epan/gryphon/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = gryphon
diff --git a/plugins/gryphon/README b/plugins/epan/gryphon/README
index a8e963f9a9..a8e963f9a9 100644
--- a/plugins/gryphon/README
+++ b/plugins/epan/gryphon/README
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/epan/gryphon/packet-gryphon.c
index 3aad5e4bc0..3aad5e4bc0 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/epan/gryphon/packet-gryphon.c
diff --git a/plugins/gryphon/packet-gryphon.h b/plugins/epan/gryphon/packet-gryphon.h
index 3d7b9a5a3c..3d7b9a5a3c 100644
--- a/plugins/gryphon/packet-gryphon.h
+++ b/plugins/epan/gryphon/packet-gryphon.h
diff --git a/plugins/irda/CMakeLists.txt b/plugins/epan/irda/CMakeLists.txt
index c30026b91d..c30026b91d 100644
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/epan/irda/CMakeLists.txt
diff --git a/plugins/irda/Makefile.am b/plugins/epan/irda/Makefile.am
index a2e499a871..1678d88874 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/epan/irda/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = irda
diff --git a/plugins/irda/irda-appl.h b/plugins/epan/irda/irda-appl.h
index a030a506c3..a030a506c3 100644
--- a/plugins/irda/irda-appl.h
+++ b/plugins/epan/irda/irda-appl.h
diff --git a/plugins/irda/packet-ircomm.c b/plugins/epan/irda/packet-ircomm.c
index e3a8b16c3a..e3a8b16c3a 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/epan/irda/packet-ircomm.c
diff --git a/plugins/irda/packet-irda.c b/plugins/epan/irda/packet-irda.c
index a6035efa07..a6035efa07 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/epan/irda/packet-irda.c
diff --git a/plugins/irda/packet-sir.c b/plugins/epan/irda/packet-sir.c
index 54457069e0..54457069e0 100644
--- a/plugins/irda/packet-sir.c
+++ b/plugins/epan/irda/packet-sir.c
diff --git a/plugins/mate/AUTHORS b/plugins/epan/mate/AUTHORS
index e37df0dd7d..e37df0dd7d 100644
--- a/plugins/mate/AUTHORS
+++ b/plugins/epan/mate/AUTHORS
diff --git a/plugins/mate/CMakeLists.txt b/plugins/epan/mate/CMakeLists.txt
index da7451b3e3..da7451b3e3 100644
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/epan/mate/CMakeLists.txt
diff --git a/plugins/mate/Makefile.am b/plugins/epan/mate/Makefile.am
index 0d425aa293..bb1f576f74 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/epan/mate/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = mate
diff --git a/plugins/mate/examples/call.mate b/plugins/epan/mate/examples/call.mate
index 0dbbb45ef8..0dbbb45ef8 100644
--- a/plugins/mate/examples/call.mate
+++ b/plugins/epan/mate/examples/call.mate
diff --git a/plugins/mate/examples/mms.mate b/plugins/epan/mate/examples/mms.mate
index 7554b11932..7554b11932 100644
--- a/plugins/mate/examples/mms.mate
+++ b/plugins/epan/mate/examples/mms.mate
diff --git a/plugins/mate/examples/pasv_ftp.mate b/plugins/epan/mate/examples/pasv_ftp.mate
index 24ef7ab470..24ef7ab470 100644
--- a/plugins/mate/examples/pasv_ftp.mate
+++ b/plugins/epan/mate/examples/pasv_ftp.mate
diff --git a/plugins/mate/examples/tcp.mate b/plugins/epan/mate/examples/tcp.mate
index 2abe3e8882..2abe3e8882 100644
--- a/plugins/mate/examples/tcp.mate
+++ b/plugins/epan/mate/examples/tcp.mate
diff --git a/plugins/mate/examples/web.mate b/plugins/epan/mate/examples/web.mate
index fd00c651de..fd00c651de 100644
--- a/plugins/mate/examples/web.mate
+++ b/plugins/epan/mate/examples/web.mate
diff --git a/plugins/mate/mate.h b/plugins/epan/mate/mate.h
index 5e538dfa32..5e538dfa32 100644
--- a/plugins/mate/mate.h
+++ b/plugins/epan/mate/mate.h
diff --git a/plugins/mate/mate_grammar.lemon b/plugins/epan/mate/mate_grammar.lemon
index 4b9ac3195f..4b9ac3195f 100644
--- a/plugins/mate/mate_grammar.lemon
+++ b/plugins/epan/mate/mate_grammar.lemon
diff --git a/plugins/mate/mate_parser.l b/plugins/epan/mate/mate_parser.l
index b2ff7117cc..b2ff7117cc 100644
--- a/plugins/mate/mate_parser.l
+++ b/plugins/epan/mate/mate_parser.l
diff --git a/plugins/mate/mate_runtime.c b/plugins/epan/mate/mate_runtime.c
index 82c7af26ea..82c7af26ea 100644
--- a/plugins/mate/mate_runtime.c
+++ b/plugins/epan/mate/mate_runtime.c
diff --git a/plugins/mate/mate_setup.c b/plugins/epan/mate/mate_setup.c
index f58309ad68..f58309ad68 100644
--- a/plugins/mate/mate_setup.c
+++ b/plugins/epan/mate/mate_setup.c
diff --git a/plugins/mate/mate_util.c b/plugins/epan/mate/mate_util.c
index 8e4c5dd8ad..8e4c5dd8ad 100644
--- a/plugins/mate/mate_util.c
+++ b/plugins/epan/mate/mate_util.c
diff --git a/plugins/mate/mate_util.h b/plugins/epan/mate/mate_util.h
index 651136b97c..651136b97c 100644
--- a/plugins/mate/mate_util.h
+++ b/plugins/epan/mate/mate_util.h
diff --git a/plugins/mate/matelib/dns.mate b/plugins/epan/mate/matelib/dns.mate
index be426bc555..be426bc555 100644
--- a/plugins/mate/matelib/dns.mate
+++ b/plugins/epan/mate/matelib/dns.mate
diff --git a/plugins/mate/matelib/h225_ras.mate b/plugins/epan/mate/matelib/h225_ras.mate
index 7c6698ef90..7c6698ef90 100644
--- a/plugins/mate/matelib/h225_ras.mate
+++ b/plugins/epan/mate/matelib/h225_ras.mate
diff --git a/plugins/mate/matelib/isup.mate b/plugins/epan/mate/matelib/isup.mate
index 8ff6d3099a..8ff6d3099a 100644
--- a/plugins/mate/matelib/isup.mate
+++ b/plugins/epan/mate/matelib/isup.mate
diff --git a/plugins/mate/matelib/megaco.mate b/plugins/epan/mate/matelib/megaco.mate
index 044aba7837..044aba7837 100644
--- a/plugins/mate/matelib/megaco.mate
+++ b/plugins/epan/mate/matelib/megaco.mate
diff --git a/plugins/mate/matelib/q931.mate b/plugins/epan/mate/matelib/q931.mate
index 5bea5b1a97..5bea5b1a97 100644
--- a/plugins/mate/matelib/q931.mate
+++ b/plugins/epan/mate/matelib/q931.mate
diff --git a/plugins/mate/matelib/radius.mate b/plugins/epan/mate/matelib/radius.mate
index 66a910b85e..66a910b85e 100644
--- a/plugins/mate/matelib/radius.mate
+++ b/plugins/epan/mate/matelib/radius.mate
diff --git a/plugins/mate/matelib/rtsp.mate b/plugins/epan/mate/matelib/rtsp.mate
index 35f25ab246..35f25ab246 100644
--- a/plugins/mate/matelib/rtsp.mate
+++ b/plugins/epan/mate/matelib/rtsp.mate
diff --git a/plugins/mate/matelib/sip.mate b/plugins/epan/mate/matelib/sip.mate
index 593c915b06..593c915b06 100644
--- a/plugins/mate/matelib/sip.mate
+++ b/plugins/epan/mate/matelib/sip.mate
diff --git a/plugins/mate/packet-mate.c b/plugins/epan/mate/packet-mate.c
index 56cdb5defa..56cdb5defa 100644
--- a/plugins/mate/packet-mate.c
+++ b/plugins/epan/mate/packet-mate.c
diff --git a/plugins/opcua/AUTHORS b/plugins/epan/opcua/AUTHORS
index fffa8685d1..fffa8685d1 100644
--- a/plugins/opcua/AUTHORS
+++ b/plugins/epan/opcua/AUTHORS
diff --git a/plugins/opcua/CMakeLists.txt b/plugins/epan/opcua/CMakeLists.txt
index ca1dc9e34e..ca1dc9e34e 100644
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/epan/opcua/CMakeLists.txt
diff --git a/plugins/opcua/ChangeLog b/plugins/epan/opcua/ChangeLog
index 5ebfc8f91a..5ebfc8f91a 100644
--- a/plugins/opcua/ChangeLog
+++ b/plugins/epan/opcua/ChangeLog
diff --git a/plugins/opcua/Doxyfile b/plugins/epan/opcua/Doxyfile
index 478bcdb878..478bcdb878 100644
--- a/plugins/opcua/Doxyfile
+++ b/plugins/epan/opcua/Doxyfile
diff --git a/plugins/opcua/Makefile.am b/plugins/epan/opcua/Makefile.am
index bd88fd1c2b..1023747325 100644
--- a/plugins/opcua/Makefile.am
+++ b/plugins/epan/opcua/Makefile.am
@@ -20,7 +20,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = opcua
diff --git a/plugins/opcua/README b/plugins/epan/opcua/README
index 116de2aa66..116de2aa66 100644
--- a/plugins/opcua/README
+++ b/plugins/epan/opcua/README
diff --git a/plugins/opcua/opcua.c b/plugins/epan/opcua/opcua.c
index 91f1d02333..91f1d02333 100644
--- a/plugins/opcua/opcua.c
+++ b/plugins/epan/opcua/opcua.c
diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/epan/opcua/opcua_application_layer.c
index df627b3210..df627b3210 100644
--- a/plugins/opcua/opcua_application_layer.c
+++ b/plugins/epan/opcua/opcua_application_layer.c
diff --git a/plugins/opcua/opcua_application_layer.h b/plugins/epan/opcua/opcua_application_layer.h
index c74238ab0b..c74238ab0b 100644
--- a/plugins/opcua/opcua_application_layer.h
+++ b/plugins/epan/opcua/opcua_application_layer.h
diff --git a/plugins/opcua/opcua_complextypeparser.c b/plugins/epan/opcua/opcua_complextypeparser.c
index 2c90fa63d4..2c90fa63d4 100644
--- a/plugins/opcua/opcua_complextypeparser.c
+++ b/plugins/epan/opcua/opcua_complextypeparser.c
diff --git a/plugins/opcua/opcua_complextypeparser.h b/plugins/epan/opcua/opcua_complextypeparser.h
index ef1de8855a..ef1de8855a 100644
--- a/plugins/opcua/opcua_complextypeparser.h
+++ b/plugins/epan/opcua/opcua_complextypeparser.h
diff --git a/plugins/opcua/opcua_enumparser.c b/plugins/epan/opcua/opcua_enumparser.c
index 2cd7054ba1..2cd7054ba1 100644
--- a/plugins/opcua/opcua_enumparser.c
+++ b/plugins/epan/opcua/opcua_enumparser.c
diff --git a/plugins/opcua/opcua_enumparser.h b/plugins/epan/opcua/opcua_enumparser.h
index 584aa8e035..584aa8e035 100644
--- a/plugins/opcua/opcua_enumparser.h
+++ b/plugins/epan/opcua/opcua_enumparser.h
diff --git a/plugins/opcua/opcua_extensionobjectids.h b/plugins/epan/opcua/opcua_extensionobjectids.h
index 95fce73cde..95fce73cde 100644
--- a/plugins/opcua/opcua_extensionobjectids.h
+++ b/plugins/epan/opcua/opcua_extensionobjectids.h
diff --git a/plugins/opcua/opcua_extensionobjecttable.c b/plugins/epan/opcua/opcua_extensionobjecttable.c
index 7d84a1068f..7d84a1068f 100644
--- a/plugins/opcua/opcua_extensionobjecttable.c
+++ b/plugins/epan/opcua/opcua_extensionobjecttable.c
diff --git a/plugins/opcua/opcua_hfindeces.c b/plugins/epan/opcua/opcua_hfindeces.c
index dd84925a51..dd84925a51 100644
--- a/plugins/opcua/opcua_hfindeces.c
+++ b/plugins/epan/opcua/opcua_hfindeces.c
diff --git a/plugins/opcua/opcua_hfindeces.h b/plugins/epan/opcua/opcua_hfindeces.h
index b04025b189..b04025b189 100644
--- a/plugins/opcua/opcua_hfindeces.h
+++ b/plugins/epan/opcua/opcua_hfindeces.h
diff --git a/plugins/opcua/opcua_identifiers.h b/plugins/epan/opcua/opcua_identifiers.h
index 18891834da..18891834da 100644
--- a/plugins/opcua/opcua_identifiers.h
+++ b/plugins/epan/opcua/opcua_identifiers.h
diff --git a/plugins/opcua/opcua_security_layer.c b/plugins/epan/opcua/opcua_security_layer.c
index 2acd8f85ff..2acd8f85ff 100644
--- a/plugins/opcua/opcua_security_layer.c
+++ b/plugins/epan/opcua/opcua_security_layer.c
diff --git a/plugins/opcua/opcua_security_layer.h b/plugins/epan/opcua/opcua_security_layer.h
index c168452242..c168452242 100644
--- a/plugins/opcua/opcua_security_layer.h
+++ b/plugins/epan/opcua/opcua_security_layer.h
diff --git a/plugins/opcua/opcua_serviceids.h b/plugins/epan/opcua/opcua_serviceids.h
index cd61c36dac..cd61c36dac 100644
--- a/plugins/opcua/opcua_serviceids.h
+++ b/plugins/epan/opcua/opcua_serviceids.h
diff --git a/plugins/opcua/opcua_serviceparser.c b/plugins/epan/opcua/opcua_serviceparser.c
index d203149a8b..d203149a8b 100644
--- a/plugins/opcua/opcua_serviceparser.c
+++ b/plugins/epan/opcua/opcua_serviceparser.c
diff --git a/plugins/opcua/opcua_serviceparser.h b/plugins/epan/opcua/opcua_serviceparser.h
index 48ba77d900..48ba77d900 100644
--- a/plugins/opcua/opcua_serviceparser.h
+++ b/plugins/epan/opcua/opcua_serviceparser.h
diff --git a/plugins/opcua/opcua_servicetable.c b/plugins/epan/opcua/opcua_servicetable.c
index c257100e1b..c257100e1b 100644
--- a/plugins/opcua/opcua_servicetable.c
+++ b/plugins/epan/opcua/opcua_servicetable.c
diff --git a/plugins/opcua/opcua_servicetable.h b/plugins/epan/opcua/opcua_servicetable.h
index 870cda9898..870cda9898 100644
--- a/plugins/opcua/opcua_servicetable.h
+++ b/plugins/epan/opcua/opcua_servicetable.h
diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/epan/opcua/opcua_simpletypes.c
index 005106d2f6..005106d2f6 100644
--- a/plugins/opcua/opcua_simpletypes.c
+++ b/plugins/epan/opcua/opcua_simpletypes.c
diff --git a/plugins/opcua/opcua_simpletypes.h b/plugins/epan/opcua/opcua_simpletypes.h
index 982d0e8fcc..982d0e8fcc 100644
--- a/plugins/opcua/opcua_simpletypes.h
+++ b/plugins/epan/opcua/opcua_simpletypes.h
diff --git a/plugins/opcua/opcua_statuscode.c b/plugins/epan/opcua/opcua_statuscode.c
index 07b067fce3..07b067fce3 100644
--- a/plugins/opcua/opcua_statuscode.c
+++ b/plugins/epan/opcua/opcua_statuscode.c
diff --git a/plugins/opcua/opcua_statuscode.h b/plugins/epan/opcua/opcua_statuscode.h
index 50e7f94fbb..50e7f94fbb 100644
--- a/plugins/opcua/opcua_statuscode.h
+++ b/plugins/epan/opcua/opcua_statuscode.h
diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/epan/opcua/opcua_transport_layer.c
index 38fdac75af..38fdac75af 100644
--- a/plugins/opcua/opcua_transport_layer.c
+++ b/plugins/epan/opcua/opcua_transport_layer.c
diff --git a/plugins/opcua/opcua_transport_layer.h b/plugins/epan/opcua/opcua_transport_layer.h
index 2993a4e8cf..2993a4e8cf 100644
--- a/plugins/opcua/opcua_transport_layer.h
+++ b/plugins/epan/opcua/opcua_transport_layer.h
diff --git a/plugins/pluginifdemo/AUTHORS b/plugins/epan/pluginifdemo/AUTHORS
index ca50630cb9..ca50630cb9 100644
--- a/plugins/pluginifdemo/AUTHORS
+++ b/plugins/epan/pluginifdemo/AUTHORS
diff --git a/plugins/pluginifdemo/CMakeLists.txt b/plugins/epan/pluginifdemo/CMakeLists.txt
index 2125a1e9b3..2125a1e9b3 100644
--- a/plugins/pluginifdemo/CMakeLists.txt
+++ b/plugins/epan/pluginifdemo/CMakeLists.txt
diff --git a/plugins/pluginifdemo/Makefile.am b/plugins/epan/pluginifdemo/Makefile.am
index f1e4edf608..aca6a56b94 100644
--- a/plugins/pluginifdemo/Makefile.am
+++ b/plugins/epan/pluginifdemo/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = pluginifdemo
diff --git a/plugins/pluginifdemo/README b/plugins/epan/pluginifdemo/README
index 7aa753f711..7aa753f711 100644
--- a/plugins/pluginifdemo/README
+++ b/plugins/epan/pluginifdemo/README
diff --git a/plugins/pluginifdemo/pluginifdemo.c b/plugins/epan/pluginifdemo/pluginifdemo.c
index deb938fb6e..deb938fb6e 100644
--- a/plugins/pluginifdemo/pluginifdemo.c
+++ b/plugins/epan/pluginifdemo/pluginifdemo.c
diff --git a/plugins/pluginifdemo/pluginifdemo.h b/plugins/epan/pluginifdemo/pluginifdemo.h
index 59b2a649c1..59b2a649c1 100644
--- a/plugins/pluginifdemo/pluginifdemo.h
+++ b/plugins/epan/pluginifdemo/pluginifdemo.h
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_about.cpp b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp
index 048bcc1a84..048bcc1a84 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_about.cpp
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.cpp
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_about.h b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.h
index aa4bb4726d..aa4bb4726d 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_about.h
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.h
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_about.ui b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui
index 2353dd76ac..2353dd76ac 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_about.ui
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_about.ui
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_main.cpp b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp
index d29c47ad50..d29c47ad50 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_main.cpp
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.cpp
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_main.h b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.h
index 3854967d1d..3854967d1d 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_main.h
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.h
diff --git a/plugins/pluginifdemo/ui/pluginifdemo_main.ui b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.ui
index 467ec85e07..467ec85e07 100644
--- a/plugins/pluginifdemo/ui/pluginifdemo_main.ui
+++ b/plugins/epan/pluginifdemo/ui/pluginifdemo_main.ui
diff --git a/plugins/pluginifdemo/ui/uiclasshandler.cpp b/plugins/epan/pluginifdemo/ui/uiclasshandler.cpp
index e88f17a35e..e88f17a35e 100644
--- a/plugins/pluginifdemo/ui/uiclasshandler.cpp
+++ b/plugins/epan/pluginifdemo/ui/uiclasshandler.cpp
diff --git a/plugins/pluginifdemo/ui/uihandler.cpp b/plugins/epan/pluginifdemo/ui/uihandler.cpp
index 8dc3940669..8dc3940669 100644
--- a/plugins/pluginifdemo/ui/uihandler.cpp
+++ b/plugins/epan/pluginifdemo/ui/uihandler.cpp
diff --git a/plugins/pluginifdemo/ui/uihandler.h b/plugins/epan/pluginifdemo/ui/uihandler.h
index ce78a23940..ce78a23940 100644
--- a/plugins/pluginifdemo/ui/uihandler.h
+++ b/plugins/epan/pluginifdemo/ui/uihandler.h
diff --git a/plugins/profinet/AUTHORS b/plugins/epan/profinet/AUTHORS
index 4979d26040..4979d26040 100644
--- a/plugins/profinet/AUTHORS
+++ b/plugins/epan/profinet/AUTHORS
diff --git a/plugins/profinet/CMakeLists.txt b/plugins/epan/profinet/CMakeLists.txt
index 86798676f1..86798676f1 100644
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/epan/profinet/CMakeLists.txt
diff --git a/plugins/profinet/ChangeLog b/plugins/epan/profinet/ChangeLog
index 5298f56783..5298f56783 100644
--- a/plugins/profinet/ChangeLog
+++ b/plugins/epan/profinet/ChangeLog
diff --git a/plugins/profinet/Makefile.am b/plugins/epan/profinet/Makefile.am
index e638ecedfd..ce0888690c 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/epan/profinet/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = profinet
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c
index 44aa77d092..44aa77d092 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/epan/profinet/packet-dcom-cba-acco.c
index 9537ef36df..9537ef36df 100644
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/epan/profinet/packet-dcom-cba-acco.c
diff --git a/plugins/profinet/packet-dcom-cba-acco.h b/plugins/epan/profinet/packet-dcom-cba-acco.h
index 356d540377..356d540377 100644
--- a/plugins/profinet/packet-dcom-cba-acco.h
+++ b/plugins/epan/profinet/packet-dcom-cba-acco.h
diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/epan/profinet/packet-dcom-cba.c
index 244b102cb0..244b102cb0 100644
--- a/plugins/profinet/packet-dcom-cba.c
+++ b/plugins/epan/profinet/packet-dcom-cba.c
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/epan/profinet/packet-pn-dcp.c
index 2838663b5c..2838663b5c 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/epan/profinet/packet-pn-dcp.c
diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/epan/profinet/packet-pn-mrp.c
index 7aa57c0ab5..7aa57c0ab5 100644
--- a/plugins/profinet/packet-pn-mrp.c
+++ b/plugins/epan/profinet/packet-pn-mrp.c
diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/epan/profinet/packet-pn-mrrt.c
index 269fe015dd..269fe015dd 100644
--- a/plugins/profinet/packet-pn-mrrt.c
+++ b/plugins/epan/profinet/packet-pn-mrrt.c
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/epan/profinet/packet-pn-ptcp.c
index d7771f3d06..d7771f3d06 100644
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/epan/profinet/packet-pn-ptcp.c
diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/epan/profinet/packet-pn-rt.c
index 3e4e1f5f80..3e4e1f5f80 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/epan/profinet/packet-pn-rt.c
diff --git a/plugins/profinet/packet-pn-rtc-one.c b/plugins/epan/profinet/packet-pn-rtc-one.c
index f908fbb851..f908fbb851 100644
--- a/plugins/profinet/packet-pn-rtc-one.c
+++ b/plugins/epan/profinet/packet-pn-rtc-one.c
diff --git a/plugins/profinet/packet-pn.c b/plugins/epan/profinet/packet-pn.c
index de7c4aada5..de7c4aada5 100644
--- a/plugins/profinet/packet-pn.c
+++ b/plugins/epan/profinet/packet-pn.c
diff --git a/plugins/profinet/packet-pn.h b/plugins/epan/profinet/packet-pn.h
index 77cd635348..77cd635348 100644
--- a/plugins/profinet/packet-pn.h
+++ b/plugins/epan/profinet/packet-pn.h
diff --git a/plugins/stats_tree/AUTHORS b/plugins/epan/stats_tree/AUTHORS
index e37df0dd7d..e37df0dd7d 100644
--- a/plugins/stats_tree/AUTHORS
+++ b/plugins/epan/stats_tree/AUTHORS
diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/epan/stats_tree/CMakeLists.txt
index 92172c72d3..92172c72d3 100644
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/epan/stats_tree/CMakeLists.txt
diff --git a/plugins/stats_tree/Makefile.am b/plugins/epan/stats_tree/Makefile.am
index 7bb578b133..1b4c9326cf 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/epan/stats_tree/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = stats_tree
diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/epan/stats_tree/pinfo_stats_tree.c
index 9ac702dab5..9ac702dab5 100644
--- a/plugins/stats_tree/pinfo_stats_tree.c
+++ b/plugins/epan/stats_tree/pinfo_stats_tree.c
diff --git a/plugins/stats_tree/pinfo_stats_tree.h b/plugins/epan/stats_tree/pinfo_stats_tree.h
index ef8952ca5a..ef8952ca5a 100644
--- a/plugins/stats_tree/pinfo_stats_tree.h
+++ b/plugins/epan/stats_tree/pinfo_stats_tree.h
diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/epan/stats_tree/stats_tree_plugin.c
index 16d65526a3..16d65526a3 100644
--- a/plugins/stats_tree/stats_tree_plugin.c
+++ b/plugins/epan/stats_tree/stats_tree_plugin.c
diff --git a/plugins/transum/AUTHORS b/plugins/epan/transum/AUTHORS
index 109c3fcdaa..109c3fcdaa 100644
--- a/plugins/transum/AUTHORS
+++ b/plugins/epan/transum/AUTHORS
diff --git a/plugins/transum/CMakeLists.txt b/plugins/epan/transum/CMakeLists.txt
index c814704da8..c814704da8 100644
--- a/plugins/transum/CMakeLists.txt
+++ b/plugins/epan/transum/CMakeLists.txt
diff --git a/plugins/transum/Makefile.am b/plugins/epan/transum/Makefile.am
index cf787e6592..615255c66b 100644
--- a/plugins/transum/Makefile.am
+++ b/plugins/epan/transum/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = transum
diff --git a/plugins/transum/README b/plugins/epan/transum/README
index af6b86e93b..af6b86e93b 100644
--- a/plugins/transum/README
+++ b/plugins/epan/transum/README
diff --git a/plugins/transum/decoders.c b/plugins/epan/transum/decoders.c
index e47539e5ac..e47539e5ac 100644
--- a/plugins/transum/decoders.c
+++ b/plugins/epan/transum/decoders.c
diff --git a/plugins/transum/decoders.h b/plugins/epan/transum/decoders.h
index 05d4ac1da1..05d4ac1da1 100644
--- a/plugins/transum/decoders.h
+++ b/plugins/epan/transum/decoders.h
diff --git a/plugins/transum/extractors.c b/plugins/epan/transum/extractors.c
index b07708d69a..b07708d69a 100644
--- a/plugins/transum/extractors.c
+++ b/plugins/epan/transum/extractors.c
diff --git a/plugins/transum/extractors.h b/plugins/epan/transum/extractors.h
index c1c0ff3b83..c1c0ff3b83 100644
--- a/plugins/transum/extractors.h
+++ b/plugins/epan/transum/extractors.h
diff --git a/plugins/transum/packet-transum.c b/plugins/epan/transum/packet-transum.c
index 6343bf1863..6343bf1863 100644
--- a/plugins/transum/packet-transum.c
+++ b/plugins/epan/transum/packet-transum.c
diff --git a/plugins/transum/packet-transum.h b/plugins/epan/transum/packet-transum.h
index f633e80b9a..f633e80b9a 100644
--- a/plugins/transum/packet-transum.h
+++ b/plugins/epan/transum/packet-transum.h
diff --git a/plugins/transum/preferences.h b/plugins/epan/transum/preferences.h
index 50b68419c9..50b68419c9 100644
--- a/plugins/transum/preferences.h
+++ b/plugins/epan/transum/preferences.h
diff --git a/plugins/unistim/AUTHORS b/plugins/epan/unistim/AUTHORS
index d71dd2908d..d71dd2908d 100644
--- a/plugins/unistim/AUTHORS
+++ b/plugins/epan/unistim/AUTHORS
diff --git a/plugins/unistim/CMakeLists.txt b/plugins/epan/unistim/CMakeLists.txt
index e9472df64e..e9472df64e 100644
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/epan/unistim/CMakeLists.txt
diff --git a/plugins/unistim/ChangeLog b/plugins/epan/unistim/ChangeLog
index ddacecff3a..ddacecff3a 100644
--- a/plugins/unistim/ChangeLog
+++ b/plugins/epan/unistim/ChangeLog
diff --git a/plugins/unistim/Makefile.am b/plugins/epan/unistim/Makefile.am
index 0142166151..8c1ea042f1 100644
--- a/plugins/unistim/Makefile.am
+++ b/plugins/epan/unistim/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = unistim
diff --git a/plugins/unistim/TODO b/plugins/epan/unistim/TODO
index 7c86c58e21..7c86c58e21 100644
--- a/plugins/unistim/TODO
+++ b/plugins/epan/unistim/TODO
diff --git a/plugins/unistim/audio.h b/plugins/epan/unistim/audio.h
index 16a6b42661..16a6b42661 100644
--- a/plugins/unistim/audio.h
+++ b/plugins/epan/unistim/audio.h
diff --git a/plugins/unistim/basic.h b/plugins/epan/unistim/basic.h
index 35835c0621..35835c0621 100644
--- a/plugins/unistim/basic.h
+++ b/plugins/epan/unistim/basic.h
diff --git a/plugins/unistim/broadcast.h b/plugins/epan/unistim/broadcast.h
index 786745b6d7..786745b6d7 100644
--- a/plugins/unistim/broadcast.h
+++ b/plugins/epan/unistim/broadcast.h
diff --git a/plugins/unistim/defines.h b/plugins/epan/unistim/defines.h
index 631ef039b4..631ef039b4 100644
--- a/plugins/unistim/defines.h
+++ b/plugins/epan/unistim/defines.h
diff --git a/plugins/unistim/display.h b/plugins/epan/unistim/display.h
index cb90c0c5f5..cb90c0c5f5 100644
--- a/plugins/unistim/display.h
+++ b/plugins/epan/unistim/display.h
diff --git a/plugins/unistim/expansion.h b/plugins/epan/unistim/expansion.h
index 954c511778..954c511778 100644
--- a/plugins/unistim/expansion.h
+++ b/plugins/epan/unistim/expansion.h
diff --git a/plugins/unistim/key.h b/plugins/epan/unistim/key.h
index f886cbfd38..f886cbfd38 100644
--- a/plugins/unistim/key.h
+++ b/plugins/epan/unistim/key.h
diff --git a/plugins/unistim/network.h b/plugins/epan/unistim/network.h
index 2fb2e63282..2fb2e63282 100644
--- a/plugins/unistim/network.h
+++ b/plugins/epan/unistim/network.h
diff --git a/plugins/unistim/packet-unistim.c b/plugins/epan/unistim/packet-unistim.c
index 70d4622d5b..70d4622d5b 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/epan/unistim/packet-unistim.c
diff --git a/plugins/unistim/packet-unistim.h b/plugins/epan/unistim/packet-unistim.h
index 7093bb0125..7093bb0125 100644
--- a/plugins/unistim/packet-unistim.h
+++ b/plugins/epan/unistim/packet-unistim.h
diff --git a/plugins/unistim/uftp.h b/plugins/epan/unistim/uftp.h
index 4752a8fd57..4752a8fd57 100644
--- a/plugins/unistim/uftp.h
+++ b/plugins/epan/unistim/uftp.h
diff --git a/plugins/wimax/AUTHORS b/plugins/epan/wimax/AUTHORS
index f7c8e66c71..f7c8e66c71 100644
--- a/plugins/wimax/AUTHORS
+++ b/plugins/epan/wimax/AUTHORS
diff --git a/plugins/wimax/CMakeLists.txt b/plugins/epan/wimax/CMakeLists.txt
index 8d7d201060..8d7d201060 100644
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/epan/wimax/CMakeLists.txt
diff --git a/plugins/wimax/Makefile.am b/plugins/epan/wimax/Makefile.am
index 82474f0053..3074a525a5 100644
--- a/plugins/wimax/Makefile.am
+++ b/plugins/epan/wimax/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = wimax
diff --git a/plugins/wimax/README.wimax b/plugins/epan/wimax/README.wimax
index 4f7981fc72..4f7981fc72 100644
--- a/plugins/wimax/README.wimax
+++ b/plugins/epan/wimax/README.wimax
diff --git a/plugins/wimax/crc.c b/plugins/epan/wimax/crc.c
index dca0e72794..dca0e72794 100644
--- a/plugins/wimax/crc.c
+++ b/plugins/epan/wimax/crc.c
diff --git a/plugins/wimax/crc.h b/plugins/epan/wimax/crc.h
index 71079ddd2e..71079ddd2e 100644
--- a/plugins/wimax/crc.h
+++ b/plugins/epan/wimax/crc.h
diff --git a/plugins/wimax/crc_data.c b/plugins/epan/wimax/crc_data.c
index 3bcf8ceb1e..3bcf8ceb1e 100644
--- a/plugins/wimax/crc_data.c
+++ b/plugins/epan/wimax/crc_data.c
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/epan/wimax/mac_hd_generic_decoder.c
index 168f1458bd..168f1458bd 100644
--- a/plugins/wimax/mac_hd_generic_decoder.c
+++ b/plugins/epan/wimax/mac_hd_generic_decoder.c
diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/epan/wimax/mac_hd_type1_decoder.c
index 50a9178710..50a9178710 100644
--- a/plugins/wimax/mac_hd_type1_decoder.c
+++ b/plugins/epan/wimax/mac_hd_type1_decoder.c
diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/epan/wimax/mac_hd_type2_decoder.c
index 4cb74c96b6..4cb74c96b6 100644
--- a/plugins/wimax/mac_hd_type2_decoder.c
+++ b/plugins/epan/wimax/mac_hd_type2_decoder.c
diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/epan/wimax/mac_mgmt_msg_decoder.c
index 2eed2e5c36..2eed2e5c36 100644
--- a/plugins/wimax/mac_mgmt_msg_decoder.c
+++ b/plugins/epan/wimax/mac_mgmt_msg_decoder.c
diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/epan/wimax/msg_aas_beam.c
index a3bfa467bf..a3bfa467bf 100644
--- a/plugins/wimax/msg_aas_beam.c
+++ b/plugins/epan/wimax/msg_aas_beam.c
diff --git a/plugins/wimax/msg_aas_fbck.c b/plugins/epan/wimax/msg_aas_fbck.c
index 311e608b48..311e608b48 100644
--- a/plugins/wimax/msg_aas_fbck.c
+++ b/plugins/epan/wimax/msg_aas_fbck.c
diff --git a/plugins/wimax/msg_arq.c b/plugins/epan/wimax/msg_arq.c
index 87e5bf8a8d..87e5bf8a8d 100644
--- a/plugins/wimax/msg_arq.c
+++ b/plugins/epan/wimax/msg_arq.c
diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/epan/wimax/msg_clk_cmp.c
index 5958bafbaf..5958bafbaf 100644
--- a/plugins/wimax/msg_clk_cmp.c
+++ b/plugins/epan/wimax/msg_clk_cmp.c
diff --git a/plugins/wimax/msg_dcd.c b/plugins/epan/wimax/msg_dcd.c
index e0e6fcb6c9..e0e6fcb6c9 100644
--- a/plugins/wimax/msg_dcd.c
+++ b/plugins/epan/wimax/msg_dcd.c
diff --git a/plugins/wimax/msg_dlmap.c b/plugins/epan/wimax/msg_dlmap.c
index 6e2a0e4352..6e2a0e4352 100644
--- a/plugins/wimax/msg_dlmap.c
+++ b/plugins/epan/wimax/msg_dlmap.c
diff --git a/plugins/wimax/msg_dreg.c b/plugins/epan/wimax/msg_dreg.c
index ec612cbbed..ec612cbbed 100644
--- a/plugins/wimax/msg_dreg.c
+++ b/plugins/epan/wimax/msg_dreg.c
diff --git a/plugins/wimax/msg_dsa.c b/plugins/epan/wimax/msg_dsa.c
index 6fb2b67ac1..6fb2b67ac1 100644
--- a/plugins/wimax/msg_dsa.c
+++ b/plugins/epan/wimax/msg_dsa.c
diff --git a/plugins/wimax/msg_dsc.c b/plugins/epan/wimax/msg_dsc.c
index 192e9f4a2a..192e9f4a2a 100644
--- a/plugins/wimax/msg_dsc.c
+++ b/plugins/epan/wimax/msg_dsc.c
diff --git a/plugins/wimax/msg_dsd.c b/plugins/epan/wimax/msg_dsd.c
index ce558df2f1..ce558df2f1 100644
--- a/plugins/wimax/msg_dsd.c
+++ b/plugins/epan/wimax/msg_dsd.c
diff --git a/plugins/wimax/msg_dsx_rvd.c b/plugins/epan/wimax/msg_dsx_rvd.c
index a6ea77eb2f..a6ea77eb2f 100644
--- a/plugins/wimax/msg_dsx_rvd.c
+++ b/plugins/epan/wimax/msg_dsx_rvd.c
diff --git a/plugins/wimax/msg_fpc.c b/plugins/epan/wimax/msg_fpc.c
index 9658ab28c4..9658ab28c4 100644
--- a/plugins/wimax/msg_fpc.c
+++ b/plugins/epan/wimax/msg_fpc.c
diff --git a/plugins/wimax/msg_pkm.c b/plugins/epan/wimax/msg_pkm.c
index d375f3d350..d375f3d350 100644
--- a/plugins/wimax/msg_pkm.c
+++ b/plugins/epan/wimax/msg_pkm.c
diff --git a/plugins/wimax/msg_pmc.c b/plugins/epan/wimax/msg_pmc.c
index 5ec213576e..5ec213576e 100644
--- a/plugins/wimax/msg_pmc.c
+++ b/plugins/epan/wimax/msg_pmc.c
diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/epan/wimax/msg_prc_lt_ctrl.c
index 38733a7ace..38733a7ace 100644
--- a/plugins/wimax/msg_prc_lt_ctrl.c
+++ b/plugins/epan/wimax/msg_prc_lt_ctrl.c
diff --git a/plugins/wimax/msg_reg_req.c b/plugins/epan/wimax/msg_reg_req.c
index 1feefbeb68..1feefbeb68 100644
--- a/plugins/wimax/msg_reg_req.c
+++ b/plugins/epan/wimax/msg_reg_req.c
diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/epan/wimax/msg_reg_rsp.c
index 6ffbfbdd58..6ffbfbdd58 100644
--- a/plugins/wimax/msg_reg_rsp.c
+++ b/plugins/epan/wimax/msg_reg_rsp.c
diff --git a/plugins/wimax/msg_rep.c b/plugins/epan/wimax/msg_rep.c
index 4b1f60ccff..4b1f60ccff 100644
--- a/plugins/wimax/msg_rep.c
+++ b/plugins/epan/wimax/msg_rep.c
diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/epan/wimax/msg_res_cmd.c
index d02164f316..d02164f316 100644
--- a/plugins/wimax/msg_res_cmd.c
+++ b/plugins/epan/wimax/msg_res_cmd.c
diff --git a/plugins/wimax/msg_rng_req.c b/plugins/epan/wimax/msg_rng_req.c
index cad39d71db..cad39d71db 100644
--- a/plugins/wimax/msg_rng_req.c
+++ b/plugins/epan/wimax/msg_rng_req.c
diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/epan/wimax/msg_rng_rsp.c
index ea85a2b9cd..ea85a2b9cd 100644
--- a/plugins/wimax/msg_rng_rsp.c
+++ b/plugins/epan/wimax/msg_rng_rsp.c
diff --git a/plugins/wimax/msg_sbc.c b/plugins/epan/wimax/msg_sbc.c
index 783aebe81a..783aebe81a 100644
--- a/plugins/wimax/msg_sbc.c
+++ b/plugins/epan/wimax/msg_sbc.c
diff --git a/plugins/wimax/msg_ucd.c b/plugins/epan/wimax/msg_ucd.c
index 985450e90e..985450e90e 100644
--- a/plugins/wimax/msg_ucd.c
+++ b/plugins/epan/wimax/msg_ucd.c
diff --git a/plugins/wimax/msg_ulmap.c b/plugins/epan/wimax/msg_ulmap.c
index 28e63fd68a..28e63fd68a 100644
--- a/plugins/wimax/msg_ulmap.c
+++ b/plugins/epan/wimax/msg_ulmap.c
diff --git a/plugins/wimax/packet-m2m.c b/plugins/epan/wimax/packet-m2m.c
index 0fa36e1ccf..0fa36e1ccf 100644
--- a/plugins/wimax/packet-m2m.c
+++ b/plugins/epan/wimax/packet-m2m.c
diff --git a/plugins/wimax/packet-wmx.c b/plugins/epan/wimax/packet-wmx.c
index 1cdbd97e82..1cdbd97e82 100644
--- a/plugins/wimax/packet-wmx.c
+++ b/plugins/epan/wimax/packet-wmx.c
diff --git a/plugins/wimax/wimax-int.h b/plugins/epan/wimax/wimax-int.h
index c22c1dd14b..c22c1dd14b 100644
--- a/plugins/wimax/wimax-int.h
+++ b/plugins/epan/wimax/wimax-int.h
diff --git a/plugins/wimax/wimax_bits.h b/plugins/epan/wimax/wimax_bits.h
index ae0ab4e3a8..ae0ab4e3a8 100644
--- a/plugins/wimax/wimax_bits.h
+++ b/plugins/epan/wimax/wimax_bits.h
diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/epan/wimax/wimax_cdma_code_decoder.c
index b9b504f8df..b9b504f8df 100644
--- a/plugins/wimax/wimax_cdma_code_decoder.c
+++ b/plugins/epan/wimax/wimax_cdma_code_decoder.c
diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c
index 4016acab6d..4016acab6d 100644
--- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c
+++ b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.c
diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.h b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h
index 49206f8550..49206f8550 100644
--- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.h
+++ b/plugins/epan/wimax/wimax_compact_dlmap_ie_decoder.h
diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c
index 0e3adfdb17..0e3adfdb17 100644
--- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c
+++ b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.c
diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.h b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h
index c83c5aa160..c83c5aa160 100644
--- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.h
+++ b/plugins/epan/wimax/wimax_compact_ulmap_ie_decoder.h
diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/epan/wimax/wimax_fch_decoder.c
index 80de85e56d..80de85e56d 100644
--- a/plugins/wimax/wimax_fch_decoder.c
+++ b/plugins/epan/wimax/wimax_fch_decoder.c
diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/epan/wimax/wimax_ffb_decoder.c
index 4e1ea997c9..4e1ea997c9 100644
--- a/plugins/wimax/wimax_ffb_decoder.c
+++ b/plugins/epan/wimax/wimax_ffb_decoder.c
diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/epan/wimax/wimax_hack_decoder.c
index db24c2b5bf..db24c2b5bf 100644
--- a/plugins/wimax/wimax_hack_decoder.c
+++ b/plugins/epan/wimax/wimax_hack_decoder.c
diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/epan/wimax/wimax_harq_map_decoder.c
index 8eaf381f25..8eaf381f25 100644
--- a/plugins/wimax/wimax_harq_map_decoder.c
+++ b/plugins/epan/wimax/wimax_harq_map_decoder.c
diff --git a/plugins/wimax/wimax_mac.h b/plugins/epan/wimax/wimax_mac.h
index b5ac72f01b..b5ac72f01b 100644
--- a/plugins/wimax/wimax_mac.h
+++ b/plugins/epan/wimax/wimax_mac.h
diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/epan/wimax/wimax_pdu_decoder.c
index d17b46288f..d17b46288f 100644
--- a/plugins/wimax/wimax_pdu_decoder.c
+++ b/plugins/epan/wimax/wimax_pdu_decoder.c
diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/epan/wimax/wimax_phy_attributes_decoder.c
index e1fa8d0bc4..e1fa8d0bc4 100644
--- a/plugins/wimax/wimax_phy_attributes_decoder.c
+++ b/plugins/epan/wimax/wimax_phy_attributes_decoder.c
diff --git a/plugins/wimax/wimax_tlv.c b/plugins/epan/wimax/wimax_tlv.c
index 2fc4738b05..2fc4738b05 100644
--- a/plugins/wimax/wimax_tlv.c
+++ b/plugins/epan/wimax/wimax_tlv.c
diff --git a/plugins/wimax/wimax_tlv.h b/plugins/epan/wimax/wimax_tlv.h
index 28bc249327..28bc249327 100644
--- a/plugins/wimax/wimax_tlv.h
+++ b/plugins/epan/wimax/wimax_tlv.h
diff --git a/plugins/wimax/wimax_utils.c b/plugins/epan/wimax/wimax_utils.c
index e1cd8cacb5..e1cd8cacb5 100644
--- a/plugins/wimax/wimax_utils.c
+++ b/plugins/epan/wimax/wimax_utils.c
diff --git a/plugins/wimax/wimax_utils.h b/plugins/epan/wimax/wimax_utils.h
index 32bb7b0921..32bb7b0921 100644
--- a/plugins/wimax/wimax_utils.h
+++ b/plugins/epan/wimax/wimax_utils.h
diff --git a/plugins/wimaxasncp/AUTHORS b/plugins/epan/wimaxasncp/AUTHORS
index 4a80a5841b..4a80a5841b 100644
--- a/plugins/wimaxasncp/AUTHORS
+++ b/plugins/epan/wimaxasncp/AUTHORS
diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/epan/wimaxasncp/CMakeLists.txt
index b2abc0ca31..b2abc0ca31 100644
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/epan/wimaxasncp/CMakeLists.txt
diff --git a/plugins/wimaxasncp/ChangeLog b/plugins/epan/wimaxasncp/ChangeLog
index dccc530513..dccc530513 100644
--- a/plugins/wimaxasncp/ChangeLog
+++ b/plugins/epan/wimaxasncp/ChangeLog
diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/epan/wimaxasncp/Makefile.am
index e7216f5b4d..c2f122c3b0 100644
--- a/plugins/wimaxasncp/Makefile.am
+++ b/plugins/epan/wimaxasncp/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = wimaxasncp
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/epan/wimaxasncp/packet-wimaxasncp.c
index ebf248cdfd..ebf248cdfd 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/epan/wimaxasncp/packet-wimaxasncp.c
diff --git a/plugins/wimaxasncp/wimaxasncp_dict.h b/plugins/epan/wimaxasncp/wimaxasncp_dict.h
index dc241a07ce..dc241a07ce 100644
--- a/plugins/wimaxasncp/wimaxasncp_dict.h
+++ b/plugins/epan/wimaxasncp/wimaxasncp_dict.h
diff --git a/plugins/wimaxasncp/wimaxasncp_dict.l b/plugins/epan/wimaxasncp/wimaxasncp_dict.l
index d5ca35f5a1..d5ca35f5a1 100644
--- a/plugins/wimaxasncp/wimaxasncp_dict.l
+++ b/plugins/epan/wimaxasncp/wimaxasncp_dict.l
diff --git a/plugins/wimaxmacphy/AUTHORS b/plugins/epan/wimaxmacphy/AUTHORS
index d67332d9b7..d67332d9b7 100644
--- a/plugins/wimaxmacphy/AUTHORS
+++ b/plugins/epan/wimaxmacphy/AUTHORS
diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/epan/wimaxmacphy/CMakeLists.txt
index 62040932c6..62040932c6 100644
--- a/plugins/wimaxmacphy/CMakeLists.txt
+++ b/plugins/epan/wimaxmacphy/CMakeLists.txt
diff --git a/plugins/wimaxmacphy/ChangeLog b/plugins/epan/wimaxmacphy/ChangeLog
index ce4f0bcc4a..ce4f0bcc4a 100644
--- a/plugins/wimaxmacphy/ChangeLog
+++ b/plugins/epan/wimaxmacphy/ChangeLog
diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/epan/wimaxmacphy/Makefile.am
index d6208fea98..3edb07567a 100644
--- a/plugins/wimaxmacphy/Makefile.am
+++ b/plugins/epan/wimaxmacphy/Makefile.am
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/Makefile.am.inc
-include ../Makefile.am.inc
+include $(top_srcdir)/plugins/Makefile.am.inc
 
 # the name of the plugin
 PLUGIN_NAME = wimaxmacphy
diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.c b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
index d872453bee..d872453bee 100644
--- a/plugins/wimaxmacphy/packet-wimaxmacphy.c
+++ b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.c
diff --git a/plugins/wimaxmacphy/packet-wimaxmacphy.h b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.h
index 97919fa0cd..97919fa0cd 100644
--- a/plugins/wimaxmacphy/packet-wimaxmacphy.h
+++ b/plugins/epan/wimaxmacphy/packet-wimaxmacphy.h