Clean up.

Remove obsolete plugin address table and related files.
Remove related targets from various makefiles.

svn path=/trunk/; revision=13787

14 files changed, 1 insertions, 2311 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 77c7571320..1df188104e 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -25,45 +25,6 @@ SUBDIRS = acn agentx artnet asn1 ciscosm docsis enttec giop gryphon irda lwres m
 
 plugindir = @plugindir@
 
-ADDRESS_EXPORT_FILES = \
-	Xass-list	\
-	Xplugin_api.c	\
-	Xplugin_api.h	\
-	Xplugin_api_decls.h	\
-	Xplugin_table.h
-
-$(ADDRESS_EXPORT_FILES): xyzzy plugin_gen.py plugin_api.c plugin_api_list.c
-	$(PYTHON) $(srcdir)/plugin_gen.py xyzzy
-
-xyzzy: xyzzyclean plugin_api_list.c
-	gcc -aux-info xyzzy -DHAVE_CONFIG_H $(GLIB_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -c $(srcdir)/plugin_api_list.c
-
-xyzzyclean: clean 
-	rm -f xyzzy Xass-list Xplugin_api.c Xplugin_api.h Xplugin_api_decls.h Xplugin_table.h plugin_api_list.o
 
 EXTRA_DIST = \
-	plugin_api.c	\
-	plugin_api.h	\
-	plugin_api_decls.h	\
-	plugin_api_defs.h	\
-	plugin_api_list.c	\
-	plugin_gen.py	\
-	plugin_table.h	\
-	Makefile.nmake	\
-	README.interface	\
-	Xass-list	\
-	Xplugin_api.c	\
-	Xplugin_api.h	\
-	Xplugin_api_decls.h	\
-	Xplugin_table.h
-
-DISTCLEANFILES = \
-	Xass-list	\
-	Xplugin_api.c	\
-	Xplugin_api.h	\
-	Xplugin_api_decls.h	\
-	Xplugin_table.h	\
-	xyzzy
-
-CLEANFILES = \
-	plugin_api_list.o
+	Makefile.nmake
diff --git a/plugins/README.interface b/plugins/README.interface
deleted file mode 100644
index 00fa3da24f..0000000000
--- a/plugins/README.interface
+++ /dev/null
@@ -1,37 +0,0 @@
-README.interface
-
-The following will export addresses from ethereal to the plugins. You
-will have to do this, e.g. if you want to use a function of ethereal inside 
-your plugin.
-If you need it the other way round (e.g. use symbols of your plugin inside of 
-ethereal's gtk part), you only have to edit libethereal.def and nothing more.
-(XXX - is this libethereal.def description correct?)
-
-
-When developing a plugin in the Win32 world, it is nessecary
-to explicitly export addresses from the main process to the
-plugin.  ethereal does have a mechanism for this, and it uses
-the file 'plugin_api_list.c' to list declarations for everything
-that needs to be exported.
-
-The build process of ethereal needs this list in 5 different forms.
-
-These are generated by a Python script and saved in the X* files
-in this directory.
-
-I do not have a real C parser in Python to read the input file...,
-so I have used 'gcc -aux-info xyzzy ...' to clean up any formatting
-preferences in the input file and create the file named 'xyzzy'
-that contains a neatly formatted list of declarations.  This list
-can be parsed with a regular expression to extract the required
-info.
-
-Use the following procedure to update the symbols:
-
-edit the plugin_api_list.c file
-nmake -f Makefile.nmake xyzzy
-nmake -f Makefile.nmake
-
-The 'xyzzy' makefile target is the only target that depends on gcc.
-This can be done on a Unix machine or you can use cygwin gcc.
-
diff --git a/plugins/Xass-list b/plugins/Xass-list
deleted file mode 100644
index e3b79c755a..0000000000
--- a/plugins/Xass-list
+++ /dev/null
@@ -1,97 +0,0 @@
-/* This file is generated by plugin_gen.py, do not edit. */
-
-check_col, col_clear, col_add_fstr, col_append_fstr, col_prepend_fstr,
-col_add_str, col_append_str, col_set_str, register_init_routine,
-register_postseq_cleanup_routine, match_strval, val_to_str, conversation_new,
-find_conversation, conversation_set_dissector, proto_register_protocol,
-proto_register_field_array, proto_register_subtree_array, dissector_add,
-dissector_delete, dissector_add_handle, heur_dissector_add, register_dissector,
-find_dissector, create_dissector_handle, call_dissector, tcp_dissect_pdus,
-proto_is_protocol_enabled, proto_item_get_len, proto_item_set_len,
-proto_item_set_text, proto_item_append_text, proto_item_add_subtree,
-proto_tree_add_item, proto_tree_add_item_hidden, proto_tree_add_protocol_format,
-proto_tree_add_bytes, proto_tree_add_bytes_hidden, proto_tree_add_bytes_format,
-proto_tree_add_time, proto_tree_add_time_hidden, proto_tree_add_time_format,
-proto_tree_add_ipxnet, proto_tree_add_ipxnet_hidden, proto_tree_add_ipxnet_format,
-proto_tree_add_ipv4, proto_tree_add_ipv4_hidden, proto_tree_add_ipv4_format,
-proto_tree_add_ipv6, proto_tree_add_ipv6_hidden, proto_tree_add_ipv6_format,
-proto_tree_add_ether, proto_tree_add_ether_hidden, proto_tree_add_ether_format,
-proto_tree_add_string, proto_tree_add_string_hidden, proto_tree_add_string_format,
-proto_tree_add_boolean, proto_tree_add_boolean_hidden, proto_tree_add_boolean_format,
-proto_tree_add_double, proto_tree_add_double_hidden, proto_tree_add_double_format,
-proto_tree_add_uint, proto_tree_add_uint_hidden, proto_tree_add_uint_format,
-proto_tree_add_int, proto_tree_add_int_hidden, proto_tree_add_int_format,
-proto_tree_add_text, tvb_new_subset, tvb_set_free_cb, tvb_set_child_real_data_tvbuff,
-tvb_new_real_data, tvb_length, tvb_length_remaining, tvb_bytes_exist,
-tvb_offset_exists, tvb_reported_length, tvb_reported_length_remaining,
-tvb_get_guint8, tvb_get_ntohs, tvb_get_ntoh24, tvb_get_ntohl,
-tvb_get_letohs, tvb_get_letoh24, tvb_get_letohl, tvb_memcpy,
-tvb_memdup, tvb_get_ptr, tvb_find_guint8, tvb_pbrk_guint8, tvb_strnlen,
-tvb_format_text, tvb_get_nstringz, tvb_get_nstringz0, tvb_find_line_end,
-tvb_find_line_end_unquoted, tvb_strneql, tvb_strncaseeql, tvb_bytes_to_str,
-prefs_register_protocol, prefs_register_uint_preference, prefs_register_bool_preference,
-prefs_register_enum_preference, prefs_register_string_preference,
-register_giop_user, is_big_endian, get_CDR_encap_info, get_CDR_any,
-get_CDR_boolean, get_CDR_char, get_CDR_double, get_CDR_enum,
-get_CDR_fixed, get_CDR_float, get_CDR_interface, get_CDR_long,
-get_CDR_object, get_CDR_octet, get_CDR_octet_seq, get_CDR_short,
-get_CDR_string, get_CDR_typeCode, get_CDR_ulong, get_CDR_ushort,
-get_CDR_wchar, get_CDR_wstring, is_tpkt, dissect_tpkt_encap,
-set_actual_length, decode_boolean_bitfield, decode_numeric_bitfield,
-decode_enumerated_bitfield, register_dissector_table, except_throw,
-dissector_try_port, conversation_add_proto_data, conversation_get_proto_data,
-conversation_delete_proto_data, p_add_proto_data, p_get_proto_data,
-ip_to_str, ip6_to_str, time_secs_to_str, time_msecs_to_str, abs_time_to_str,
-proto_get_id_by_filter_name, proto_get_protocol_name, proto_get_protocol_short_name,
-proto_get_protocol_filter_name, prefs_register_obsolete_preference,
-add_new_data_source, fragment_table_init, reassembled_table_init,
-fragment_add, fragment_add_seq, fragment_add_seq_check, fragment_add_seq_next,
-fragment_get, fragment_set_tot_len, fragment_get_tot_len, fragment_set_partial_reassembly,
-fragment_delete, show_fragment_tree, show_fragment_seq_tree,
-register_tap, tap_queue_packet, asn1_open, asn1_close, asn1_octet_decode,
-asn1_tag_decode, asn1_id_decode, asn1_length_decode, asn1_header_decode,
-asn1_eoc, asn1_eoc_decode, asn1_null_decode, asn1_bool_decode,
-asn1_int32_value_decode, asn1_int32_decode, asn1_uint32_value_decode,
-asn1_uint32_decode, asn1_bits_decode, asn1_string_value_decode,
-asn1_string_decode, asn1_octet_string_decode, asn1_subid_decode,
-asn1_oid_value_decode, asn1_oid_decode, asn1_sequence_decode,
-asn1_err_to_str, proto_item_set_end, proto_tree_add_none_format,
-except_init, except_deinit, except_rethrow, except_throwd, except_throwf,
-except_unhandled_catcher, except_take_data, except_set_allocator,
-except_alloc, except_free, except_pop, except_setup_try, col_set_fence,
-tvb_get_string, tvb_get_stringz, find_dissector_table, dissector_get_port_handle,
-dissector_handle_get_short_name, dissector_handle_get_protocol_index,
-new_register_dissector, new_create_dissector_handle, register_giop_user_module,
-dissect_per_GeneralString, dissect_per_sequence_of, dissect_per_IA5String,
-dissect_per_NumericString, dissect_per_PrintableString, dissect_per_BMPString,
-dissect_per_constrained_sequence_of, dissect_per_constrained_set_of,
-dissect_per_set_of, dissect_per_object_identifier, dissect_per_boolean,
-dissect_per_integer, dissect_per_constrained_integer, dissect_per_choice,
-dissect_per_sequence, dissect_per_octet_string, dissect_per_restricted_character_string,
-dissector_add_string, dissector_delete_string, dissector_change_string,
-dissector_reset_string, dissector_try_string, dissector_get_string_handle,
-get_datafile_path, get_tempfile_path, register_heur_dissector_list,
-dissector_try_heuristic, asn1_id_decode1, col_get_writable, col_set_writable,
-decode_enumerated_bitfield_shifted, dissect_xdlc_control, find_protocol_by_id,
-tvb_strsize, report_open_failure, report_read_failure, dissect_per_bit_string,
-dissect_ber_identifier, dissect_ber_length, dissect_ber_integer,
-dissect_ber_boolean, dissect_ber_choice, dissect_ber_GeneralizedTime,
-dissect_ber_sequence, dissect_ber_sequence_of, dissect_ber_set_of,
-dissect_ber_octet_string, dissect_ber_bitstring, dissect_ber_restricted_string,
-dissect_ber_object_identifier, get_ber_identifier, get_ber_length,
-proto_item_get_subtree, proto_tree_get_parent, proto_item_get_parent,
-proto_item_get_parent_nth, get_ber_last_created_item, report_failure,
-rpc_init_proc_table, rpc_init_prog, rpc_prog_name, rpc_proc_name,
-rpc_prog_hf, rpc_roundup, dissect_rpc_bool, dissect_rpc_string,
-dissect_rpc_opaque_data, dissect_rpc_data, dissect_rpc_bytes,
-dissect_rpc_list, dissect_rpc_array, dissect_rpc_uint32, dissect_rpc_uint64,
-dissect_rpc_indir_call, dissect_rpc_indir_reply, crc16_ccitt_tvb,
-tvb_get_letoh64, tvb_get_ntoh64, proto_tree_add_float, proto_tree_add_float_hidden,
-proto_tree_add_float_format, tvb_get_ntohieee_float, tvb_get_ntohieee_double,
-tvb_get_letohieee_float, tvb_get_letohieee_double, proto_tree_add_debug_text,
-rtp_add_address, rtcp_add_address, register_tap_listener, get_datafile_dir,
-proto_registrar_get_abbrev, proto_registrar_get_byname, fvalue_get_floating,
-fvalue_to_string_repr, fvalue_get_integer, dissect_dcerpc_uint8,
-dissect_dcerpc_uint16, dissect_dcerpc_uint32, dissect_dcerpc_uuid_t,
-dcerpc_init_uuid, dissect_ndr_uint32, proto_tree_add_uint64,
-
diff --git a/plugins/Xplugin_api.c b/plugins/Xplugin_api.c
deleted file mode 100644
index f14bd85fbb..0000000000
--- a/plugins/Xplugin_api.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/* This file is generated by plugin_gen.py, do not edit. */
-
-p_check_col = pat->p_check_col;
-p_col_clear = pat->p_col_clear;
-p_col_add_fstr = pat->p_col_add_fstr;
-p_col_append_fstr = pat->p_col_append_fstr;
-p_col_prepend_fstr = pat->p_col_prepend_fstr;
-p_col_add_str = pat->p_col_add_str;
-p_col_append_str = pat->p_col_append_str;
-p_col_set_str = pat->p_col_set_str;
-p_register_init_routine = pat->p_register_init_routine;
-p_register_postseq_cleanup_routine = pat->p_register_postseq_cleanup_routine;
-p_match_strval = pat->p_match_strval;
-p_val_to_str = pat->p_val_to_str;
-p_conversation_new = pat->p_conversation_new;
-p_find_conversation = pat->p_find_conversation;
-p_conversation_set_dissector = pat->p_conversation_set_dissector;
-p_proto_register_protocol = pat->p_proto_register_protocol;
-p_proto_register_field_array = pat->p_proto_register_field_array;
-p_proto_register_subtree_array = pat->p_proto_register_subtree_array;
-p_dissector_add = pat->p_dissector_add;
-p_dissector_delete = pat->p_dissector_delete;
-p_dissector_add_handle = pat->p_dissector_add_handle;
-p_heur_dissector_add = pat->p_heur_dissector_add;
-p_register_dissector = pat->p_register_dissector;
-p_find_dissector = pat->p_find_dissector;
-p_create_dissector_handle = pat->p_create_dissector_handle;
-p_call_dissector = pat->p_call_dissector;
-p_tcp_dissect_pdus = pat->p_tcp_dissect_pdus;
-p_proto_is_protocol_enabled = pat->p_proto_is_protocol_enabled;
-p_proto_item_get_len = pat->p_proto_item_get_len;
-p_proto_item_set_len = pat->p_proto_item_set_len;
-p_proto_item_set_text = pat->p_proto_item_set_text;
-p_proto_item_append_text = pat->p_proto_item_append_text;
-p_proto_item_add_subtree = pat->p_proto_item_add_subtree;
-p_proto_tree_add_item = pat->p_proto_tree_add_item;
-p_proto_tree_add_item_hidden = pat->p_proto_tree_add_item_hidden;
-p_proto_tree_add_protocol_format = pat->p_proto_tree_add_protocol_format;
-p_proto_tree_add_bytes = pat->p_proto_tree_add_bytes;
-p_proto_tree_add_bytes_hidden = pat->p_proto_tree_add_bytes_hidden;
-p_proto_tree_add_bytes_format = pat->p_proto_tree_add_bytes_format;
-p_proto_tree_add_time = pat->p_proto_tree_add_time;
-p_proto_tree_add_time_hidden = pat->p_proto_tree_add_time_hidden;
-p_proto_tree_add_time_format = pat->p_proto_tree_add_time_format;
-p_proto_tree_add_ipxnet = pat->p_proto_tree_add_ipxnet;
-p_proto_tree_add_ipxnet_hidden = pat->p_proto_tree_add_ipxnet_hidden;
-p_proto_tree_add_ipxnet_format = pat->p_proto_tree_add_ipxnet_format;
-p_proto_tree_add_ipv4 = pat->p_proto_tree_add_ipv4;
-p_proto_tree_add_ipv4_hidden = pat->p_proto_tree_add_ipv4_hidden;
-p_proto_tree_add_ipv4_format = pat->p_proto_tree_add_ipv4_format;
-p_proto_tree_add_ipv6 = pat->p_proto_tree_add_ipv6;
-p_proto_tree_add_ipv6_hidden = pat->p_proto_tree_add_ipv6_hidden;
-p_proto_tree_add_ipv6_format = pat->p_proto_tree_add_ipv6_format;
-p_proto_tree_add_ether = pat->p_proto_tree_add_ether;
-p_proto_tree_add_ether_hidden = pat->p_proto_tree_add_ether_hidden;
-p_proto_tree_add_ether_format = pat->p_proto_tree_add_ether_format;
-p_proto_tree_add_string = pat->p_proto_tree_add_string;
-p_proto_tree_add_string_hidden = pat->p_proto_tree_add_string_hidden;
-p_proto_tree_add_string_format = pat->p_proto_tree_add_string_format;
-p_proto_tree_add_boolean = pat->p_proto_tree_add_boolean;
-p_proto_tree_add_boolean_hidden = pat->p_proto_tree_add_boolean_hidden;
-p_proto_tree_add_boolean_format = pat->p_proto_tree_add_boolean_format;
-p_proto_tree_add_double = pat->p_proto_tree_add_double;
-p_proto_tree_add_double_hidden = pat->p_proto_tree_add_double_hidden;
-p_proto_tree_add_double_format = pat->p_proto_tree_add_double_format;
-p_proto_tree_add_uint = pat->p_proto_tree_add_uint;
-p_proto_tree_add_uint_hidden = pat->p_proto_tree_add_uint_hidden;
-p_proto_tree_add_uint_format = pat->p_proto_tree_add_uint_format;
-p_proto_tree_add_int = pat->p_proto_tree_add_int;
-p_proto_tree_add_int_hidden = pat->p_proto_tree_add_int_hidden;
-p_proto_tree_add_int_format = pat->p_proto_tree_add_int_format;
-p_proto_tree_add_text = pat->p_proto_tree_add_text;
-p_tvb_new_subset = pat->p_tvb_new_subset;
-p_tvb_set_free_cb = pat->p_tvb_set_free_cb;
-p_tvb_set_child_real_data_tvbuff = pat->p_tvb_set_child_real_data_tvbuff;
-p_tvb_new_real_data = pat->p_tvb_new_real_data;
-p_tvb_length = pat->p_tvb_length;
-p_tvb_length_remaining = pat->p_tvb_length_remaining;
-p_tvb_bytes_exist = pat->p_tvb_bytes_exist;
-p_tvb_offset_exists = pat->p_tvb_offset_exists;
-p_tvb_reported_length = pat->p_tvb_reported_length;
-p_tvb_reported_length_remaining = pat->p_tvb_reported_length_remaining;
-p_tvb_get_guint8 = pat->p_tvb_get_guint8;
-p_tvb_get_ntohs = pat->p_tvb_get_ntohs;
-p_tvb_get_ntoh24 = pat->p_tvb_get_ntoh24;
-p_tvb_get_ntohl = pat->p_tvb_get_ntohl;
-p_tvb_get_letohs = pat->p_tvb_get_letohs;
-p_tvb_get_letoh24 = pat->p_tvb_get_letoh24;
-p_tvb_get_letohl = pat->p_tvb_get_letohl;
-p_tvb_memcpy = pat->p_tvb_memcpy;
-p_tvb_memdup = pat->p_tvb_memdup;
-p_tvb_get_ptr = pat->p_tvb_get_ptr;
-p_tvb_find_guint8 = pat->p_tvb_find_guint8;
-p_tvb_pbrk_guint8 = pat->p_tvb_pbrk_guint8;
-p_tvb_strnlen = pat->p_tvb_strnlen;
-p_tvb_format_text = pat->p_tvb_format_text;
-p_tvb_get_nstringz = pat->p_tvb_get_nstringz;
-p_tvb_get_nstringz0 = pat->p_tvb_get_nstringz0;
-p_tvb_find_line_end = pat->p_tvb_find_line_end;
-p_tvb_find_line_end_unquoted = pat->p_tvb_find_line_end_unquoted;
-p_tvb_strneql = pat->p_tvb_strneql;
-p_tvb_strncaseeql = pat->p_tvb_strncaseeql;
-p_tvb_bytes_to_str = pat->p_tvb_bytes_to_str;
-p_prefs_register_protocol = pat->p_prefs_register_protocol;
-p_prefs_register_uint_preference = pat->p_prefs_register_uint_preference;
-p_prefs_register_bool_preference = pat->p_prefs_register_bool_preference;
-p_prefs_register_enum_preference = pat->p_prefs_register_enum_preference;
-p_prefs_register_string_preference = pat->p_prefs_register_string_preference;
-p_register_giop_user = pat->p_register_giop_user;
-p_is_big_endian = pat->p_is_big_endian;
-p_get_CDR_encap_info = pat->p_get_CDR_encap_info;
-p_get_CDR_any = pat->p_get_CDR_any;
-p_get_CDR_boolean = pat->p_get_CDR_boolean;
-p_get_CDR_char = pat->p_get_CDR_char;
-p_get_CDR_double = pat->p_get_CDR_double;
-p_get_CDR_enum = pat->p_get_CDR_enum;
-p_get_CDR_fixed = pat->p_get_CDR_fixed;
-p_get_CDR_float = pat->p_get_CDR_float;
-p_get_CDR_interface = pat->p_get_CDR_interface;
-p_get_CDR_long = pat->p_get_CDR_long;
-p_get_CDR_object = pat->p_get_CDR_object;
-p_get_CDR_octet = pat->p_get_CDR_octet;
-p_get_CDR_octet_seq = pat->p_get_CDR_octet_seq;
-p_get_CDR_short = pat->p_get_CDR_short;
-p_get_CDR_string = pat->p_get_CDR_string;
-p_get_CDR_typeCode = pat->p_get_CDR_typeCode;
-p_get_CDR_ulong = pat->p_get_CDR_ulong;
-p_get_CDR_ushort = pat->p_get_CDR_ushort;
-p_get_CDR_wchar = pat->p_get_CDR_wchar;
-p_get_CDR_wstring = pat->p_get_CDR_wstring;
-p_is_tpkt = pat->p_is_tpkt;
-p_dissect_tpkt_encap = pat->p_dissect_tpkt_encap;
-p_set_actual_length = pat->p_set_actual_length;
-p_decode_boolean_bitfield = pat->p_decode_boolean_bitfield;
-p_decode_numeric_bitfield = pat->p_decode_numeric_bitfield;
-p_decode_enumerated_bitfield = pat->p_decode_enumerated_bitfield;
-p_register_dissector_table = pat->p_register_dissector_table;
-p_except_throw = pat->p_except_throw;
-p_dissector_try_port = pat->p_dissector_try_port;
-p_conversation_add_proto_data = pat->p_conversation_add_proto_data;
-p_conversation_get_proto_data = pat->p_conversation_get_proto_data;
-p_conversation_delete_proto_data = pat->p_conversation_delete_proto_data;
-p_p_add_proto_data = pat->p_p_add_proto_data;
-p_p_get_proto_data = pat->p_p_get_proto_data;
-p_ip_to_str = pat->p_ip_to_str;
-p_ip6_to_str = pat->p_ip6_to_str;
-p_time_secs_to_str = pat->p_time_secs_to_str;
-p_time_msecs_to_str = pat->p_time_msecs_to_str;
-p_abs_time_to_str = pat->p_abs_time_to_str;
-p_proto_get_id_by_filter_name = pat->p_proto_get_id_by_filter_name;
-p_proto_get_protocol_name = pat->p_proto_get_protocol_name;
-p_proto_get_protocol_short_name = pat->p_proto_get_protocol_short_name;
-p_proto_get_protocol_filter_name = pat->p_proto_get_protocol_filter_name;
-p_prefs_register_obsolete_preference = pat->p_prefs_register_obsolete_preference;
-p_add_new_data_source = pat->p_add_new_data_source;
-p_fragment_table_init = pat->p_fragment_table_init;
-p_reassembled_table_init = pat->p_reassembled_table_init;
-p_fragment_add = pat->p_fragment_add;
-p_fragment_add_seq = pat->p_fragment_add_seq;
-p_fragment_add_seq_check = pat->p_fragment_add_seq_check;
-p_fragment_add_seq_next = pat->p_fragment_add_seq_next;
-p_fragment_get = pat->p_fragment_get;
-p_fragment_set_tot_len = pat->p_fragment_set_tot_len;
-p_fragment_get_tot_len = pat->p_fragment_get_tot_len;
-p_fragment_set_partial_reassembly = pat->p_fragment_set_partial_reassembly;
-p_fragment_delete = pat->p_fragment_delete;
-p_show_fragment_tree = pat->p_show_fragment_tree;
-p_show_fragment_seq_tree = pat->p_show_fragment_seq_tree;
-p_register_tap = pat->p_register_tap;
-p_tap_queue_packet = pat->p_tap_queue_packet;
-p_asn1_open = pat->p_asn1_open;
-p_asn1_close = pat->p_asn1_close;
-p_asn1_octet_decode = pat->p_asn1_octet_decode;
-p_asn1_tag_decode = pat->p_asn1_tag_decode;
-p_asn1_id_decode = pat->p_asn1_id_decode;
-p_asn1_length_decode = pat->p_asn1_length_decode;
-p_asn1_header_decode = pat->p_asn1_header_decode;
-p_asn1_eoc = pat->p_asn1_eoc;
-p_asn1_eoc_decode = pat->p_asn1_eoc_decode;
-p_asn1_null_decode = pat->p_asn1_null_decode;
-p_asn1_bool_decode = pat->p_asn1_bool_decode;
-p_asn1_int32_value_decode = pat->p_asn1_int32_value_decode;
-p_asn1_int32_decode = pat->p_asn1_int32_decode;
-p_asn1_uint32_value_decode = pat->p_asn1_uint32_value_decode;
-p_asn1_uint32_decode = pat->p_asn1_uint32_decode;
-p_asn1_bits_decode = pat->p_asn1_bits_decode;
-p_asn1_string_value_decode = pat->p_asn1_string_value_decode;
-p_asn1_string_decode = pat->p_asn1_string_decode;
-p_asn1_octet_string_decode = pat->p_asn1_octet_string_decode;
-p_asn1_subid_decode = pat->p_asn1_subid_decode;
-p_asn1_oid_value_decode = pat->p_asn1_oid_value_decode;
-p_asn1_oid_decode = pat->p_asn1_oid_decode;
-p_asn1_sequence_decode = pat->p_asn1_sequence_decode;
-p_asn1_err_to_str = pat->p_asn1_err_to_str;
-p_proto_item_set_end = pat->p_proto_item_set_end;
-p_proto_tree_add_none_format = pat->p_proto_tree_add_none_format;
-p_except_init = pat->p_except_init;
-p_except_deinit = pat->p_except_deinit;
-p_except_rethrow = pat->p_except_rethrow;
-p_except_throwd = pat->p_except_throwd;
-p_except_throwf = pat->p_except_throwf;
-p_except_unhandled_catcher = pat->p_except_unhandled_catcher;
-p_except_take_data = pat->p_except_take_data;
-p_except_set_allocator = pat->p_except_set_allocator;
-p_except_alloc = pat->p_except_alloc;
-p_except_free = pat->p_except_free;
-p_except_pop = pat->p_except_pop;
-p_except_setup_try = pat->p_except_setup_try;
-p_col_set_fence = pat->p_col_set_fence;
-p_tvb_get_string = pat->p_tvb_get_string;
-p_tvb_get_stringz = pat->p_tvb_get_stringz;
-p_find_dissector_table = pat->p_find_dissector_table;
-p_dissector_get_port_handle = pat->p_dissector_get_port_handle;
-p_dissector_handle_get_short_name = pat->p_dissector_handle_get_short_name;
-p_dissector_handle_get_protocol_index = pat->p_dissector_handle_get_protocol_index;
-p_new_register_dissector = pat->p_new_register_dissector;
-p_new_create_dissector_handle = pat->p_new_create_dissector_handle;
-p_register_giop_user_module = pat->p_register_giop_user_module;
-p_dissect_per_GeneralString = pat->p_dissect_per_GeneralString;
-p_dissect_per_sequence_of = pat->p_dissect_per_sequence_of;
-p_dissect_per_IA5String = pat->p_dissect_per_IA5String;
-p_dissect_per_NumericString = pat->p_dissect_per_NumericString;
-p_dissect_per_PrintableString = pat->p_dissect_per_PrintableString;
-p_dissect_per_BMPString = pat->p_dissect_per_BMPString;
-p_dissect_per_constrained_sequence_of = pat->p_dissect_per_constrained_sequence_of;
-p_dissect_per_constrained_set_of = pat->p_dissect_per_constrained_set_of;
-p_dissect_per_set_of = pat->p_dissect_per_set_of;
-p_dissect_per_object_identifier = pat->p_dissect_per_object_identifier;
-p_dissect_per_boolean = pat->p_dissect_per_boolean;
-p_dissect_per_integer = pat->p_dissect_per_integer;
-p_dissect_per_constrained_integer = pat->p_dissect_per_constrained_integer;
-p_dissect_per_choice = pat->p_dissect_per_choice;
-p_dissect_per_sequence = pat->p_dissect_per_sequence;
-p_dissect_per_octet_string = pat->p_dissect_per_octet_string;
-p_dissect_per_restricted_character_string = pat->p_dissect_per_restricted_character_string;
-p_dissector_add_string = pat->p_dissector_add_string;
-p_dissector_delete_string = pat->p_dissector_delete_string;
-p_dissector_change_string = pat->p_dissector_change_string;
-p_dissector_reset_string = pat->p_dissector_reset_string;
-p_dissector_try_string = pat->p_dissector_try_string;
-p_dissector_get_string_handle = pat->p_dissector_get_string_handle;
-p_get_datafile_path = pat->p_get_datafile_path;
-p_get_tempfile_path = pat->p_get_tempfile_path;
-p_register_heur_dissector_list = pat->p_register_heur_dissector_list;
-p_dissector_try_heuristic = pat->p_dissector_try_heuristic;
-p_asn1_id_decode1 = pat->p_asn1_id_decode1;
-p_col_get_writable = pat->p_col_get_writable;
-p_col_set_writable = pat->p_col_set_writable;
-p_decode_enumerated_bitfield_shifted = pat->p_decode_enumerated_bitfield_shifted;
-p_dissect_xdlc_control = pat->p_dissect_xdlc_control;
-p_find_protocol_by_id = pat->p_find_protocol_by_id;
-p_tvb_strsize = pat->p_tvb_strsize;
-p_report_open_failure = pat->p_report_open_failure;
-p_report_read_failure = pat->p_report_read_failure;
-p_dissect_per_bit_string = pat->p_dissect_per_bit_string;
-p_dissect_ber_identifier = pat->p_dissect_ber_identifier;
-p_dissect_ber_length = pat->p_dissect_ber_length;
-p_dissect_ber_integer = pat->p_dissect_ber_integer;
-p_dissect_ber_boolean = pat->p_dissect_ber_boolean;
-p_dissect_ber_choice = pat->p_dissect_ber_choice;
-p_dissect_ber_GeneralizedTime = pat->p_dissect_ber_GeneralizedTime;
-p_dissect_ber_sequence = pat->p_dissect_ber_sequence;
-p_dissect_ber_sequence_of = pat->p_dissect_ber_sequence_of;
-p_dissect_ber_set_of = pat->p_dissect_ber_set_of;
-p_dissect_ber_octet_string = pat->p_dissect_ber_octet_string;
-p_dissect_ber_bitstring = pat->p_dissect_ber_bitstring;
-p_dissect_ber_restricted_string = pat->p_dissect_ber_restricted_string;
-p_dissect_ber_object_identifier = pat->p_dissect_ber_object_identifier;
-p_get_ber_identifier = pat->p_get_ber_identifier;
-p_get_ber_length = pat->p_get_ber_length;
-p_proto_item_get_subtree = pat->p_proto_item_get_subtree;
-p_proto_tree_get_parent = pat->p_proto_tree_get_parent;
-p_proto_item_get_parent = pat->p_proto_item_get_parent;
-p_proto_item_get_parent_nth = pat->p_proto_item_get_parent_nth;
-p_get_ber_last_created_item = pat->p_get_ber_last_created_item;
-p_report_failure = pat->p_report_failure;
-p_rpc_init_proc_table = pat->p_rpc_init_proc_table;
-p_rpc_init_prog = pat->p_rpc_init_prog;
-p_rpc_prog_name = pat->p_rpc_prog_name;
-p_rpc_proc_name = pat->p_rpc_proc_name;
-p_rpc_prog_hf = pat->p_rpc_prog_hf;
-p_rpc_roundup = pat->p_rpc_roundup;
-p_dissect_rpc_bool = pat->p_dissect_rpc_bool;
-p_dissect_rpc_string = pat->p_dissect_rpc_string;
-p_dissect_rpc_opaque_data = pat->p_dissect_rpc_opaque_data;
-p_dissect_rpc_data = pat->p_dissect_rpc_data;
-p_dissect_rpc_bytes = pat->p_dissect_rpc_bytes;
-p_dissect_rpc_list = pat->p_dissect_rpc_list;
-p_dissect_rpc_array = pat->p_dissect_rpc_array;
-p_dissect_rpc_uint32 = pat->p_dissect_rpc_uint32;
-p_dissect_rpc_uint64 = pat->p_dissect_rpc_uint64;
-p_dissect_rpc_indir_call = pat->p_dissect_rpc_indir_call;
-p_dissect_rpc_indir_reply = pat->p_dissect_rpc_indir_reply;
-p_crc16_ccitt_tvb = pat->p_crc16_ccitt_tvb;
-p_tvb_get_letoh64 = pat->p_tvb_get_letoh64;
-p_tvb_get_ntoh64 = pat->p_tvb_get_ntoh64;
-p_proto_tree_add_float = pat->p_proto_tree_add_float;
-p_proto_tree_add_float_hidden = pat->p_proto_tree_add_float_hidden;
-p_proto_tree_add_float_format = pat->p_proto_tree_add_float_format;
-p_tvb_get_ntohieee_float = pat->p_tvb_get_ntohieee_float;
-p_tvb_get_ntohieee_double = pat->p_tvb_get_ntohieee_double;
-p_tvb_get_letohieee_float = pat->p_tvb_get_letohieee_float;
-p_tvb_get_letohieee_double = pat->p_tvb_get_letohieee_double;
-p_proto_tree_add_debug_text = pat->p_proto_tree_add_debug_text;
-p_rtp_add_address = pat->p_rtp_add_address;
-p_rtcp_add_address = pat->p_rtcp_add_address;
-p_register_tap_listener = pat->p_register_tap_listener;
-p_get_datafile_dir = pat->p_get_datafile_dir;
-p_proto_registrar_get_abbrev = pat->p_proto_registrar_get_abbrev;
-p_proto_registrar_get_byname = pat->p_proto_registrar_get_byname;
-p_fvalue_get_floating = pat->p_fvalue_get_floating;
-p_fvalue_to_string_repr = pat->p_fvalue_to_string_repr;
-p_fvalue_get_integer = pat->p_fvalue_get_integer;
-p_dissect_dcerpc_uint8 = pat->p_dissect_dcerpc_uint8;
-p_dissect_dcerpc_uint16 = pat->p_dissect_dcerpc_uint16;
-p_dissect_dcerpc_uint32 = pat->p_dissect_dcerpc_uint32;
-p_dissect_dcerpc_uuid_t = pat->p_dissect_dcerpc_uuid_t;
-p_dcerpc_init_uuid = pat->p_dcerpc_init_uuid;
-p_dissect_ndr_uint32 = pat->p_dissect_ndr_uint32;
-p_proto_tree_add_uint64 = pat->p_proto_tree_add_uint64;
diff --git a/plugins/Xplugin_api.h b/plugins/Xplugin_api.h
deleted file mode 100644
index 36c2804422..0000000000
--- a/plugins/Xplugin_api.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/* This file is generated by plugin_gen.py, do not edit. */
-
-#define check_col (*p_check_col)
-#define col_clear (*p_col_clear)
-#define col_add_fstr (*p_col_add_fstr)
-#define col_append_fstr (*p_col_append_fstr)
-#define col_prepend_fstr (*p_col_prepend_fstr)
-#define col_add_str (*p_col_add_str)
-#define col_append_str (*p_col_append_str)
-#define col_set_str (*p_col_set_str)
-#define register_init_routine (*p_register_init_routine)
-#define register_postseq_cleanup_routine (*p_register_postseq_cleanup_routine)
-#define match_strval (*p_match_strval)
-#define val_to_str (*p_val_to_str)
-#define conversation_new (*p_conversation_new)
-#define find_conversation (*p_find_conversation)
-#define conversation_set_dissector (*p_conversation_set_dissector)
-#define proto_register_protocol (*p_proto_register_protocol)
-#define proto_register_field_array (*p_proto_register_field_array)
-#define proto_register_subtree_array (*p_proto_register_subtree_array)
-#define dissector_add (*p_dissector_add)
-#define dissector_delete (*p_dissector_delete)
-#define dissector_add_handle (*p_dissector_add_handle)
-#define heur_dissector_add (*p_heur_dissector_add)
-#define register_dissector (*p_register_dissector)
-#define find_dissector (*p_find_dissector)
-#define create_dissector_handle (*p_create_dissector_handle)
-#define call_dissector (*p_call_dissector)
-#define tcp_dissect_pdus (*p_tcp_dissect_pdus)
-#define proto_is_protocol_enabled (*p_proto_is_protocol_enabled)
-#define proto_item_get_len (*p_proto_item_get_len)
-#define proto_item_set_len (*p_proto_item_set_len)
-#define proto_item_set_text (*p_proto_item_set_text)
-#define proto_item_append_text (*p_proto_item_append_text)
-#define proto_item_add_subtree (*p_proto_item_add_subtree)
-#define proto_tree_add_item (*p_proto_tree_add_item)
-#define proto_tree_add_item_hidden (*p_proto_tree_add_item_hidden)
-#define proto_tree_add_protocol_format (*p_proto_tree_add_protocol_format)
-#define proto_tree_add_bytes (*p_proto_tree_add_bytes)
-#define proto_tree_add_bytes_hidden (*p_proto_tree_add_bytes_hidden)
-#define proto_tree_add_bytes_format (*p_proto_tree_add_bytes_format)
-#define proto_tree_add_time (*p_proto_tree_add_time)
-#define proto_tree_add_time_hidden (*p_proto_tree_add_time_hidden)
-#define proto_tree_add_time_format (*p_proto_tree_add_time_format)
-#define proto_tree_add_ipxnet (*p_proto_tree_add_ipxnet)
-#define proto_tree_add_ipxnet_hidden (*p_proto_tree_add_ipxnet_hidden)
-#define proto_tree_add_ipxnet_format (*p_proto_tree_add_ipxnet_format)
-#define proto_tree_add_ipv4 (*p_proto_tree_add_ipv4)
-#define proto_tree_add_ipv4_hidden (*p_proto_tree_add_ipv4_hidden)
-#define proto_tree_add_ipv4_format (*p_proto_tree_add_ipv4_format)
-#define proto_tree_add_ipv6 (*p_proto_tree_add_ipv6)
-#define proto_tree_add_ipv6_hidden (*p_proto_tree_add_ipv6_hidden)
-#define proto_tree_add_ipv6_format (*p_proto_tree_add_ipv6_format)
-#define proto_tree_add_ether (*p_proto_tree_add_ether)
-#define proto_tree_add_ether_hidden (*p_proto_tree_add_ether_hidden)
-#define proto_tree_add_ether_format (*p_proto_tree_add_ether_format)
-#define proto_tree_add_string (*p_proto_tree_add_string)
-#define proto_tree_add_string_hidden (*p_proto_tree_add_string_hidden)
-#define proto_tree_add_string_format (*p_proto_tree_add_string_format)
-#define proto_tree_add_boolean (*p_proto_tree_add_boolean)
-#define proto_tree_add_boolean_hidden (*p_proto_tree_add_boolean_hidden)
-#define proto_tree_add_boolean_format (*p_proto_tree_add_boolean_format)
-#define proto_tree_add_double (*p_proto_tree_add_double)
-#define proto_tree_add_double_hidden (*p_proto_tree_add_double_hidden)
-#define proto_tree_add_double_format (*p_proto_tree_add_double_format)
-#define proto_tree_add_uint (*p_proto_tree_add_uint)
-#define proto_tree_add_uint_hidden (*p_proto_tree_add_uint_hidden)
-#define proto_tree_add_uint_format (*p_proto_tree_add_uint_format)
-#define proto_tree_add_int (*p_proto_tree_add_int)
-#define proto_tree_add_int_hidden (*p_proto_tree_add_int_hidden)
-#define proto_tree_add_int_format (*p_proto_tree_add_int_format)
-#define proto_tree_add_text (*p_proto_tree_add_text)
-#define tvb_new_subset (*p_tvb_new_subset)
-#define tvb_set_free_cb (*p_tvb_set_free_cb)
-#define tvb_set_child_real_data_tvbuff (*p_tvb_set_child_real_data_tvbuff)
-#define tvb_new_real_data (*p_tvb_new_real_data)
-#define tvb_length (*p_tvb_length)
-#define tvb_length_remaining (*p_tvb_length_remaining)
-#define tvb_bytes_exist (*p_tvb_bytes_exist)
-#define tvb_offset_exists (*p_tvb_offset_exists)
-#define tvb_reported_length (*p_tvb_reported_length)
-#define tvb_reported_length_remaining (*p_tvb_reported_length_remaining)
-#define tvb_get_guint8 (*p_tvb_get_guint8)
-#define tvb_get_ntohs (*p_tvb_get_ntohs)
-#define tvb_get_ntoh24 (*p_tvb_get_ntoh24)
-#define tvb_get_ntohl (*p_tvb_get_ntohl)
-#define tvb_get_letohs (*p_tvb_get_letohs)
-#define tvb_get_letoh24 (*p_tvb_get_letoh24)
-#define tvb_get_letohl (*p_tvb_get_letohl)
-#define tvb_memcpy (*p_tvb_memcpy)
-#define tvb_memdup (*p_tvb_memdup)
-#define tvb_get_ptr (*p_tvb_get_ptr)
-#define tvb_find_guint8 (*p_tvb_find_guint8)
-#define tvb_pbrk_guint8 (*p_tvb_pbrk_guint8)
-#define tvb_strnlen (*p_tvb_strnlen)
-#define tvb_format_text (*p_tvb_format_text)
-#define tvb_get_nstringz (*p_tvb_get_nstringz)
-#define tvb_get_nstringz0 (*p_tvb_get_nstringz0)
-#define tvb_find_line_end (*p_tvb_find_line_end)
-#define tvb_find_line_end_unquoted (*p_tvb_find_line_end_unquoted)
-#define tvb_strneql (*p_tvb_strneql)
-#define tvb_strncaseeql (*p_tvb_strncaseeql)
-#define tvb_bytes_to_str (*p_tvb_bytes_to_str)
-#define prefs_register_protocol (*p_prefs_register_protocol)
-#define prefs_register_uint_preference (*p_prefs_register_uint_preference)
-#define prefs_register_bool_preference (*p_prefs_register_bool_preference)
-#define prefs_register_enum_preference (*p_prefs_register_enum_preference)
-#define prefs_register_string_preference (*p_prefs_register_string_preference)
-#define register_giop_user (*p_register_giop_user)
-#define is_big_endian (*p_is_big_endian)
-#define get_CDR_encap_info (*p_get_CDR_encap_info)
-#define get_CDR_any (*p_get_CDR_any)
-#define get_CDR_boolean (*p_get_CDR_boolean)
-#define get_CDR_char (*p_get_CDR_char)
-#define get_CDR_double (*p_get_CDR_double)
-#define get_CDR_enum (*p_get_CDR_enum)
-#define get_CDR_fixed (*p_get_CDR_fixed)
-#define get_CDR_float (*p_get_CDR_float)
-#define get_CDR_interface (*p_get_CDR_interface)
-#define get_CDR_long (*p_get_CDR_long)
-#define get_CDR_object (*p_get_CDR_object)
-#define get_CDR_octet (*p_get_CDR_octet)
-#define get_CDR_octet_seq (*p_get_CDR_octet_seq)
-#define get_CDR_short (*p_get_CDR_short)
-#define get_CDR_string (*p_get_CDR_string)
-#define get_CDR_typeCode (*p_get_CDR_typeCode)
-#define get_CDR_ulong (*p_get_CDR_ulong)
-#define get_CDR_ushort (*p_get_CDR_ushort)
-#define get_CDR_wchar (*p_get_CDR_wchar)
-#define get_CDR_wstring (*p_get_CDR_wstring)
-#define is_tpkt (*p_is_tpkt)
-#define dissect_tpkt_encap (*p_dissect_tpkt_encap)
-#define set_actual_length (*p_set_actual_length)
-#define decode_boolean_bitfield (*p_decode_boolean_bitfield)
-#define decode_numeric_bitfield (*p_decode_numeric_bitfield)
-#define decode_enumerated_bitfield (*p_decode_enumerated_bitfield)
-#define register_dissector_table (*p_register_dissector_table)
-#define except_throw (*p_except_throw)
-#define dissector_try_port (*p_dissector_try_port)
-#define conversation_add_proto_data (*p_conversation_add_proto_data)
-#define conversation_get_proto_data (*p_conversation_get_proto_data)
-#define conversation_delete_proto_data (*p_conversation_delete_proto_data)
-#define p_add_proto_data (*p_p_add_proto_data)
-#define p_get_proto_data (*p_p_get_proto_data)
-#define ip_to_str (*p_ip_to_str)
-#define ip6_to_str (*p_ip6_to_str)
-#define time_secs_to_str (*p_time_secs_to_str)
-#define time_msecs_to_str (*p_time_msecs_to_str)
-#define abs_time_to_str (*p_abs_time_to_str)
-#define proto_get_id_by_filter_name (*p_proto_get_id_by_filter_name)
-#define proto_get_protocol_name (*p_proto_get_protocol_name)
-#define proto_get_protocol_short_name (*p_proto_get_protocol_short_name)
-#define proto_get_protocol_filter_name (*p_proto_get_protocol_filter_name)
-#define prefs_register_obsolete_preference (*p_prefs_register_obsolete_preference)
-#define add_new_data_source (*p_add_new_data_source)
-#define fragment_table_init (*p_fragment_table_init)
-#define reassembled_table_init (*p_reassembled_table_init)
-#define fragment_add (*p_fragment_add)
-#define fragment_add_seq (*p_fragment_add_seq)
-#define fragment_add_seq_check (*p_fragment_add_seq_check)
-#define fragment_add_seq_next (*p_fragment_add_seq_next)
-#define fragment_get (*p_fragment_get)
-#define fragment_set_tot_len (*p_fragment_set_tot_len)
-#define fragment_get_tot_len (*p_fragment_get_tot_len)
-#define fragment_set_partial_reassembly (*p_fragment_set_partial_reassembly)
-#define fragment_delete (*p_fragment_delete)
-#define show_fragment_tree (*p_show_fragment_tree)
-#define show_fragment_seq_tree (*p_show_fragment_seq_tree)
-#define register_tap (*p_register_tap)
-#define tap_queue_packet (*p_tap_queue_packet)
-#define asn1_open (*p_asn1_open)
-#define asn1_close (*p_asn1_close)
-#define asn1_octet_decode (*p_asn1_octet_decode)
-#define asn1_tag_decode (*p_asn1_tag_decode)
-#define asn1_id_decode (*p_asn1_id_decode)
-#define asn1_length_decode (*p_asn1_length_decode)
-#define asn1_header_decode (*p_asn1_header_decode)
-#define asn1_eoc (*p_asn1_eoc)
-#define asn1_eoc_decode (*p_asn1_eoc_decode)
-#define asn1_null_decode (*p_asn1_null_decode)
-#define asn1_bool_decode (*p_asn1_bool_decode)
-#define asn1_int32_value_decode (*p_asn1_int32_value_decode)
-#define asn1_int32_decode (*p_asn1_int32_decode)
-#define asn1_uint32_value_decode (*p_asn1_uint32_value_decode)
-#define asn1_uint32_decode (*p_asn1_uint32_decode)
-#define asn1_bits_decode (*p_asn1_bits_decode)
-#define asn1_string_value_decode (*p_asn1_string_value_decode)
-#define asn1_string_decode (*p_asn1_string_decode)
-#define asn1_octet_string_decode (*p_asn1_octet_string_decode)
-#define asn1_subid_decode (*p_asn1_subid_decode)
-#define asn1_oid_value_decode (*p_asn1_oid_value_decode)
-#define asn1_oid_decode (*p_asn1_oid_decode)
-#define asn1_sequence_decode (*p_asn1_sequence_decode)
-#define asn1_err_to_str (*p_asn1_err_to_str)
-#define proto_item_set_end (*p_proto_item_set_end)
-#define proto_tree_add_none_format (*p_proto_tree_add_none_format)
-#define except_init (*p_except_init)
-#define except_deinit (*p_except_deinit)
-#define except_rethrow (*p_except_rethrow)
-#define except_throwd (*p_except_throwd)
-#define except_throwf (*p_except_throwf)
-#define except_unhandled_catcher (*p_except_unhandled_catcher)
-#define except_take_data (*p_except_take_data)
-#define except_set_allocator (*p_except_set_allocator)
-#define except_alloc (*p_except_alloc)
-#define except_free (*p_except_free)
-#define except_pop (*p_except_pop)
-#define except_setup_try (*p_except_setup_try)
-#define col_set_fence (*p_col_set_fence)
-#define tvb_get_string (*p_tvb_get_string)
-#define tvb_get_stringz (*p_tvb_get_stringz)
-#define find_dissector_table (*p_find_dissector_table)
-#define dissector_get_port_handle (*p_dissector_get_port_handle)
-#define dissector_handle_get_short_name (*p_dissector_handle_get_short_name)
-#define dissector_handle_get_protocol_index (*p_dissector_handle_get_protocol_index)
-#define new_register_dissector (*p_new_register_dissector)
-#define new_create_dissector_handle (*p_new_create_dissector_handle)
-#define register_giop_user_module (*p_register_giop_user_module)
-#define dissect_per_GeneralString (*p_dissect_per_GeneralString)
-#define dissect_per_sequence_of (*p_dissect_per_sequence_of)
-#define dissect_per_IA5String (*p_dissect_per_IA5String)
-#define dissect_per_NumericString (*p_dissect_per_NumericString)
-#define dissect_per_PrintableString (*p_dissect_per_PrintableString)
-#define dissect_per_BMPString (*p_dissect_per_BMPString)
-#define dissect_per_constrained_sequence_of (*p_dissect_per_constrained_sequence_of)
-#define dissect_per_constrained_set_of (*p_dissect_per_constrained_set_of)
-#define dissect_per_set_of (*p_dissect_per_set_of)
-#define dissect_per_object_identifier (*p_dissect_per_object_identifier)
-#define dissect_per_boolean (*p_dissect_per_boolean)
-#define dissect_per_integer (*p_dissect_per_integer)
-#define dissect_per_constrained_integer (*p_dissect_per_constrained_integer)
-#define dissect_per_choice (*p_dissect_per_choice)
-#define dissect_per_sequence (*p_dissect_per_sequence)
-#define dissect_per_octet_string (*p_dissect_per_octet_string)
-#define dissect_per_restricted_character_string (*p_dissect_per_restricted_character_string)
-#define dissector_add_string (*p_dissector_add_string)
-#define dissector_delete_string (*p_dissector_delete_string)
-#define dissector_change_string (*p_dissector_change_string)
-#define dissector_reset_string (*p_dissector_reset_string)
-#define dissector_try_string (*p_dissector_try_string)
-#define dissector_get_string_handle (*p_dissector_get_string_handle)
-#define get_datafile_path (*p_get_datafile_path)
-#define get_tempfile_path (*p_get_tempfile_path)
-#define register_heur_dissector_list (*p_register_heur_dissector_list)
-#define dissector_try_heuristic (*p_dissector_try_heuristic)
-#define asn1_id_decode1 (*p_asn1_id_decode1)
-#define col_get_writable (*p_col_get_writable)
-#define col_set_writable (*p_col_set_writable)
-#define decode_enumerated_bitfield_shifted (*p_decode_enumerated_bitfield_shifted)
-#define dissect_xdlc_control (*p_dissect_xdlc_control)
-#define find_protocol_by_id (*p_find_protocol_by_id)
-#define tvb_strsize (*p_tvb_strsize)
-#define report_open_failure (*p_report_open_failure)
-#define report_read_failure (*p_report_read_failure)
-#define dissect_per_bit_string (*p_dissect_per_bit_string)
-#define dissect_ber_identifier (*p_dissect_ber_identifier)
-#define dissect_ber_length (*p_dissect_ber_length)
-#define dissect_ber_integer (*p_dissect_ber_integer)
-#define dissect_ber_boolean (*p_dissect_ber_boolean)
-#define dissect_ber_choice (*p_dissect_ber_choice)
-#define dissect_ber_GeneralizedTime (*p_dissect_ber_GeneralizedTime)
-#define dissect_ber_sequence (*p_dissect_ber_sequence)
-#define dissect_ber_sequence_of (*p_dissect_ber_sequence_of)
-#define dissect_ber_set_of (*p_dissect_ber_set_of)
-#define dissect_ber_octet_string (*p_dissect_ber_octet_string)
-#define dissect_ber_bitstring (*p_dissect_ber_bitstring)
-#define dissect_ber_restricted_string (*p_dissect_ber_restricted_string)
-#define dissect_ber_object_identifier (*p_dissect_ber_object_identifier)
-#define get_ber_identifier (*p_get_ber_identifier)
-#define get_ber_length (*p_get_ber_length)
-#define proto_item_get_subtree (*p_proto_item_get_subtree)
-#define proto_tree_get_parent (*p_proto_tree_get_parent)
-#define proto_item_get_parent (*p_proto_item_get_parent)
-#define proto_item_get_parent_nth (*p_proto_item_get_parent_nth)
-#define get_ber_last_created_item (*p_get_ber_last_created_item)
-#define report_failure (*p_report_failure)
-#define rpc_init_proc_table (*p_rpc_init_proc_table)
-#define rpc_init_prog (*p_rpc_init_prog)
-#define rpc_prog_name (*p_rpc_prog_name)
-#define rpc_proc_name (*p_rpc_proc_name)
-#define rpc_prog_hf (*p_rpc_prog_hf)
-#define rpc_roundup (*p_rpc_roundup)
-#define dissect_rpc_bool (*p_dissect_rpc_bool)
-#define dissect_rpc_string (*p_dissect_rpc_string)
-#define dissect_rpc_opaque_data (*p_dissect_rpc_opaque_data)
-#define dissect_rpc_data (*p_dissect_rpc_data)
-#define dissect_rpc_bytes (*p_dissect_rpc_bytes)
-#define dissect_rpc_list (*p_dissect_rpc_list)
-#define dissect_rpc_array (*p_dissect_rpc_array)
-#define dissect_rpc_uint32 (*p_dissect_rpc_uint32)
-#define dissect_rpc_uint64 (*p_dissect_rpc_uint64)
-#define dissect_rpc_indir_call (*p_dissect_rpc_indir_call)
-#define dissect_rpc_indir_reply (*p_dissect_rpc_indir_reply)
-#define crc16_ccitt_tvb (*p_crc16_ccitt_tvb)
-#define tvb_get_letoh64 (*p_tvb_get_letoh64)
-#define tvb_get_ntoh64 (*p_tvb_get_ntoh64)
-#define proto_tree_add_float (*p_proto_tree_add_float)
-#define proto_tree_add_float_hidden (*p_proto_tree_add_float_hidden)
-#define proto_tree_add_float_format (*p_proto_tree_add_float_format)
-#define tvb_get_ntohieee_float (*p_tvb_get_ntohieee_float)
-#define tvb_get_ntohieee_double (*p_tvb_get_ntohieee_double)
-#define tvb_get_letohieee_float (*p_tvb_get_letohieee_float)
-#define tvb_get_letohieee_double (*p_tvb_get_letohieee_double)
-#define proto_tree_add_debug_text (*p_proto_tree_add_debug_text)
-#define rtp_add_address (*p_rtp_add_address)
-#define rtcp_add_address (*p_rtcp_add_address)
-#define register_tap_listener (*p_register_tap_listener)
-#define get_datafile_dir (*p_get_datafile_dir)
-#define proto_registrar_get_abbrev (*p_proto_registrar_get_abbrev)
-#define proto_registrar_get_byname (*p_proto_registrar_get_byname)
-#define fvalue_get_floating (*p_fvalue_get_floating)
-#define fvalue_to_string_repr (*p_fvalue_to_string_repr)
-#define fvalue_get_integer (*p_fvalue_get_integer)
-#define dissect_dcerpc_uint8 (*p_dissect_dcerpc_uint8)
-#define dissect_dcerpc_uint16 (*p_dissect_dcerpc_uint16)
-#define dissect_dcerpc_uint32 (*p_dissect_dcerpc_uint32)
-#define dissect_dcerpc_uuid_t (*p_dissect_dcerpc_uuid_t)
-#define dcerpc_init_uuid (*p_dcerpc_init_uuid)
-#define dissect_ndr_uint32 (*p_dissect_ndr_uint32)
-#define proto_tree_add_uint64 (*p_proto_tree_add_uint64)
diff --git a/plugins/Xplugin_api_decls.h b/plugins/Xplugin_api_decls.h
deleted file mode 100644
index 2a452cf936..0000000000
--- a/plugins/Xplugin_api_decls.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/* This file is generated by plugin_gen.py, do not edit. */
-
-addr_check_col p_check_col;
-addr_col_clear p_col_clear;
-addr_col_add_fstr p_col_add_fstr;
-addr_col_append_fstr p_col_append_fstr;
-addr_col_prepend_fstr p_col_prepend_fstr;
-addr_col_add_str p_col_add_str;
-addr_col_append_str p_col_append_str;
-addr_col_set_str p_col_set_str;
-addr_register_init_routine p_register_init_routine;
-addr_register_postseq_cleanup_routine p_register_postseq_cleanup_routine;
-addr_match_strval p_match_strval;
-addr_val_to_str p_val_to_str;
-addr_conversation_new p_conversation_new;
-addr_find_conversation p_find_conversation;
-addr_conversation_set_dissector p_conversation_set_dissector;
-addr_proto_register_protocol p_proto_register_protocol;
-addr_proto_register_field_array p_proto_register_field_array;
-addr_proto_register_subtree_array p_proto_register_subtree_array;
-addr_dissector_add p_dissector_add;
-addr_dissector_delete p_dissector_delete;
-addr_dissector_add_handle p_dissector_add_handle;
-addr_heur_dissector_add p_heur_dissector_add;
-addr_register_dissector p_register_dissector;
-addr_find_dissector p_find_dissector;
-addr_create_dissector_handle p_create_dissector_handle;
-addr_call_dissector p_call_dissector;
-addr_tcp_dissect_pdus p_tcp_dissect_pdus;
-addr_proto_is_protocol_enabled p_proto_is_protocol_enabled;
-addr_proto_item_get_len p_proto_item_get_len;
-addr_proto_item_set_len p_proto_item_set_len;
-addr_proto_item_set_text p_proto_item_set_text;
-addr_proto_item_append_text p_proto_item_append_text;
-addr_proto_item_add_subtree p_proto_item_add_subtree;
-addr_proto_tree_add_item p_proto_tree_add_item;
-addr_proto_tree_add_item_hidden p_proto_tree_add_item_hidden;
-addr_proto_tree_add_protocol_format p_proto_tree_add_protocol_format;
-addr_proto_tree_add_bytes p_proto_tree_add_bytes;
-addr_proto_tree_add_bytes_hidden p_proto_tree_add_bytes_hidden;
-addr_proto_tree_add_bytes_format p_proto_tree_add_bytes_format;
-addr_proto_tree_add_time p_proto_tree_add_time;
-addr_proto_tree_add_time_hidden p_proto_tree_add_time_hidden;
-addr_proto_tree_add_time_format p_proto_tree_add_time_format;
-addr_proto_tree_add_ipxnet p_proto_tree_add_ipxnet;
-addr_proto_tree_add_ipxnet_hidden p_proto_tree_add_ipxnet_hidden;
-addr_proto_tree_add_ipxnet_format p_proto_tree_add_ipxnet_format;
-addr_proto_tree_add_ipv4 p_proto_tree_add_ipv4;
-addr_proto_tree_add_ipv4_hidden p_proto_tree_add_ipv4_hidden;
-addr_proto_tree_add_ipv4_format p_proto_tree_add_ipv4_format;
-addr_proto_tree_add_ipv6 p_proto_tree_add_ipv6;
-addr_proto_tree_add_ipv6_hidden p_proto_tree_add_ipv6_hidden;
-addr_proto_tree_add_ipv6_format p_proto_tree_add_ipv6_format;
-addr_proto_tree_add_ether p_proto_tree_add_ether;
-addr_proto_tree_add_ether_hidden p_proto_tree_add_ether_hidden;
-addr_proto_tree_add_ether_format p_proto_tree_add_ether_format;
-addr_proto_tree_add_string p_proto_tree_add_string;
-addr_proto_tree_add_string_hidden p_proto_tree_add_string_hidden;
-addr_proto_tree_add_string_format p_proto_tree_add_string_format;
-addr_proto_tree_add_boolean p_proto_tree_add_boolean;
-addr_proto_tree_add_boolean_hidden p_proto_tree_add_boolean_hidden;
-addr_proto_tree_add_boolean_format p_proto_tree_add_boolean_format;
-addr_proto_tree_add_double p_proto_tree_add_double;
-addr_proto_tree_add_double_hidden p_proto_tree_add_double_hidden;
-addr_proto_tree_add_double_format p_proto_tree_add_double_format;
-addr_proto_tree_add_uint p_proto_tree_add_uint;
-addr_proto_tree_add_uint_hidden p_proto_tree_add_uint_hidden;
-addr_proto_tree_add_uint_format p_proto_tree_add_uint_format;
-addr_proto_tree_add_int p_proto_tree_add_int;
-addr_proto_tree_add_int_hidden p_proto_tree_add_int_hidden;
-addr_proto_tree_add_int_format p_proto_tree_add_int_format;
-addr_proto_tree_add_text p_proto_tree_add_text;
-addr_tvb_new_subset p_tvb_new_subset;
-addr_tvb_set_free_cb p_tvb_set_free_cb;
-addr_tvb_set_child_real_data_tvbuff p_tvb_set_child_real_data_tvbuff;
-addr_tvb_new_real_data p_tvb_new_real_data;
-addr_tvb_length p_tvb_length;
-addr_tvb_length_remaining p_tvb_length_remaining;
-addr_tvb_bytes_exist p_tvb_bytes_exist;
-addr_tvb_offset_exists p_tvb_offset_exists;
-addr_tvb_reported_length p_tvb_reported_length;
-addr_tvb_reported_length_remaining p_tvb_reported_length_remaining;
-addr_tvb_get_guint8 p_tvb_get_guint8;
-addr_tvb_get_ntohs p_tvb_get_ntohs;
-addr_tvb_get_ntoh24 p_tvb_get_ntoh24;
-addr_tvb_get_ntohl p_tvb_get_ntohl;
-addr_tvb_get_letohs p_tvb_get_letohs;
-addr_tvb_get_letoh24 p_tvb_get_letoh24;
-addr_tvb_get_letohl p_tvb_get_letohl;
-addr_tvb_memcpy p_tvb_memcpy;
-addr_tvb_memdup p_tvb_memdup;
-addr_tvb_get_ptr p_tvb_get_ptr;
-addr_tvb_find_guint8 p_tvb_find_guint8;
-addr_tvb_pbrk_guint8 p_tvb_pbrk_guint8;
-addr_tvb_strnlen p_tvb_strnlen;
-addr_tvb_format_text p_tvb_format_text;
-addr_tvb_get_nstringz p_tvb_get_nstringz;
-addr_tvb_get_nstringz0 p_tvb_get_nstringz0;
-addr_tvb_find_line_end p_tvb_find_line_end;
-addr_tvb_find_line_end_unquoted p_tvb_find_line_end_unquoted;
-addr_tvb_strneql p_tvb_strneql;
-addr_tvb_strncaseeql p_tvb_strncaseeql;
-addr_tvb_bytes_to_str p_tvb_bytes_to_str;
-addr_prefs_register_protocol p_prefs_register_protocol;
-addr_prefs_register_uint_preference p_prefs_register_uint_preference;
-addr_prefs_register_bool_preference p_prefs_register_bool_preference;
-addr_prefs_register_enum_preference p_prefs_register_enum_preference;
-addr_prefs_register_string_preference p_prefs_register_string_preference;
-addr_register_giop_user p_register_giop_user;
-addr_is_big_endian p_is_big_endian;
-addr_get_CDR_encap_info p_get_CDR_encap_info;
-addr_get_CDR_any p_get_CDR_any;
-addr_get_CDR_boolean p_get_CDR_boolean;
-addr_get_CDR_char p_get_CDR_char;
-addr_get_CDR_double p_get_CDR_double;
-addr_get_CDR_enum p_get_CDR_enum;
-addr_get_CDR_fixed p_get_CDR_fixed;
-addr_get_CDR_float p_get_CDR_float;
-addr_get_CDR_interface p_get_CDR_interface;
-addr_get_CDR_long p_get_CDR_long;
-addr_get_CDR_object p_get_CDR_object;
-addr_get_CDR_octet p_get_CDR_octet;
-addr_get_CDR_octet_seq p_get_CDR_octet_seq;
-addr_get_CDR_short p_get_CDR_short;
-addr_get_CDR_string p_get_CDR_string;
-addr_get_CDR_typeCode p_get_CDR_typeCode;
-addr_get_CDR_ulong p_get_CDR_ulong;
-addr_get_CDR_ushort p_get_CDR_ushort;
-addr_get_CDR_wchar p_get_CDR_wchar;
-addr_get_CDR_wstring p_get_CDR_wstring;
-addr_is_tpkt p_is_tpkt;
-addr_dissect_tpkt_encap p_dissect_tpkt_encap;
-addr_set_actual_length p_set_actual_length;
-addr_decode_boolean_bitfield p_decode_boolean_bitfield;
-addr_decode_numeric_bitfield p_decode_numeric_bitfield;
-addr_decode_enumerated_bitfield p_decode_enumerated_bitfield;
-addr_register_dissector_table p_register_dissector_table;
-addr_except_throw p_except_throw;
-addr_dissector_try_port p_dissector_try_port;
-addr_conversation_add_proto_data p_conversation_add_proto_data;
-addr_conversation_get_proto_data p_conversation_get_proto_data;
-addr_conversation_delete_proto_data p_conversation_delete_proto_data;
-addr_p_add_proto_data p_p_add_proto_data;
-addr_p_get_proto_data p_p_get_proto_data;
-addr_ip_to_str p_ip_to_str;
-addr_ip6_to_str p_ip6_to_str;
-addr_time_secs_to_str p_time_secs_to_str;
-addr_time_msecs_to_str p_time_msecs_to_str;
-addr_abs_time_to_str p_abs_time_to_str;
-addr_proto_get_id_by_filter_name p_proto_get_id_by_filter_name;
-addr_proto_get_protocol_name p_proto_get_protocol_name;
-addr_proto_get_protocol_short_name p_proto_get_protocol_short_name;
-addr_proto_get_protocol_filter_name p_proto_get_protocol_filter_name;
-addr_prefs_register_obsolete_preference p_prefs_register_obsolete_preference;
-addr_add_new_data_source p_add_new_data_source;
-addr_fragment_table_init p_fragment_table_init;
-addr_reassembled_table_init p_reassembled_table_init;
-addr_fragment_add p_fragment_add;
-addr_fragment_add_seq p_fragment_add_seq;
-addr_fragment_add_seq_check p_fragment_add_seq_check;
-addr_fragment_add_seq_next p_fragment_add_seq_next;
-addr_fragment_get p_fragment_get;
-addr_fragment_set_tot_len p_fragment_set_tot_len;
-addr_fragment_get_tot_len p_fragment_get_tot_len;
-addr_fragment_set_partial_reassembly p_fragment_set_partial_reassembly;
-addr_fragment_delete p_fragment_delete;
-addr_show_fragment_tree p_show_fragment_tree;
-addr_show_fragment_seq_tree p_show_fragment_seq_tree;
-addr_register_tap p_register_tap;
-addr_tap_queue_packet p_tap_queue_packet;
-addr_asn1_open p_asn1_open;
-addr_asn1_close p_asn1_close;
-addr_asn1_octet_decode p_asn1_octet_decode;
-addr_asn1_tag_decode p_asn1_tag_decode;
-addr_asn1_id_decode p_asn1_id_decode;
-addr_asn1_length_decode p_asn1_length_decode;
-addr_asn1_header_decode p_asn1_header_decode;
-addr_asn1_eoc p_asn1_eoc;
-addr_asn1_eoc_decode p_asn1_eoc_decode;
-addr_asn1_null_decode p_asn1_null_decode;
-addr_asn1_bool_decode p_asn1_bool_decode;
-addr_asn1_int32_value_decode p_asn1_int32_value_decode;
-addr_asn1_int32_decode p_asn1_int32_decode;
-addr_asn1_uint32_value_decode p_asn1_uint32_value_decode;
-addr_asn1_uint32_decode p_asn1_uint32_decode;
-addr_asn1_bits_decode p_asn1_bits_decode;
-addr_asn1_string_value_decode p_asn1_string_value_decode;
-addr_asn1_string_decode p_asn1_string_decode;
-addr_asn1_octet_string_decode p_asn1_octet_string_decode;
-addr_asn1_subid_decode p_asn1_subid_decode;
-addr_asn1_oid_value_decode p_asn1_oid_value_decode;
-addr_asn1_oid_decode p_asn1_oid_decode;
-addr_asn1_sequence_decode p_asn1_sequence_decode;
-addr_asn1_err_to_str p_asn1_err_to_str;
-addr_proto_item_set_end p_proto_item_set_end;
-addr_proto_tree_add_none_format p_proto_tree_add_none_format;
-addr_except_init p_except_init;
-addr_except_deinit p_except_deinit;
-addr_except_rethrow p_except_rethrow;
-addr_except_throwd p_except_throwd;
-addr_except_throwf p_except_throwf;
-addr_except_unhandled_catcher p_except_unhandled_catcher;
-addr_except_take_data p_except_take_data;
-addr_except_set_allocator p_except_set_allocator;
-addr_except_alloc p_except_alloc;
-addr_except_free p_except_free;
-addr_except_pop p_except_pop;
-addr_except_setup_try p_except_setup_try;
-addr_col_set_fence p_col_set_fence;
-addr_tvb_get_string p_tvb_get_string;
-addr_tvb_get_stringz p_tvb_get_stringz;
-addr_find_dissector_table p_find_dissector_table;
-addr_dissector_get_port_handle p_dissector_get_port_handle;
-addr_dissector_handle_get_short_name p_dissector_handle_get_short_name;
-addr_dissector_handle_get_protocol_index p_dissector_handle_get_protocol_index;
-addr_new_register_dissector p_new_register_dissector;
-addr_new_create_dissector_handle p_new_create_dissector_handle;
-addr_register_giop_user_module p_register_giop_user_module;
-addr_dissect_per_GeneralString p_dissect_per_GeneralString;
-addr_dissect_per_sequence_of p_dissect_per_sequence_of;
-addr_dissect_per_IA5String p_dissect_per_IA5String;
-addr_dissect_per_NumericString p_dissect_per_NumericString;
-addr_dissect_per_PrintableString p_dissect_per_PrintableString;
-addr_dissect_per_BMPString p_dissect_per_BMPString;
-addr_dissect_per_constrained_sequence_of p_dissect_per_constrained_sequence_of;
-addr_dissect_per_constrained_set_of p_dissect_per_constrained_set_of;
-addr_dissect_per_set_of p_dissect_per_set_of;
-addr_dissect_per_object_identifier p_dissect_per_object_identifier;
-addr_dissect_per_boolean p_dissect_per_boolean;
-addr_dissect_per_integer p_dissect_per_integer;
-addr_dissect_per_constrained_integer p_dissect_per_constrained_integer;
-addr_dissect_per_choice p_dissect_per_choice;
-addr_dissect_per_sequence p_dissect_per_sequence;
-addr_dissect_per_octet_string p_dissect_per_octet_string;
-addr_dissect_per_restricted_character_string p_dissect_per_restricted_character_string;
-addr_dissector_add_string p_dissector_add_string;
-addr_dissector_delete_string p_dissector_delete_string;
-addr_dissector_change_string p_dissector_change_string;
-addr_dissector_reset_string p_dissector_reset_string;
-addr_dissector_try_string p_dissector_try_string;
-addr_dissector_get_string_handle p_dissector_get_string_handle;
-addr_get_datafile_path p_get_datafile_path;
-addr_get_tempfile_path p_get_tempfile_path;
-addr_register_heur_dissector_list p_register_heur_dissector_list;
-addr_dissector_try_heuristic p_dissector_try_heuristic;
-addr_asn1_id_decode1 p_asn1_id_decode1;
-addr_col_get_writable p_col_get_writable;
-addr_col_set_writable p_col_set_writable;
-addr_decode_enumerated_bitfield_shifted p_decode_enumerated_bitfield_shifted;
-addr_dissect_xdlc_control p_dissect_xdlc_control;
-addr_find_protocol_by_id p_find_protocol_by_id;
-addr_tvb_strsize p_tvb_strsize;
-addr_report_open_failure p_report_open_failure;
-addr_report_read_failure p_report_read_failure;
-addr_dissect_per_bit_string p_dissect_per_bit_string;
-addr_dissect_ber_identifier p_dissect_ber_identifier;
-addr_dissect_ber_length p_dissect_ber_length;
-addr_dissect_ber_integer p_dissect_ber_integer;
-addr_dissect_ber_boolean p_dissect_ber_boolean;
-addr_dissect_ber_choice p_dissect_ber_choice;
-addr_dissect_ber_GeneralizedTime p_dissect_ber_GeneralizedTime;
-addr_dissect_ber_sequence p_dissect_ber_sequence;
-addr_dissect_ber_sequence_of p_dissect_ber_sequence_of;
-addr_dissect_ber_set_of p_dissect_ber_set_of;
-addr_dissect_ber_octet_string p_dissect_ber_octet_string;
-addr_dissect_ber_bitstring p_dissect_ber_bitstring;
-addr_dissect_ber_restricted_string p_dissect_ber_restricted_string;
-addr_dissect_ber_object_identifier p_dissect_ber_object_identifier;
-addr_get_ber_identifier p_get_ber_identifier;
-addr_get_ber_length p_get_ber_length;
-addr_proto_item_get_subtree p_proto_item_get_subtree;
-addr_proto_tree_get_parent p_proto_tree_get_parent;
-addr_proto_item_get_parent p_proto_item_get_parent;
-addr_proto_item_get_parent_nth p_proto_item_get_parent_nth;
-addr_get_ber_last_created_item p_get_ber_last_created_item;
-addr_report_failure p_report_failure;
-addr_rpc_init_proc_table p_rpc_init_proc_table;
-addr_rpc_init_prog p_rpc_init_prog;
-addr_rpc_prog_name p_rpc_prog_name;
-addr_rpc_proc_name p_rpc_proc_name;
-addr_rpc_prog_hf p_rpc_prog_hf;
-addr_rpc_roundup p_rpc_roundup;
-addr_dissect_rpc_bool p_dissect_rpc_bool;
-addr_dissect_rpc_string p_dissect_rpc_string;
-addr_dissect_rpc_opaque_data p_dissect_rpc_opaque_data;
-addr_dissect_rpc_data p_dissect_rpc_data;
-addr_dissect_rpc_bytes p_dissect_rpc_bytes;
-addr_dissect_rpc_list p_dissect_rpc_list;
-addr_dissect_rpc_array p_dissect_rpc_array;
-addr_dissect_rpc_uint32 p_dissect_rpc_uint32;
-addr_dissect_rpc_uint64 p_dissect_rpc_uint64;
-addr_dissect_rpc_indir_call p_dissect_rpc_indir_call;
-addr_dissect_rpc_indir_reply p_dissect_rpc_indir_reply;
-addr_crc16_ccitt_tvb p_crc16_ccitt_tvb;
-addr_tvb_get_letoh64 p_tvb_get_letoh64;
-addr_tvb_get_ntoh64 p_tvb_get_ntoh64;
-addr_proto_tree_add_float p_proto_tree_add_float;
-addr_proto_tree_add_float_hidden p_proto_tree_add_float_hidden;
-addr_proto_tree_add_float_format p_proto_tree_add_float_format;
-addr_tvb_get_ntohieee_float p_tvb_get_ntohieee_float;
-addr_tvb_get_ntohieee_double p_tvb_get_ntohieee_double;
-addr_tvb_get_letohieee_float p_tvb_get_letohieee_float;
-addr_tvb_get_letohieee_double p_tvb_get_letohieee_double;
-addr_proto_tree_add_debug_text p_proto_tree_add_debug_text;
-addr_rtp_add_address p_rtp_add_address;
-addr_rtcp_add_address p_rtcp_add_address;
-addr_register_tap_listener p_register_tap_listener;
-addr_get_datafile_dir p_get_datafile_dir;
-addr_proto_registrar_get_abbrev p_proto_registrar_get_abbrev;
-addr_proto_registrar_get_byname p_proto_registrar_get_byname;
-addr_fvalue_get_floating p_fvalue_get_floating;
-addr_fvalue_to_string_repr p_fvalue_to_string_repr;
-addr_fvalue_get_integer p_fvalue_get_integer;
-addr_dissect_dcerpc_uint8 p_dissect_dcerpc_uint8;
-addr_dissect_dcerpc_uint16 p_dissect_dcerpc_uint16;
-addr_dissect_dcerpc_uint32 p_dissect_dcerpc_uint32;
-addr_dissect_dcerpc_uuid_t p_dissect_dcerpc_uuid_t;
-addr_dcerpc_init_uuid p_dcerpc_init_uuid;
-addr_dissect_ndr_uint32 p_dissect_ndr_uint32;
-addr_proto_tree_add_uint64 p_proto_tree_add_uint64;
diff --git a/plugins/Xplugin_table.h b/plugins/Xplugin_table.h
deleted file mode 100644
index 26deb67545..0000000000
--- a/plugins/Xplugin_table.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/* This file is generated by plugin_gen.py, do not edit. */
-
-typedef gint (*addr_check_col) (column_info *, gint);
-typedef void (*addr_col_clear) (column_info *, gint);
-typedef void (*addr_col_add_fstr) (column_info *, gint, const gchar *, ...);
-typedef void (*addr_col_append_fstr) (column_info *, gint, const gchar *, ...);
-typedef void (*addr_col_prepend_fstr) (column_info *, gint, const gchar *, ...);
-typedef void (*addr_col_add_str) (column_info *, gint, const gchar *);
-typedef void (*addr_col_append_str) (column_info *, gint, const gchar *);
-typedef void (*addr_col_set_str) (column_info *, gint, const gchar *);
-typedef void (*addr_register_init_routine) (void (*) (void));
-typedef void (*addr_register_postseq_cleanup_routine) (void (*) (void));
-typedef gchar *(*addr_match_strval) (guint32, const value_string *);
-typedef gchar *(*addr_val_to_str) (guint32, const value_string *, const char *);
-typedef conversation_t *(*addr_conversation_new) (guint32, address *, address *, port_type, guint32, guint32, guint);
-typedef conversation_t *(*addr_find_conversation) (guint32, address *, address *, port_type, guint32, guint32, guint);
-typedef void (*addr_conversation_set_dissector) (conversation_t *, dissector_handle_t);
-typedef int (*addr_proto_register_protocol) (char *, char *, char *);
-typedef void (*addr_proto_register_field_array) (int, hf_register_info *, int);
-typedef void (*addr_proto_register_subtree_array) (int *const *, int);
-typedef void (*addr_dissector_add) (const char *, guint32, dissector_handle_t);
-typedef void (*addr_dissector_delete) (const char *, guint32, dissector_handle_t);
-typedef void (*addr_dissector_add_handle) (const char *, dissector_handle_t);
-typedef void (*addr_heur_dissector_add) (const char *, heur_dissector_t, int);
-typedef void (*addr_register_dissector) (const char *, dissector_t, int);
-typedef dissector_handle_t (*addr_find_dissector) (const char *);
-typedef dissector_handle_t (*addr_create_dissector_handle) (dissector_t, int);
-typedef int (*addr_call_dissector) (dissector_handle_t, tvbuff_t *, packet_info *, proto_tree *);
-typedef void (*addr_tcp_dissect_pdus) (tvbuff_t *, packet_info *, proto_tree *, gboolean, guint, guint (*) (tvbuff_t *, int), void (*) (tvbuff_t *, packet_info *, proto_tree *));
-typedef gboolean (*addr_proto_is_protocol_enabled) (protocol_t *);
-typedef int (*addr_proto_item_get_len) (proto_item *);
-typedef void (*addr_proto_item_set_len) (proto_item *, gint);
-typedef void (*addr_proto_item_set_text) (proto_item *, const char *, ...);
-typedef void (*addr_proto_item_append_text) (proto_item *, const char *, ...);
-typedef proto_tree *(*addr_proto_item_add_subtree) (proto_item *, gint);
-typedef proto_item *(*addr_proto_tree_add_item) (proto_tree *, int, tvbuff_t *, gint, gint, gboolean);
-typedef proto_item *(*addr_proto_tree_add_item_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, gboolean);
-typedef proto_item *(*addr_proto_tree_add_protocol_format) (proto_tree *, int, tvbuff_t *, gint, gint, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_bytes) (proto_tree *, int, tvbuff_t *, gint, gint, const guint8 *);
-typedef proto_item *(*addr_proto_tree_add_bytes_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, const guint8 *);
-typedef proto_item *(*addr_proto_tree_add_bytes_format) (proto_tree *, int, tvbuff_t *, gint, gint, const guint8 *, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_time) (proto_tree *, int, tvbuff_t *, gint, gint, nstime_t *);
-typedef proto_item *(*addr_proto_tree_add_time_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, nstime_t *);
-typedef proto_item *(*addr_proto_tree_add_time_format) (proto_tree *, int, tvbuff_t *, gint, gint, nstime_t *, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_ipxnet) (proto_tree *, int, tvbuff_t *, gint, gint, guint32);
-typedef proto_item *(*addr_proto_tree_add_ipxnet_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, guint32);
-typedef proto_item *(*addr_proto_tree_add_ipxnet_format) (proto_tree *, int, tvbuff_t *, gint, gint, guint32, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_ipv4) (proto_tree *, int, tvbuff_t *, gint, gint, guint32);
-typedef proto_item *(*addr_proto_tree_add_ipv4_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, guint32);
-typedef proto_item *(*addr_proto_tree_add_ipv4_format) (proto_tree *, int, tvbuff_t *, gint, gint, guint32, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_ipv6) (proto_tree *, int, tvbuff_t *, gint, gint, const guint8 *);
-typedef proto_item *(*addr_proto_tree_add_ipv6_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, const guint8 *);
-typedef proto_item *(*addr_proto_tree_add_ipv6_format) (proto_tree *, int, tvbuff_t *, gint, gint, const guint8 *, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_ether) (proto_tree *, int, tvbuff_t *, gint, gint, const guint8 *);
-typedef proto_item *(*addr_proto_tree_add_ether_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, const guint8 *);
-typedef proto_item *(*addr_proto_tree_add_ether_format) (proto_tree *, int, tvbuff_t *, gint, gint, const guint8 *, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_string) (proto_tree *, int, tvbuff_t *, gint, gint, const char *);
-typedef proto_item *(*addr_proto_tree_add_string_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, const char *);
-typedef proto_item *(*addr_proto_tree_add_string_format) (proto_tree *, int, tvbuff_t *, gint, gint, const char *, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_boolean) (proto_tree *, int, tvbuff_t *, gint, gint, guint32);
-typedef proto_item *(*addr_proto_tree_add_boolean_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, guint32);
-typedef proto_item *(*addr_proto_tree_add_boolean_format) (proto_tree *, int, tvbuff_t *, gint, gint, guint32, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_double) (proto_tree *, int, tvbuff_t *, gint, gint, double);
-typedef proto_item *(*addr_proto_tree_add_double_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, double);
-typedef proto_item *(*addr_proto_tree_add_double_format) (proto_tree *, int, tvbuff_t *, gint, gint, double, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_uint) (proto_tree *, int, tvbuff_t *, gint, gint, guint32);
-typedef proto_item *(*addr_proto_tree_add_uint_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, guint32);
-typedef proto_item *(*addr_proto_tree_add_uint_format) (proto_tree *, int, tvbuff_t *, gint, gint, guint32, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_int) (proto_tree *, int, tvbuff_t *, gint, gint, gint32);
-typedef proto_item *(*addr_proto_tree_add_int_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, gint32);
-typedef proto_item *(*addr_proto_tree_add_int_format) (proto_tree *, int, tvbuff_t *, gint, gint, gint32, const char *, ...);
-typedef proto_item *(*addr_proto_tree_add_text) (proto_tree *, tvbuff_t *, gint, gint, const char *, ...);
-typedef tvbuff_t *(*addr_tvb_new_subset) (tvbuff_t *, gint, gint, gint);
-typedef void (*addr_tvb_set_free_cb) (tvbuff_t *, tvbuff_free_cb_t);
-typedef void (*addr_tvb_set_child_real_data_tvbuff) (tvbuff_t *, tvbuff_t *);
-typedef tvbuff_t *(*addr_tvb_new_real_data) (const guint8 *, guint, gint);
-typedef guint (*addr_tvb_length) (tvbuff_t *);
-typedef gint (*addr_tvb_length_remaining) (tvbuff_t *, gint);
-typedef gboolean (*addr_tvb_bytes_exist) (tvbuff_t *, gint, gint);
-typedef gboolean (*addr_tvb_offset_exists) (tvbuff_t *, gint);
-typedef guint (*addr_tvb_reported_length) (tvbuff_t *);
-typedef gint (*addr_tvb_reported_length_remaining) (tvbuff_t *, gint);
-typedef guint8 (*addr_tvb_get_guint8) (tvbuff_t *, gint);
-typedef guint16 (*addr_tvb_get_ntohs) (tvbuff_t *, gint);
-typedef guint32 (*addr_tvb_get_ntoh24) (tvbuff_t *, gint);
-typedef guint32 (*addr_tvb_get_ntohl) (tvbuff_t *, gint);
-typedef guint16 (*addr_tvb_get_letohs) (tvbuff_t *, gint);
-typedef guint32 (*addr_tvb_get_letoh24) (tvbuff_t *, gint);
-typedef guint32 (*addr_tvb_get_letohl) (tvbuff_t *, gint);
-typedef guint8 *(*addr_tvb_memcpy) (tvbuff_t *, guint8 *, gint, gint);
-typedef guint8 *(*addr_tvb_memdup) (tvbuff_t *, gint, gint);
-typedef const guint8 *(*addr_tvb_get_ptr) (tvbuff_t *, gint, gint);
-typedef gint (*addr_tvb_find_guint8) (tvbuff_t *, gint, gint, guint8);
-typedef gint (*addr_tvb_pbrk_guint8) (tvbuff_t *, gint, gint, guint8 *);
-typedef gint (*addr_tvb_strnlen) (tvbuff_t *, gint, guint);
-typedef gchar *(*addr_tvb_format_text) (tvbuff_t *, gint, gint);
-typedef gint (*addr_tvb_get_nstringz) (tvbuff_t *, gint, guint, guint8 *);
-typedef gint (*addr_tvb_get_nstringz0) (tvbuff_t *, gint, guint, guint8 *);
-typedef gint (*addr_tvb_find_line_end) (tvbuff_t *, gint, int, gint *, gboolean);
-typedef gint (*addr_tvb_find_line_end_unquoted) (tvbuff_t *, gint, int, gint *);
-typedef gint (*addr_tvb_strneql) (tvbuff_t *, gint, const gchar *, gint);
-typedef gint (*addr_tvb_strncaseeql) (tvbuff_t *, gint, const gchar *, gint);
-typedef gchar *(*addr_tvb_bytes_to_str) (tvbuff_t *, gint, gint);
-typedef struct pref_module *(*addr_prefs_register_protocol) (int, void (*) (void));
-typedef void (*addr_prefs_register_uint_preference) (struct pref_module *, const char *, const char *, const char *, guint, guint *);
-typedef void (*addr_prefs_register_bool_preference) (struct pref_module *, const char *, const char *, const char *, gboolean *);
-typedef void (*addr_prefs_register_enum_preference) (struct pref_module *, const char *, const char *, const char *, gint *, const enum_val_t *, gboolean);
-typedef void (*addr_prefs_register_string_preference) (struct pref_module *, const char *, const char *, const char *, char **);
-typedef void (*addr_register_giop_user) (giop_sub_dissector_t (*), gchar *, int);
-typedef gboolean (*addr_is_big_endian) (MessageHeader *);
-typedef guint32 (*addr_get_CDR_encap_info) (tvbuff_t *, proto_tree *, gint *, gboolean, guint32, gboolean *, guint32 *);
-typedef void (*addr_get_CDR_any) (tvbuff_t *, proto_tree *, gint *, gboolean, int, MessageHeader *);
-typedef gboolean (*addr_get_CDR_boolean) (tvbuff_t *, int *);
-typedef guint8 (*addr_get_CDR_char) (tvbuff_t *, int *);
-typedef gdouble (*addr_get_CDR_double) (tvbuff_t *, int *, gboolean, int);
-typedef guint32 (*addr_get_CDR_enum) (tvbuff_t *, int *, gboolean, int);
-typedef void (*addr_get_CDR_fixed) (tvbuff_t *, gchar **, gint *, guint32, gint32);
-typedef gfloat (*addr_get_CDR_float) (tvbuff_t *, int *, gboolean, int);
-typedef void (*addr_get_CDR_interface) (tvbuff_t *, packet_info *, proto_tree *, int *, gboolean, int);
-typedef gint32 (*addr_get_CDR_long) (tvbuff_t *, int *, gboolean, int);
-typedef void (*addr_get_CDR_object) (tvbuff_t *, packet_info *, proto_tree *, int *, gboolean, int);
-typedef guint8 (*addr_get_CDR_octet) (tvbuff_t *, int *);
-typedef void (*addr_get_CDR_octet_seq) (tvbuff_t *, gchar **, int *, guint32);
-typedef gint16 (*addr_get_CDR_short) (tvbuff_t *, int *, gboolean, int);
-typedef guint32 (*addr_get_CDR_string) (tvbuff_t *, gchar **, int *, gboolean, int);
-typedef guint32 (*addr_get_CDR_typeCode) (tvbuff_t *, proto_tree *, gint *, gboolean, int, MessageHeader *);
-typedef guint32 (*addr_get_CDR_ulong) (tvbuff_t *, int *, gboolean, int);
-typedef guint16 (*addr_get_CDR_ushort) (tvbuff_t *, int *, gboolean, int);
-typedef gint (*addr_get_CDR_wchar) (tvbuff_t *, gchar **, int *, MessageHeader *);
-typedef guint32 (*addr_get_CDR_wstring) (tvbuff_t *, gchar **, int *, gboolean, int, MessageHeader *);
-typedef int (*addr_is_tpkt) (tvbuff_t *, int);
-typedef void (*addr_dissect_tpkt_encap) (tvbuff_t *, packet_info *, proto_tree *, gboolean, dissector_handle_t);
-typedef void (*addr_set_actual_length) (tvbuff_t *, guint);
-typedef const char *(*addr_decode_boolean_bitfield) (guint32, guint32, int, const char *, const char *);
-typedef const char *(*addr_decode_numeric_bitfield) (guint32, guint32, int, const char *);
-typedef const char *(*addr_decode_enumerated_bitfield) (guint32, guint32, int, const value_string *, const char *);
-typedef dissector_table_t (*addr_register_dissector_table) (const char *, char *, ftenum_t, int);
-typedef void (*addr_except_throw) (long int, long int, const char *);
-typedef gboolean (*addr_dissector_try_port) (dissector_table_t, guint32, tvbuff_t *, packet_info *, proto_tree *);
-typedef void (*addr_conversation_add_proto_data) (conversation_t *, int, void *);
-typedef void *(*addr_conversation_get_proto_data) (conversation_t *, int);
-typedef void (*addr_conversation_delete_proto_data) (conversation_t *, int);
-typedef void (*addr_p_add_proto_data) (frame_data *, int, void *);
-typedef void *(*addr_p_get_proto_data) (frame_data *, int);
-typedef gchar *(*addr_ip_to_str) (const guint8 *);
-typedef char *(*addr_ip6_to_str) (const struct e_in6_addr *);
-typedef gchar *(*addr_time_secs_to_str) (guint32);
-typedef gchar *(*addr_time_msecs_to_str) (guint32);
-typedef gchar *(*addr_abs_time_to_str) (nstime_t *);
-typedef int (*addr_proto_get_id_by_filter_name) (gchar *);
-typedef char *(*addr_proto_get_protocol_name) (int);
-typedef char *(*addr_proto_get_protocol_short_name) (protocol_t *);
-typedef char *(*addr_proto_get_protocol_filter_name) (int);
-typedef void (*addr_prefs_register_obsolete_preference) (module_t *, const char *);
-typedef void (*addr_add_new_data_source) (packet_info *, tvbuff_t *, char *);
-typedef void (*addr_fragment_table_init) (GHashTable **);
-typedef void (*addr_reassembled_table_init) (GHashTable **);
-typedef fragment_data *(*addr_fragment_add) (tvbuff_t *, int, packet_info *, guint32, GHashTable *, guint32, guint32, gboolean);
-typedef fragment_data *(*addr_fragment_add_seq) (tvbuff_t *, int, packet_info *, guint32, GHashTable *, guint32, guint32, gboolean);
-typedef fragment_data *(*addr_fragment_add_seq_check) (tvbuff_t *, int, packet_info *, guint32, GHashTable *, GHashTable *, guint32, guint32, gboolean);
-typedef fragment_data *(*addr_fragment_add_seq_next) (tvbuff_t *, int, packet_info *, guint32, GHashTable *, GHashTable *, guint32, gboolean);
-typedef fragment_data *(*addr_fragment_get) (packet_info *, guint32, GHashTable *);
-typedef void (*addr_fragment_set_tot_len) (packet_info *, guint32, GHashTable *, guint32);
-typedef guint32 (*addr_fragment_get_tot_len) (packet_info *, guint32, GHashTable *);
-typedef void (*addr_fragment_set_partial_reassembly) (packet_info *, guint32, GHashTable *);
-typedef unsigned char *(*addr_fragment_delete) (packet_info *, guint32, GHashTable *);
-typedef gboolean (*addr_show_fragment_tree) (fragment_data *, const fragment_items *, proto_tree *, packet_info *, tvbuff_t *);
-typedef gboolean (*addr_show_fragment_seq_tree) (fragment_data *, const fragment_items *, proto_tree *, packet_info *, tvbuff_t *);
-typedef int (*addr_register_tap) (char *);
-typedef void (*addr_tap_queue_packet) (int, packet_info *, const void *);
-typedef void (*addr_asn1_open) (ASN1_SCK *, tvbuff_t *, int);
-typedef void (*addr_asn1_close) (ASN1_SCK *, int *);
-typedef int (*addr_asn1_octet_decode) (ASN1_SCK *, guchar *);
-typedef int (*addr_asn1_tag_decode) (ASN1_SCK *, guint *);
-typedef int (*addr_asn1_id_decode) (ASN1_SCK *, guint *, guint *, guint *);
-typedef int (*addr_asn1_length_decode) (ASN1_SCK *, gboolean *, guint *);
-typedef int (*addr_asn1_header_decode) (ASN1_SCK *, guint *, guint *, guint *, gboolean *, guint *);
-typedef int (*addr_asn1_eoc) (ASN1_SCK *, int);
-typedef int (*addr_asn1_eoc_decode) (ASN1_SCK *, int);
-typedef int (*addr_asn1_null_decode) (ASN1_SCK *, int);
-typedef int (*addr_asn1_bool_decode) (ASN1_SCK *, int, gboolean *);
-typedef int (*addr_asn1_int32_value_decode) (ASN1_SCK *, int, gint32 *);
-typedef int (*addr_asn1_int32_decode) (ASN1_SCK *, gint32 *, guint *);
-typedef int (*addr_asn1_uint32_value_decode) (ASN1_SCK *, int, guint *);
-typedef int (*addr_asn1_uint32_decode) (ASN1_SCK *, guint32 *, guint *);
-typedef int (*addr_asn1_bits_decode) (ASN1_SCK *, int, guchar **, guint *, guchar *);
-typedef int (*addr_asn1_string_value_decode) (ASN1_SCK *, int, guchar **);
-typedef int (*addr_asn1_string_decode) (ASN1_SCK *, guchar **, guint *, guint *, guint);
-typedef int (*addr_asn1_octet_string_decode) (ASN1_SCK *, guchar **, guint *, guint *);
-typedef int (*addr_asn1_subid_decode) (ASN1_SCK *, subid_t *);
-typedef int (*addr_asn1_oid_value_decode) (ASN1_SCK *, int, subid_t **, guint *);
-typedef int (*addr_asn1_oid_decode) (ASN1_SCK *, subid_t **, guint *, guint *);
-typedef int (*addr_asn1_sequence_decode) (ASN1_SCK *, guint *, guint *);
-typedef char *(*addr_asn1_err_to_str) (int);
-typedef void (*addr_proto_item_set_end) (proto_item *, tvbuff_t *, gint);
-typedef proto_item *(*addr_proto_tree_add_none_format) (proto_tree *, int, tvbuff_t *, gint, gint, const char *, ...);
-typedef int (*addr_except_init) (void);
-typedef void (*addr_except_deinit) (void);
-typedef void (*addr_except_rethrow) (except_t *);
-typedef void (*addr_except_throwd) (long int, long int, const char *, void *);
-typedef void (*addr_except_throwf) (long int, long int, const char *, ...);
-typedef void (*(*addr_except_unhandled_catcher) (void (*) (except_t *))) (except_t *);
-typedef void *(*addr_except_take_data) (except_t *);
-typedef void (*addr_except_set_allocator) (void *(*) (size_t), void (*) (void *));
-typedef void *(*addr_except_alloc) (size_t);
-typedef void (*addr_except_free) (void *);
-typedef struct except_stacknode *(*addr_except_pop) (void);
-typedef void (*addr_except_setup_try) (struct except_stacknode *, struct except_catch *, const except_id_t *, size_t);
-typedef void (*addr_col_set_fence) (column_info *, gint);
-typedef guint8 *(*addr_tvb_get_string) (tvbuff_t *, gint, gint);
-typedef guint8 *(*addr_tvb_get_stringz) (tvbuff_t *, gint, gint *);
-typedef dissector_table_t (*addr_find_dissector_table) (const char *);
-typedef dissector_handle_t (*addr_dissector_get_port_handle) (dissector_table_t, guint32);
-typedef char *(*addr_dissector_handle_get_short_name) (dissector_handle_t);
-typedef int (*addr_dissector_handle_get_protocol_index) (dissector_handle_t);
-typedef void (*addr_new_register_dissector) (const char *, new_dissector_t, int);
-typedef dissector_handle_t (*addr_new_create_dissector_handle) (new_dissector_t, int);
-typedef void (*addr_register_giop_user_module) (giop_sub_dissector_t (*), gchar *, gchar *, int);
-typedef guint32 (*addr_dissect_per_GeneralString) (tvbuff_t *, guint32, packet_info *, proto_tree *, int);
-typedef guint32 (*addr_dissect_per_sequence_of) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, gint, int (*) (tvbuff_t *, int, packet_info *, proto_tree *));
-typedef guint32 (*addr_dissect_per_IA5String) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, int, int);
-typedef guint32 (*addr_dissect_per_NumericString) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, int, int);
-typedef guint32 (*addr_dissect_per_PrintableString) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, int, int);
-typedef guint32 (*addr_dissect_per_BMPString) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, int, int);
-typedef guint32 (*addr_dissect_per_constrained_sequence_of) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, gint, int (*) (tvbuff_t *, int, packet_info *, proto_tree *), int, int);
-typedef guint32 (*addr_dissect_per_constrained_set_of) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, gint, int (*) (tvbuff_t *, int, packet_info *, proto_tree *), int, int);
-typedef guint32 (*addr_dissect_per_set_of) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, gint, int (*) (tvbuff_t *, int, packet_info *, proto_tree *));
-typedef guint32 (*addr_dissect_per_object_identifier) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, char *);
-typedef guint32 (*addr_dissect_per_boolean) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, gboolean *, proto_item **);
-typedef guint32 (*addr_dissect_per_integer) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, gint32 *, proto_item **);
-typedef guint32 (*addr_dissect_per_constrained_integer) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, guint32, guint32, guint32 *, proto_item **, gboolean);
-typedef guint32 (*addr_dissect_per_choice) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, gint, const per_choice_t *, char *, guint32 *);
-typedef guint32 (*addr_dissect_per_sequence) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, gint, const per_sequence_t *);
-typedef guint32 (*addr_dissect_per_octet_string) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, int, int, guint32 *, guint32 *);
-typedef guint32 (*addr_dissect_per_restricted_character_string) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, int, int, char *, int, char *, guint32);
-typedef void (*addr_dissector_add_string) (const char *, gchar *, dissector_handle_t);
-typedef void (*addr_dissector_delete_string) (const char *, const gchar *, dissector_handle_t);
-typedef void (*addr_dissector_change_string) (const char *, gchar *, dissector_handle_t);
-typedef void (*addr_dissector_reset_string) (const char *, const gchar *);
-typedef gboolean (*addr_dissector_try_string) (dissector_table_t, const gchar *, tvbuff_t *, packet_info *, proto_tree *);
-typedef dissector_handle_t (*addr_dissector_get_string_handle) (dissector_table_t, const gchar *);
-typedef char *(*addr_get_datafile_path) (const char *);
-typedef char *(*addr_get_tempfile_path) (const char *);
-typedef void (*addr_register_heur_dissector_list) (const char *, heur_dissector_list_t *);
-typedef gboolean (*addr_dissector_try_heuristic) (heur_dissector_list_t, tvbuff_t *, packet_info *, proto_tree *);
-typedef int (*addr_asn1_id_decode1) (ASN1_SCK *, guint *);
-typedef gboolean (*addr_col_get_writable) (column_info *);
-typedef void (*addr_col_set_writable) (column_info *, gboolean);
-typedef const char *(*addr_decode_enumerated_bitfield_shifted) (guint32, guint32, int, const value_string *, const char *);
-typedef int (*addr_dissect_xdlc_control) (tvbuff_t *, int, packet_info *, proto_tree *, int, gint, const xdlc_cf_items *, const xdlc_cf_items *, const value_string *, const value_string *, int, int, int);
-typedef protocol_t *(*addr_find_protocol_by_id) (int);
-typedef guint (*addr_tvb_strsize) (tvbuff_t *, gint);
-typedef void (*addr_report_open_failure) (const char *, int, gboolean);
-typedef void (*addr_report_read_failure) (const char *, int);
-typedef guint32 (*addr_dissect_per_bit_string) (tvbuff_t *, guint32, packet_info *, proto_tree *, int, int, int);
-typedef int (*addr_dissect_ber_identifier) (packet_info *, proto_tree *, tvbuff_t *, int, gint8 *, gboolean *, gint32 *);
-typedef int (*addr_dissect_ber_length) (packet_info *, proto_tree *, tvbuff_t *, int, guint32 *, gboolean *);
-typedef int (*addr_dissect_ber_integer) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint, guint32 *);
-typedef int (*addr_dissect_ber_boolean) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint);
-typedef int (*addr_dissect_ber_choice) (packet_info *, proto_tree *, tvbuff_t *, int, const ber_choice_t *, gint, gint);
-typedef int (*addr_dissect_ber_GeneralizedTime) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint);
-typedef int (*addr_dissect_ber_sequence) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence_t *, gint, gint);
-typedef int (*addr_dissect_ber_sequence_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence_t *, gint, gint);
-typedef int (*addr_dissect_ber_set_of) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const ber_sequence_t *, gint, gint);
-typedef int (*addr_dissect_ber_octet_string) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint, tvbuff_t **);
-typedef int (*addr_dissect_ber_bitstring) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, const asn_namedbit *, gint, gint, tvbuff_t **);
-typedef int (*addr_dissect_ber_restricted_string) (gboolean, gint32, packet_info *, proto_tree *, tvbuff_t *, int, gint, tvbuff_t **);
-typedef int (*addr_dissect_ber_object_identifier) (gboolean, packet_info *, proto_tree *, tvbuff_t *, int, gint, char *);
-typedef int (*addr_get_ber_identifier) (tvbuff_t *, int, gint8 *, gboolean *, gint32 *);
-typedef int (*addr_get_ber_length) (tvbuff_t *, int, guint32 *, gboolean *);
-typedef proto_tree *(*addr_proto_item_get_subtree) (proto_item *);
-typedef proto_item *(*addr_proto_tree_get_parent) (proto_tree *);
-typedef proto_item *(*addr_proto_item_get_parent) (proto_item *);
-typedef proto_item *(*addr_proto_item_get_parent_nth) (proto_item *, int);
-typedef proto_item *(*addr_get_ber_last_created_item) (void);
-typedef void (*addr_report_failure) (const char *, ...);
-typedef void (*addr_rpc_init_proc_table) (guint, guint, const vsff *, int);
-typedef void (*addr_rpc_init_prog) (int, guint32, int);
-typedef char *(*addr_rpc_prog_name) (guint32);
-typedef char *(*addr_rpc_proc_name) (guint32, guint32, guint32);
-typedef int (*addr_rpc_prog_hf) (guint32, guint32);
-typedef unsigned int (*addr_rpc_roundup) (unsigned int);
-typedef int (*addr_dissect_rpc_bool) (tvbuff_t *, proto_tree *, int, int);
-typedef int (*addr_dissect_rpc_string) (tvbuff_t *, proto_tree *, int, int, char **);
-typedef int (*addr_dissect_rpc_opaque_data) (tvbuff_t *, int, proto_tree *, packet_info *, int, gboolean, guint32, gboolean, char **, dissect_function_t (*));
-typedef int (*addr_dissect_rpc_data) (tvbuff_t *, proto_tree *, int, int);
-typedef int (*addr_dissect_rpc_bytes) (tvbuff_t *, proto_tree *, int, int, guint32, gboolean, char **);
-typedef int (*addr_dissect_rpc_list) (tvbuff_t *, packet_info *, proto_tree *, int, dissect_function_t (*));
-typedef int (*addr_dissect_rpc_array) (tvbuff_t *, packet_info *, proto_tree *, int, dissect_function_t (*), int);
-typedef int (*addr_dissect_rpc_uint32) (tvbuff_t *, proto_tree *, int, int);
-typedef int (*addr_dissect_rpc_uint64) (tvbuff_t *, proto_tree *, int, int);
-typedef int (*addr_dissect_rpc_indir_call) (tvbuff_t *, packet_info *, proto_tree *, int, int, guint32, guint32, guint32);
-typedef int (*addr_dissect_rpc_indir_reply) (tvbuff_t *, packet_info *, proto_tree *, int, int, int, int, int);
-typedef guint16 (*addr_crc16_ccitt_tvb) (tvbuff_t *, unsigned int);
-typedef guint64 (*addr_tvb_get_letoh64) (tvbuff_t *, gint);
-typedef guint64 (*addr_tvb_get_ntoh64) (tvbuff_t *, gint);
-typedef proto_item *(*addr_proto_tree_add_float) (proto_tree *, int, tvbuff_t *, gint, gint, float);
-typedef proto_item *(*addr_proto_tree_add_float_hidden) (proto_tree *, int, tvbuff_t *, gint, gint, float);
-typedef proto_item *(*addr_proto_tree_add_float_format) (proto_tree *, int, tvbuff_t *, gint, gint, float, const char *, ...);
-typedef gfloat (*addr_tvb_get_ntohieee_float) (tvbuff_t *, gint);
-typedef gdouble (*addr_tvb_get_ntohieee_double) (tvbuff_t *, gint);
-typedef gfloat (*addr_tvb_get_letohieee_float) (tvbuff_t *, gint);
-typedef gdouble (*addr_tvb_get_letohieee_double) (tvbuff_t *, gint);
-typedef proto_item *(*addr_proto_tree_add_debug_text) (proto_tree *, const char *, ...);
-typedef void (*addr_rtp_add_address) (packet_info *, address *, int, int, gchar *, guint32);
-typedef void (*addr_rtcp_add_address) (packet_info *, address *, int, int, gchar *, guint32);
-typedef GString *(*addr_register_tap_listener) (char *, void *, char *, tap_reset_cb, tap_packet_cb, tap_draw_cb);
-typedef const char *(*addr_get_datafile_dir) (void);
-typedef char *(*addr_proto_registrar_get_abbrev) (int);
-typedef header_field_info *(*addr_proto_registrar_get_byname) (const char *);
-typedef double (*addr_fvalue_get_floating) (fvalue_t *);
-typedef char *(*addr_fvalue_to_string_repr) (fvalue_t *, ftrepr_t, char *);
-typedef guint32 (*addr_fvalue_get_integer) (fvalue_t *);
-typedef int (*addr_dissect_dcerpc_uint8) (tvbuff_t *, gint, packet_info *, proto_tree *, guint8 *, int, guint8 *);
-typedef int (*addr_dissect_dcerpc_uint16) (tvbuff_t *, gint, packet_info *, proto_tree *, guint8 *, int, guint16 *);
-typedef int (*addr_dissect_dcerpc_uint32) (tvbuff_t *, gint, packet_info *, proto_tree *, guint8 *, int, guint32 *);
-typedef int (*addr_dissect_dcerpc_uuid_t) (tvbuff_t *, gint, packet_info *, proto_tree *, char *, int, e_uuid_t *);
-typedef void (*addr_dcerpc_init_uuid) (int, int, e_uuid_t *, guint16, dcerpc_sub_dissector *, int);
-typedef int (*addr_dissect_ndr_uint32) (tvbuff_t *, gint, packet_info *, proto_tree *, guint8 *, int, guint32 *);
-typedef proto_item *(*addr_proto_tree_add_uint64) (proto_tree *, int, tvbuff_t *, gint, gint, guint64);
diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c
deleted file mode 100644
index 8b1bbff9a5..0000000000
--- a/plugins/plugin_api.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* plugin_api.c
- * Routines for Ethereal plugins.
- *
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- *
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdarg.h>
-
-#include <glib.h>
-
-#include "plugin_api.h"
-
-void
-plugin_address_table_init(plugin_address_table_t *pat)
-{
-/* file generated by plugin_gen.py */
-#include "Xplugin_api.c"
-}
diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
deleted file mode 100644
index d99d5ff627..0000000000
--- a/plugins/plugin_api.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* plugin_api.h
- * Routines for Ethereal plugins.
- *
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- *
- * 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 PLUGIN_API_H
-#define PLUGIN_API_H
-
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-
-/* Some OSes (Win32) have DLLs that cannot reference symbols in the parent
-   executable, so the executable needs to provide a collection of pointers
-   to global variables and functions for the DLL plugin to use. */
-
-/* #defines for those functions that are called through pointers,
-   and global variables that are referred to through pointers.
-
-   #defined in this fashion so that the declaration of the functions
-   and variables, from the system header files, turn into declarations
-   of pointers to functions and variables, and the references to them in
-   plugins, in the plugins, turn into references through the pointers. */
-
-/* file generted by plugin_gen.py */
-#include "Xplugin_api.h"
-
-#include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/report_err.h>
-#include <epan/prefs.h>
-#include <epan/reassemble.h>
-#include <epan/dissectors/packet-giop.h>
-#include <epan/dissectors/packet-tpkt.h>
-#include <epan/dissectors/packet-tcp.h>
-#include <epan/dissectors/packet-rpc.h>
-#include <epan/tap.h>
-#include <epan/asn1.h>
-#include <epan/dissectors/packet-per.h>
-#include <epan/dissectors/packet-ber.h>
-#include <epan/dissectors/packet-rtp.h>
-#include <epan/dissectors/packet-rtcp.h>
-#include <epan/xdlc.h>
-#include <epan/crc16.h>
-#include "epan/except.h"
-#include "epan/filesystem.h"
-#include "epan/dissectors/packet-dcerpc.h"
-
-#endif /* PLUGINS_NEED_ADDRESS_TABLE */
-
-#include "plugin_table.h"
-
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-/* The parent executable will send us the pointer to a filled in
-   plugin_address_table_t struct, and we copy the pointers from
-   that table so that we can use functions from the parent executable. */
-void plugin_address_table_init(plugin_address_table_t*);
-#else
-#define plugin_address_table_init(x)    ;
-#endif
-
-#endif /* PLUGIN_API_H */
diff --git a/plugins/plugin_api_decls.h b/plugins/plugin_api_decls.h
deleted file mode 100644
index 29f1d54c8f..0000000000
--- a/plugins/plugin_api_decls.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* plugin_api_decls.h
- * Declarations of a list of "p_" names; included in various places
- * to declare them as variables or as function members.
- *
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- *
- * 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.
- */
-
-/*
- * If you're adding a new routine, please add it to the *end* of this
- * table, so that the ABI remains backwards-compatible if the only change
- * is that new functions are added; don't bother trying to keep related
- * routines together.  (This list is included in "plugin_table.h" to
- * declare the members of the function address table, so the order *does*
- * matter.)
- *
- * If a routine is removed or a calling sequence changed, the ABI isn't
- * going to be backwards-compatible no matter what you do; if that's
- * done, you may re-shuffle the routines to put related routines
- * together if you want.
- */
-  
-/* file generated by plugin_gen.py */
-#include "Xplugin_api_decls.h"
diff --git a/plugins/plugin_api_defs.h b/plugins/plugin_api_defs.h
deleted file mode 100644
index 6ac566d0d2..0000000000
--- a/plugins/plugin_api_defs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* plugin_api_defs.h
- * Define the variables that hold pointers to plugin API functions
- *
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- *
- * 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 PLUGIN_API_DEFS_H
-#define PLUGIN_API_DEFS_H
-
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-
-#include "plugin_api_decls.h"
-
-#endif /* PLUGINS_NEED_ADDRESS_TABLE */
-
-#endif /* PLUGIN_API_DEFS_H */
diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c
deleted file mode 100644
index 1f405c9eaa..0000000000
--- a/plugins/plugin_api_list.c
+++ /dev/null
@@ -1,531 +0,0 @@
-/* plugin_api_list.c
- * Used to generate various included files for plugin API
- *
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * Copyright 1998 Gerald Combs
- *
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <epan/packet.h>
-#include <epan/conversation.h>
-#include <epan/filesystem.h>
-#include <epan/report_err.h>
-#include <epan/except.h>
-#include <epan/prefs.h>
-#include <epan/reassemble.h>
-#include <epan/dissectors/packet-dcerpc.h>
-#include <epan/dissectors/packet-giop.h>
-#include <epan/dissectors/packet-per.h>
-#include <epan/dissectors/packet-ber.h>
-#include <epan/dissectors/packet-tpkt.h>
-#include <epan/dissectors/packet-tcp.h>
-#include <epan/dissectors/packet-rpc.h>
-#include <epan/dissectors/packet-rtp.h>
-#include <epan/dissectors/packet-rtcp.h>
-#include <epan/tap.h>
-#include <epan/asn1.h>
-#include <epan/xdlc.h>
-#include <epan/crc16.h>
-
-gint check_col(column_info*, gint);
-void col_clear(column_info*, gint);
-void col_add_fstr(column_info*, gint, const gchar*, ...);
-void col_append_fstr(column_info*, gint, const gchar*, ...);
-void col_prepend_fstr(column_info*, gint, const gchar*, ...);
-void col_add_str(column_info*, gint, const gchar*);
-void col_append_str(column_info*, gint, const gchar*);
-void col_set_str(column_info*, gint, const gchar*);
-
-void register_init_routine(void (*func)(void));
-void register_postseq_cleanup_routine(void (*func)(void));
-
-gchar* match_strval(guint32, const value_string*);
-gchar* val_to_str(guint32, const value_string *, const char *);
-
-conversation_t *conversation_new(guint32, address *, address *,
-    port_type, guint32, guint32, guint);
-conversation_t *find_conversation(guint32, address *, address *,
-    port_type, guint32, guint32, guint);
-void conversation_set_dissector(conversation_t *,
-    dissector_handle_t);
-
-int proto_register_protocol(char*, char*, char*);
-void proto_register_field_array(int, hf_register_info*, int);
-void proto_register_subtree_array(int *const *, int);
-
-void dissector_add(const char *, guint32, dissector_handle_t);
-void dissector_delete(const char *, guint32,
-    dissector_handle_t);
-void dissector_add_handle(const char *,
-    dissector_handle_t);
-
-void heur_dissector_add(const char *, heur_dissector_t, int);
-
-void register_dissector(const char *, dissector_t, int);
-dissector_handle_t find_dissector(const char *);
-dissector_handle_t create_dissector_handle(dissector_t dissector,
-    int proto);
-int call_dissector(dissector_handle_t, tvbuff_t *,
-    packet_info *, proto_tree *);
-
-void tcp_dissect_pdus(tvbuff_t *, packet_info *, proto_tree *,
-    gboolean, guint, guint (*)(tvbuff_t *, int),
-    void (*)(tvbuff_t *, packet_info *, proto_tree *));
-
-gboolean proto_is_protocol_enabled(protocol_t *);
-
-int proto_item_get_len(proto_item*);
-void proto_item_set_len(proto_item*, gint);
-void proto_item_set_text(proto_item*, const char*, ...);
-void proto_item_append_text(proto_item*, const char*, ...);
-proto_tree* proto_item_add_subtree(proto_item*, gint);
-proto_item* proto_tree_add_item(proto_tree*, int, tvbuff_t*, gint, gint, gboolean);
-proto_item* proto_tree_add_item_hidden(proto_tree*, int, tvbuff_t*, gint, gint, gboolean);
-proto_item* proto_tree_add_protocol_format(proto_tree*, int, tvbuff_t*, gint, gint, const char*, ...);
-
-proto_item* proto_tree_add_bytes(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
-proto_item* proto_tree_add_bytes_hidden(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
-proto_item* proto_tree_add_bytes_format(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*, const char*, ...);
-
-proto_item* proto_tree_add_time(proto_tree*, int, tvbuff_t*, gint, gint, nstime_t*);
-proto_item* proto_tree_add_time_hidden(proto_tree*, int, tvbuff_t*, gint, gint, nstime_t*);
-proto_item* proto_tree_add_time_format(proto_tree*, int, tvbuff_t*, gint, gint, nstime_t*, const char*, ...);
-
-proto_item* proto_tree_add_ipxnet(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
-proto_item* proto_tree_add_ipxnet_hidden(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
-proto_item* proto_tree_add_ipxnet_format(proto_tree*, int, tvbuff_t*, gint, gint, guint32, const char*, ...);
-
-proto_item* proto_tree_add_ipv4(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
-proto_item* proto_tree_add_ipv4_hidden(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
-proto_item* proto_tree_add_ipv4_format(proto_tree*, int, tvbuff_t*, gint, gint, guint32, const char*, ...);
-
-proto_item* proto_tree_add_ipv6(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
-proto_item* proto_tree_add_ipv6_hidden(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
-proto_item* proto_tree_add_ipv6_format(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*, const char*, ...);
-
-proto_item* proto_tree_add_ether(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
-proto_item* proto_tree_add_ether_hidden(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*);
-proto_item* proto_tree_add_ether_format(proto_tree*, int, tvbuff_t*, gint, gint, const guint8*, const char*, ...);
-
-proto_item* proto_tree_add_string(proto_tree*, int, tvbuff_t*, gint, gint, const char*);
-proto_item* proto_tree_add_string_hidden(proto_tree*, int, tvbuff_t*, gint, gint, const char*);
-proto_item* proto_tree_add_string_format(proto_tree*, int, tvbuff_t*, gint, gint, const char*, const char*, ...);
-
-proto_item* proto_tree_add_boolean(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
-proto_item* proto_tree_add_boolean_hidden(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
-proto_item* proto_tree_add_boolean_format(proto_tree*, int, tvbuff_t*, gint, gint, guint32, const char*, ...);
-
-proto_item* proto_tree_add_double(proto_tree*, int, tvbuff_t*, gint, gint, double);
-proto_item* proto_tree_add_double_hidden(proto_tree*, int, tvbuff_t*, gint, gint, double);
-proto_item* proto_tree_add_double_format(proto_tree*, int, tvbuff_t*, gint, gint, double, const char*, ...);
-
-proto_item* proto_tree_add_uint(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
-proto_item* proto_tree_add_uint_hidden(proto_tree*, int, tvbuff_t*, gint, gint, guint32);
-proto_item* proto_tree_add_uint_format(proto_tree*, int, tvbuff_t*, gint, gint, guint32, const char*, ...);
-
-proto_item* proto_tree_add_int(proto_tree*, int, tvbuff_t*, gint, gint, gint32);
-proto_item* proto_tree_add_int_hidden(proto_tree*, int, tvbuff_t*, gint, gint, gint32);
-proto_item* proto_tree_add_int_format(proto_tree*, int, tvbuff_t*, gint, gint, gint32, const char*, ...);
-
-proto_item* proto_tree_add_text(proto_tree*, tvbuff_t*, gint, gint, const char*, ...);
-
-tvbuff_t* tvb_new_subset(tvbuff_t*, gint, gint, gint);
-
-void tvb_set_free_cb(tvbuff_t*, tvbuff_free_cb_t);
-void tvb_set_child_real_data_tvbuff(tvbuff_t*, tvbuff_t*);
-tvbuff_t* tvb_new_real_data(const guint8*, guint, gint);
-
-guint tvb_length(tvbuff_t*);
-gint tvb_length_remaining(tvbuff_t*, gint);
-gboolean tvb_bytes_exist(tvbuff_t*, gint, gint);
-gboolean tvb_offset_exists(tvbuff_t*, gint);
-guint tvb_reported_length(tvbuff_t*);
-gint tvb_reported_length_remaining(tvbuff_t*, gint);
-
-guint8 tvb_get_guint8(tvbuff_t*, gint);
-
-guint16 tvb_get_ntohs(tvbuff_t*, gint);
-guint32 tvb_get_ntoh24(tvbuff_t*, gint);
-guint32 tvb_get_ntohl(tvbuff_t*, gint);
-
-guint16 tvb_get_letohs(tvbuff_t*, gint);
-guint32 tvb_get_letoh24(tvbuff_t*, gint);
-guint32 tvb_get_letohl(tvbuff_t*, gint);
-
-guint8* tvb_memcpy(tvbuff_t*, guint8* target, gint, gint);
-guint8* tvb_memdup(tvbuff_t*, gint, gint);
-
-const guint8* tvb_get_ptr(tvbuff_t*, gint, gint);
-
-gint tvb_find_guint8(tvbuff_t*, gint, gint, guint8);
-gint tvb_pbrk_guint8(tvbuff_t *, gint, gint, guint8 *);
-
-gint tvb_strnlen(tvbuff_t*, gint, guint);
-
-gchar * tvb_format_text(tvbuff_t*, gint, gint);
-
-gint tvb_get_nstringz(tvbuff_t*, gint, guint, guint8*);
-gint tvb_get_nstringz0(tvbuff_t*, gint, guint, guint8*);
-
-gint tvb_find_line_end(tvbuff_t*, gint, int, gint *, gboolean);
-gint tvb_find_line_end_unquoted(tvbuff_t*, gint, int, gint *);
-
-gint tvb_strneql(tvbuff_t*, gint, const gchar *, gint);
-gint tvb_strncaseeql(tvbuff_t*, gint, const gchar *, gint);
-
-gchar *tvb_bytes_to_str(tvbuff_t*, gint, gint len);
-
-struct pref_module *prefs_register_protocol(int,
-    void (*)(void));
-void prefs_register_uint_preference(struct pref_module *,
-    const char *, const char *, const char *, guint, guint *);
-void prefs_register_bool_preference(struct pref_module *,
-    const char *, const char *, const char *, gboolean *);
-void prefs_register_enum_preference(struct pref_module *,
-    const char *, const char *, const char *, gint *, const enum_val_t *,
-    gboolean);
-void prefs_register_string_preference(struct pref_module *,
-    const char *, const char *, const char *, char**);
-
-void register_giop_user(giop_sub_dissector_t *, gchar *, int);
-gboolean is_big_endian(MessageHeader *);
-guint32 get_CDR_encap_info(tvbuff_t *, proto_tree *, gint *,
-		gboolean, guint32, gboolean *, guint32 *);
-void get_CDR_any(tvbuff_t *, proto_tree *, gint *,
-		gboolean, int, MessageHeader *);
-gboolean get_CDR_boolean(tvbuff_t *, int *);
-guint8 get_CDR_char(tvbuff_t *, int *);
-gdouble get_CDR_double(tvbuff_t *, int *, gboolean, int);
-guint32 get_CDR_enum(tvbuff_t *, int *, gboolean, int);
-void get_CDR_fixed(tvbuff_t *, gchar **, gint *, guint32,
-		gint32);
-gfloat get_CDR_float(tvbuff_t *, int *, gboolean, int);
-void get_CDR_interface(tvbuff_t *, packet_info *, proto_tree *,
-		int *, gboolean, int);
-gint32 get_CDR_long(tvbuff_t *, int *, gboolean, int);
-void get_CDR_object(tvbuff_t *, packet_info *, proto_tree *,
-		int *, gboolean, int);
-guint8 get_CDR_octet(tvbuff_t *, int *);
-void get_CDR_octet_seq(tvbuff_t *, gchar **, int *, guint32);
-gint16 get_CDR_short(tvbuff_t *, int *, gboolean, int);
-guint32 get_CDR_string(tvbuff_t *, gchar **, int *, gboolean,
-		int);
-guint32 get_CDR_typeCode(tvbuff_t *, proto_tree *, gint *,
-	gboolean, int, MessageHeader *);
-guint32 get_CDR_ulong(tvbuff_t *, int *, gboolean, int);
-guint16 get_CDR_ushort(tvbuff_t *, int *, gboolean, int);
-gint get_CDR_wchar(tvbuff_t *, gchar **, int *,
-		MessageHeader *);
-guint32 get_CDR_wstring(tvbuff_t *, gchar **, int *, gboolean,
-		int, MessageHeader *);
-
-int is_tpkt(tvbuff_t *, int);
-void dissect_tpkt_encap(tvbuff_t *, packet_info *,
-    proto_tree *, gboolean, dissector_handle_t);
-
-void set_actual_length(tvbuff_t *, guint);
-
-const char *decode_boolean_bitfield(guint32, guint32, int,
-    const char *, const char *);
-const char *decode_numeric_bitfield(guint32, guint32, int,
-    const char *);
-const char *decode_enumerated_bitfield(guint32, guint32, int,
-    const value_string *, const char *);
-
-dissector_table_t register_dissector_table(const char *, char *, ftenum_t ,int );
-void except_throw(long, long, const char *);
-gboolean dissector_try_port(dissector_table_t, guint32, tvbuff_t *, packet_info *, proto_tree *);
-
-void conversation_add_proto_data(conversation_t *, int, void *);
-void *conversation_get_proto_data(conversation_t *, int);
-void conversation_delete_proto_data(conversation_t *, int);
-void p_add_proto_data(frame_data *, int, void *);
-void *p_get_proto_data(frame_data *, int);
-
-gchar*	ip_to_str(const guint8 *);
-char*	ip6_to_str(const struct e_in6_addr *);
-gchar*	time_secs_to_str(guint32);
-gchar*	time_msecs_to_str(guint32);
-gchar*	abs_time_to_str(nstime_t*);
-
-int proto_get_id_by_filter_name(gchar* filter_name);
-char *proto_get_protocol_name(int n);
-char *proto_get_protocol_short_name(protocol_t *);
-char *proto_get_protocol_filter_name(int proto_id);
-
-void prefs_register_obsolete_preference(module_t *, const char *);
-
-void add_new_data_source(packet_info *, tvbuff_t *, char *);
-
-void fragment_table_init(GHashTable **);
-void reassembled_table_init(GHashTable **);
-fragment_data *fragment_add(tvbuff_t *, int, packet_info *, guint32,
-			GHashTable *, guint32, guint32, gboolean);
-fragment_data *fragment_add_seq(tvbuff_t *, int, packet_info *, guint32,
-			GHashTable *, guint32, guint32, gboolean);
-fragment_data *fragment_add_seq_check(tvbuff_t *, int, packet_info *, guint32 id,
-			GHashTable *, GHashTable *, guint32, guint32, gboolean);
-fragment_data *fragment_add_seq_next(tvbuff_t *, int, packet_info *, guint32,
-			GHashTable *, GHashTable *, guint32, gboolean);
-fragment_data *fragment_get(packet_info *, guint32, GHashTable *);
-void fragment_set_tot_len(packet_info *, guint32, GHashTable *, guint32);
-guint32 fragment_get_tot_len(packet_info *, guint32, GHashTable *);
-void fragment_set_partial_reassembly(packet_info *, guint32, GHashTable *);
-unsigned char *fragment_delete(packet_info *, guint32, GHashTable *);
-gboolean show_fragment_tree(fragment_data *, const fragment_items *, proto_tree *, packet_info *, tvbuff_t *);
-gboolean show_fragment_seq_tree(fragment_data *, const fragment_items *, proto_tree *, packet_info *, tvbuff_t *);
-
-int register_tap(char *);
-void tap_queue_packet(int, packet_info *, const void *);
-
-void asn1_open(ASN1_SCK *, tvbuff_t *, int );
-void asn1_close(ASN1_SCK *, int *);
-int asn1_octet_decode(ASN1_SCK *, guchar *);
-int asn1_tag_decode(ASN1_SCK *, guint *);
-int asn1_id_decode(ASN1_SCK *, guint *, guint *, guint *);
-int asn1_length_decode(ASN1_SCK *, gboolean *, guint *);
-int asn1_header_decode(ASN1_SCK *, guint *, guint *, guint *,
-			gboolean *, guint *);
-int asn1_eoc(ASN1_SCK *, int );
-int asn1_eoc_decode(ASN1_SCK *, int );
-int asn1_null_decode(ASN1_SCK *, int );
-int asn1_bool_decode(ASN1_SCK *, int , gboolean *);
-int asn1_int32_value_decode(ASN1_SCK *, int , gint32 *);
-int asn1_int32_decode(ASN1_SCK *, gint32 *, guint *);
-int asn1_uint32_value_decode(ASN1_SCK *, int , guint *);
-int asn1_uint32_decode(ASN1_SCK *, guint32 *, guint *);
-int asn1_bits_decode(ASN1_SCK *, int , guchar **,
-                             guint *, guchar *);
-int asn1_string_value_decode(ASN1_SCK *, int ,
-			guchar **);
-int asn1_string_decode(ASN1_SCK *, guchar **, guint *,
-			guint *, guint );
-int asn1_octet_string_decode(ASN1_SCK *, guchar **, guint *,
-			guint *);
-int asn1_subid_decode(ASN1_SCK *, subid_t *);
-int asn1_oid_value_decode(ASN1_SCK *, int , subid_t **,
-			guint *);
-int asn1_oid_decode( ASN1_SCK *, subid_t **, guint *, guint *);
-int asn1_sequence_decode( ASN1_SCK *, guint *, guint *);
-
-char *asn1_err_to_str(int );
-
-void proto_item_set_end(proto_item*, tvbuff_t *, gint);
-
-proto_item* proto_tree_add_none_format(proto_tree*, int, tvbuff_t*, gint, gint, const char*, ...);
-
-int except_init(void);
-void except_deinit(void);
-void except_rethrow(except_t *);
-void except_throwd(long, long, const char *, void *);
-void except_throwf(long, long, const char *, ...);
-void (*except_unhandled_catcher(void (*)(except_t *)))(except_t *);
-void *except_take_data(except_t *);
-void except_set_allocator(void *(*)(size_t), void (*)(void *));
-void *except_alloc(size_t);
-void except_free(void *);
-struct except_stacknode *except_pop(void);
-void except_setup_try(struct except_stacknode *, struct except_catch *, const except_id_t [], size_t);
-
-void col_set_fence(column_info*, gint);
-
-guint8 *tvb_get_string(tvbuff_t *, gint, gint);
-guint8 *tvb_get_stringz(tvbuff_t *, gint, gint *);
-
-dissector_table_t find_dissector_table(const char *);
-dissector_handle_t dissector_get_port_handle(dissector_table_t, guint32);
-char *dissector_handle_get_short_name(dissector_handle_t);
-int dissector_handle_get_protocol_index(dissector_handle_t);
-void new_register_dissector(const char *, new_dissector_t, int);
-dissector_handle_t new_create_dissector_handle(new_dissector_t, int);
-
-void register_giop_user_module(giop_sub_dissector_t *sub, gchar *name, gchar *module, int sub_proto);
-
-guint32 dissect_per_GeneralString(tvbuff_t*, guint32, packet_info*, proto_tree*, int);
-guint32 dissect_per_sequence_of(tvbuff_t*, guint32, packet_info*, proto_tree*, int, gint, int (*)(tvbuff_t*, int, packet_info*, proto_tree*));
-guint32 dissect_per_IA5String(tvbuff_t*, guint32, packet_info*, proto_tree*, int, int, int);
-guint32 dissect_per_NumericString(tvbuff_t*, guint32, packet_info*, proto_tree*, int, int, int);
-guint32 dissect_per_PrintableString(tvbuff_t*, guint32, packet_info*, proto_tree*, int, int, int);
-guint32 dissect_per_BMPString(tvbuff_t*, guint32, packet_info*, proto_tree*, int, int, int);
-guint32 dissect_per_constrained_sequence_of(tvbuff_t*, guint32, packet_info*, proto_tree*, int, gint, int (*)(tvbuff_t*, int, packet_info*, proto_tree*), int, int);
-guint32 dissect_per_constrained_set_of(tvbuff_t*, guint32, packet_info*, proto_tree *parent_tree, int, gint, int (*)(tvbuff_t*, int, packet_info*, proto_tree*), int, int);
-guint32 dissect_per_set_of(tvbuff_t*, guint32, packet_info*, proto_tree *parent_tree, int, gint, int (*)(tvbuff_t*, int, packet_info*, proto_tree*));
-guint32 dissect_per_object_identifier(tvbuff_t*, guint32, packet_info*, proto_tree*, int, char*);
-guint32 dissect_per_boolean(tvbuff_t*, guint32, packet_info *pinfo, proto_tree*, int, gboolean*, proto_item**);
-guint32 dissect_per_integer(tvbuff_t*, guint32, packet_info*, proto_tree*, int, gint32*, proto_item**);
-guint32 dissect_per_constrained_integer(tvbuff_t*, guint32, packet_info*, proto_tree*, int, guint32, guint32, guint32*, proto_item**, gboolean);
-guint32 dissect_per_choice(tvbuff_t*, guint32, packet_info*, proto_tree*, int, gint, const per_choice_t*, char*, guint32*);
-guint32 dissect_per_sequence(tvbuff_t*, guint32, packet_info*, proto_tree *parent_tree, int, gint, const per_sequence_t*);
-guint32 dissect_per_octet_string(tvbuff_t*, guint32, packet_info*, proto_tree*, int, int, int, guint32*, guint32*);
-guint32 dissect_per_restricted_character_string(tvbuff_t*, guint32, packet_info*, proto_tree*, int, int, int, char*, int, char *, guint32);
-
-void dissector_add_string(const char*, gchar*, dissector_handle_t);
-void dissector_delete_string(const char*, const gchar*,	dissector_handle_t);
-void dissector_change_string(const char*, gchar *, dissector_handle_t);
-void dissector_reset_string(const char*, const gchar*);
-gboolean dissector_try_string(dissector_table_t, const gchar*, tvbuff_t*, packet_info*, proto_tree*);
-dissector_handle_t dissector_get_string_handle(dissector_table_t, const gchar*);
-
-char *get_datafile_path(const char *filename);
-char *get_tempfile_path(const char *filename);
-
-void register_heur_dissector_list(const char *name,
-    heur_dissector_list_t *list);
-gboolean dissector_try_heuristic(heur_dissector_list_t sub_dissectors,
-    tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
-int asn1_id_decode1(ASN1_SCK *asn1, guint *tag);
-
-gboolean col_get_writable(column_info *);
-void col_set_writable(column_info *, gboolean);
-
-const char *decode_enumerated_bitfield_shifted(guint32, guint32, int,
-    const value_string *, const char *);
-
-int dissect_xdlc_control(tvbuff_t *tvb, int offset, packet_info *pinfo,
-  proto_tree *xdlc_tree, int hf_xdlc_control, gint ett_xdlc_control,
-  const xdlc_cf_items *cf_items_nonext, const xdlc_cf_items *cf_items_ext,
-  const value_string *u_modifier_short_vals_cmd,
-  const value_string *u_modifier_short_vals_resp, int is_response,
-  int is_extended, int append_info);
-
-protocol_t *find_protocol_by_id(int n);
-
-guint tvb_strsize(tvbuff_t *tvb, gint offset);
-
-void report_open_failure(const char *filename, int err, gboolean for_writing);
-
-void report_read_failure(const char *filename, int err);
-
-guint32 dissect_per_bit_string(tvbuff_t*, guint32, packet_info*, proto_tree*, int, int, int);
-
-int dissect_ber_identifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag);
-int dissect_ber_length(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, guint32 *length, gboolean *ind);
-int dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value);
-int dissect_ber_boolean(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
-int dissect_ber_choice(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_choice_t *ch, gint hf_id, gint ett_id);
-int dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
-int dissect_ber_sequence(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
-int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
-int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence_t *seq, gint hf_id, gint ett_id);
-int dissect_ber_octet_string(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **tvb_out);
-int dissect_ber_bitstring(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn_namedbit const *named_bits, gint hf_id, gint ett_id, tvbuff_t **tvb_out);
-int dissect_ber_restricted_string(gboolean implicit_tag, gint32 type, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **tvb_out);
-int dissect_ber_object_identifier(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, char *value_string);
-int get_ber_identifier(tvbuff_t *tvb, int offset, gint8 *class, gboolean *pc, gint32 *tag);
-int get_ber_length(tvbuff_t *tvb, int offset, guint32 *length, gboolean *ind);
-proto_tree* proto_item_get_subtree(proto_item *ti);
-proto_item* proto_tree_get_parent(proto_tree *tree);
-proto_item* proto_item_get_parent(proto_item *ti);
-proto_item* proto_item_get_parent_nth(proto_item *ti, int gen);
-proto_item *get_ber_last_created_item(void);
-
-void report_failure(const char *msg_format, ...);
-
-void rpc_init_proc_table(guint prog, guint vers, const vsff *proc_table,
-    int procedure_hf);
-void rpc_init_prog(int proto, guint32 prog, int ett);
-char *rpc_prog_name(guint32 prog);
-char *rpc_proc_name(guint32 prog, guint32 vers, guint32 proc);
-int rpc_prog_hf(guint32 prog, guint32 vers);
-
-unsigned int rpc_roundup(unsigned int a);
-int dissect_rpc_bool(tvbuff_t *tvb,
- proto_tree *tree, int hfindex, int offset);
-int dissect_rpc_string(tvbuff_t *tvb,
- proto_tree *tree, int hfindex, int offset, char **string_buffer_ret);
-int dissect_rpc_opaque_data(tvbuff_t *tvb, int offset,
-    proto_tree *tree,
-    packet_info *pinfo,
-    int hfindex,
-    gboolean fixed_length, guint32 length,
-    gboolean string_data, char **string_buffer_ret,
-    dissect_function_t *dissect_it);
-int dissect_rpc_data(tvbuff_t *tvb,
- proto_tree *tree, int hfindex, int offset);
-int dissect_rpc_bytes(tvbuff_t *tvb,
- proto_tree *tree, int hfindex, int offset, guint32 length,
- gboolean string_data, char **string_buffer_ret);
-int dissect_rpc_list(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, int offset, dissect_function_t *rpc_list_dissector);
-int dissect_rpc_array(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, int offset, dissect_function_t *rpc_array_dissector,
- int hfindex);
-int dissect_rpc_uint32(tvbuff_t *tvb,
- proto_tree *tree, int hfindex, int offset);
-int dissect_rpc_uint64(tvbuff_t *tvb,
- proto_tree *tree, int hfindex, int offset);
-
-int dissect_rpc_indir_call(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, int offset, int args_id, guint32 prog, guint32 vers,
- guint32 proc);
-int dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo,
- proto_tree *tree, int offset, int result_id, int prog_id, int vers_id,
- int proc_id);
-guint16 crc16_ccitt_tvb(tvbuff_t *tvb, unsigned int len);
-
-guint64 tvb_get_letoh64(tvbuff_t *tvb, gint offset);
-guint64 tvb_get_ntoh64(tvbuff_t *tvb, gint offset);
-
-proto_item* proto_tree_add_float(proto_tree*, int, tvbuff_t*, gint, gint, float);
-proto_item* proto_tree_add_float_hidden(proto_tree*, int, tvbuff_t*, gint, gint, float);
-proto_item* proto_tree_add_float_format(proto_tree*, int, tvbuff_t*, gint, gint, float, const char*, ...);
-
-gfloat tvb_get_ntohieee_float(tvbuff_t*, gint offset);
-gdouble tvb_get_ntohieee_double(tvbuff_t*, gint offset);
-gfloat tvb_get_letohieee_float(tvbuff_t*, gint offset);
-gdouble tvb_get_letohieee_double(tvbuff_t*, gint offset);
-
-proto_item *proto_tree_add_debug_text(proto_tree *tree, const char *format, ...);
-
-void rtp_add_address(packet_info *pinfo, address *addr, int port, int other_port, gchar *setup_method, guint32 setup_frame_number, int rtp_event_pt);
-void rtcp_add_address(packet_info *pinfo, address *addr, int port, int other_port, gchar *setup_method, guint32 setup_frame_number);
-
-GString *register_tap_listener(char *, void *, char *, tap_reset_cb, tap_packet_cb, tap_draw_cb);
-const char *get_datafile_dir(void);
-char* proto_registrar_get_abbrev(int n);
-header_field_info* proto_registrar_get_byname(const char *field_name);
-double fvalue_get_floating(fvalue_t *fv);
-char *fvalue_to_string_repr(fvalue_t *fv, ftrepr_t rtype, char *buf);
-guint32 fvalue_get_integer(fvalue_t *fv);
-
-int dissect_dcerpc_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                          proto_tree *tree, guint8 *drep,
-                          int hfindex, guint8 *pdata);
-int dissect_dcerpc_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                           proto_tree *tree, guint8 *drep,
-                           int hfindex, guint16 *pdata);
-int dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                           proto_tree *tree, guint8 *drep,
-                           int hfindex, guint32 *pdata);
-int dissect_dcerpc_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                           proto_tree *tree, char *drep,
-                           int hfindex, e_uuid_t *pdata);
-void dcerpc_init_uuid (int proto, int ett, e_uuid_t *uuid, guint16 ver, dcerpc_sub_dissector *procs, int opnum_hf);
-int dissect_ndr_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo,
-                        proto_tree *tree, guint8 *drep,
-                        int hfindex, guint32 *pdata);
-
-proto_item *proto_tree_add_uint64(proto_tree *tree, int hfindex, tvbuff_t *tvb,
-		gint start, gint length, guint64 value);			
-
diff --git a/plugins/plugin_gen.py b/plugins/plugin_gen.py
deleted file mode 100644
index 850acd0293..0000000000
--- a/plugins/plugin_gen.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#! /usr/bin/python
-# -*- python -*-
-#
-# $Id$
-#
-# mmelchior@xs4all.nl
-#
-# generate files for the windows plugin interface from a file with declarations
-#
-# The input for this script is generated by gcc using the following command:
-#
-# gcc -aux-info xyzzy $(pkg-config --cflags glib-2.0) -I ethereal-0.9.13 -c plugin_api_list.c
-#
-#   this gives one declaration per line, with consistent spacing.
-#
-#   with a much more elaborate parser than the one RE we have now, we could do without gcc.
-#
-
-"""Ethereal Windows interface generator."""
-
-import sys, string, os, re
-from string import strip, replace
-
-pattFile = re.compile('.*plugin_api_list.* extern (.*)') # match filename and select declaration
-pattName = re.compile('\w* .*?(\w*) \(.*') 		 # select function name
-
-if len(sys.argv) > 1:
-    file = open(sys.argv[1], 'r')       # input name on command line
-else:
-    file = sys.stdin			# read from a stream
-    
-f2 = open("Xplugin_api.h", 'w')		# defines to hide indirection
-f3 = open("Xplugin_api.c", 'w')		# statements to copy addresses from structure
-f4 = open("Xplugin_api_decls.h", 'w')	# pointer definitions
-f5 = open("Xplugin_table.h", 'w')	# type definitions
-f6 = open("Xass-list", 'w');		# exported structure initialization
-
-comment = "/* This file is generated by %s, do not edit. */\n\n" % sys.argv[0]
-f2.write(comment)
-f3.write(comment)
-f4.write(comment)
-f5.write(comment)
-f6.write(comment)
-
-pos = 0
-count = 0
-while 1:
-    line = file.readline()
-    if not line: break
-    matchobj = pattFile.match(line)
-    if matchobj:
-        # print "+", count, " ", strip(line)
-        decl = matchobj.group(1)
-        # print "=      ", decl
-        matchobj = pattName.match(decl)
-        if matchobj:
-            count = count + 1
-            name = matchobj.group(1)
-            # print "       ", name
-            f2.write("#define %s (*p_%s)\n" % (name, name))
-            f3.write("p_%s = pat->p_%s;\n" % (name, name))
-            f4.write("addr_%s p_%s;\n" % (name, name))
-            f5.write(replace("typedef %s\n" % decl, name, "(*addr_%s)" % name))
-            f6.write(name)
-            pos = pos + len(name) + 2
-            if pos > 60:
-                pos = 0
-                f6.write(",\n")
-            else:
-                f6.write(", ")
-        else:
-            print '**** function name not fount in "%s"' % decl
-            
-f6.write('\n')
-
-print "%d symbols exported" % count
-
-file.close()
-f2.close()
-f3.close()
-f4.close()
-f5.close()
-f6.close()
diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h
deleted file mode 100644
index 4d7f1e614c..0000000000
--- a/plugins/plugin_table.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* plugin_table.h
- * Table of exported addresses for Ethereal plugins.
- *
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
- *
- * 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 PLUGIN_TABLE_H
-#define PLUGIN_TABLE_H
-
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-
-/* Some OSes (Win32) have DLLs that cannot reference symbols in the parent
-   executable, so the executable needs to provide a collection of pointers
-   to those functions for the DLL plugin to use. */
-
-/* Typedefs to make our plugin_address_table_t struct look prettier */
-
-/* file generated by plugin_gen.py */
-#include "Xplugin_table.h"
-
-typedef guint8* (*addr_tvb_get_string)(tvbuff_t*, gint, gint);
-typedef guint8* (*addr_tvb_get_stringz)(tvbuff_t*, gint, gint*);
-
-typedef struct  {
-
-#include "plugin_api_decls.h"
-
-} plugin_address_table_t;
-
-#else /* ! PLUGINS_NEED_ADDRESS_TABLE */
-
-typedef void	plugin_address_table_t;
-
-#endif /* PLUGINS_NEED_ADDRESS_TABLE */
-
-#endif /* PLUGIN_TABLE_H */