Export libwireshark symbols using WS_DLL_PUBLIC define

Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992

53 files changed, 11 insertions, 144 deletions

diff --git a/wiretap/5views.h b/wiretap/5views.h
index 98382013cc..74f7c8cb4c 100644
--- a/wiretap/5views.h
+++ b/wiretap/5views.h
@@ -25,11 +25,8 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int _5views_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean _5views_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int _5views_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index bc9c57197d..7fda5b568b 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -110,9 +110,6 @@ add_library(wiretap ${LINK_MODE_LIB}
 set(FULL_SO_VERSION "0.0.0")
 
 set_target_properties(wiretap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
-if(DEFINED COMPILE_HIDE_SYMBOLS)
-       set_target_properties(wiretap PROPERTIES COMPILE_FLAGS ${COMPILE_HIDE_SYMBOLS})
-endif()
 set_target_properties(wiretap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 set_target_properties(wiretap PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0)
 
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index e1a8178b4e..9289b97c65 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -32,7 +32,7 @@ lib_LTLIBRARIES = libwiretap.la
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 
-AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL @COMPILE_HIDE_SYMBOLS@
+AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL
 
 if HAVE_WARNINGS_AS_ERRORS
 AM_NON_GENERATED_CFLAGS += -Werror
diff --git a/wiretap/aethra.h b/wiretap/aethra.h
index 96590cc83c..1fdd19d54f 100644
--- a/wiretap/aethra.h
+++ b/wiretap/aethra.h
@@ -26,7 +26,6 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int aethra_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h
index 1c33877e87..faa7f03259 100644
--- a/wiretap/ascend-int.h
+++ b/wiretap/ascend-int.h
@@ -51,19 +51,15 @@ extern const gchar *ascend_parse_error;
 extern struct ascend_phdr *pseudo_header;
 
 /* Here we provide interfaces to make our scanner act and look like lex */
-WS_DLL_LOCAL
 int ascendlex(void);
 
-WS_DLL_LOCAL
 void init_parse_ascend(void);
-WS_DLL_LOCAL
 void ascend_init_lexer(FILE_T fh);
 typedef enum {
     PARSED_RECORD,
     PARSED_NONRECORD,
     PARSE_FAILED
 } parse_t;
-WS_DLL_LOCAL
 parse_t parse_ascend(FILE_T fh, guint8 *pd, struct ascend_phdr *phdr,
 		ascend_pkthdr *hdr, gint64 *start_of_data);
 
diff --git a/wiretap/ascendtext.h b/wiretap/ascendtext.h
index e54a86ffb5..1e75a230be 100644
--- a/wiretap/ascendtext.h
+++ b/wiretap/ascendtext.h
@@ -29,7 +29,6 @@
 #define ASCEND_MAX_DATA_COLS 16
 #define ASCEND_MAX_PKT_LEN (ASCEND_MAX_DATA_ROWS * ASCEND_MAX_DATA_COLS)
 
-WS_DLL_LOCAL
 int ascend_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/atm.h b/wiretap/atm.h
index 9afc109b5e..fe7b5130a1 100644
--- a/wiretap/atm.h
+++ b/wiretap/atm.h
@@ -31,12 +31,10 @@
  * that information).
  */
 
-WS_DLL_LOCAL
 extern void
 atm_guess_traffic_type(const guint8 *pd, guint32 len,
     union wtap_pseudo_header *pseudo_header);
 
-WS_DLL_LOCAL
 extern void
 atm_guess_lane_type(const guint8 *pd, guint32 len,
     union wtap_pseudo_header *pseudo_header);
diff --git a/wiretap/ber.h b/wiretap/ber.h
index c920317da1..a4a16eb14e 100644
--- a/wiretap/ber.h
+++ b/wiretap/ber.h
@@ -25,7 +25,6 @@
 #include <glib.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int ber_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/btsnoop.h b/wiretap/btsnoop.h
index a3d032d436..38e84b4204 100644
--- a/wiretap/btsnoop.h
+++ b/wiretap/btsnoop.h
@@ -25,13 +25,9 @@
 #include <glib.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int btsnoop_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean btsnoop_dump_open_h1(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 gboolean btsnoop_dump_open_h4(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int btsnoop_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/catapult_dct2000.h b/wiretap/catapult_dct2000.h
index 9de081f0ca..7e03066d90 100644
--- a/wiretap/catapult_dct2000.h
+++ b/wiretap/catapult_dct2000.h
@@ -26,11 +26,8 @@
 #include <glib.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int catapult_dct2000_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean catapult_dct2000_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int catapult_dct2000_dump_can_write_encap(int encap);
 
 #define DCT2000_ENCAP_UNHANDLED 0
diff --git a/wiretap/commview.h b/wiretap/commview.h
index 3385f32569..64e02cdd8b 100644
--- a/wiretap/commview.h
+++ b/wiretap/commview.h
@@ -27,11 +27,8 @@
 #include <glib.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int commview_open(wtap *wth, int *err, gchar **err_info _U_);
-WS_DLL_LOCAL
 int commview_dump_can_write_encap(int encap);
-WS_DLL_LOCAL
 gboolean commview_dump_open(wtap_dumper *wdh, int *err);
 
 #endif /* __COMMVIEW_H__ */
diff --git a/wiretap/cosine.h b/wiretap/cosine.h
index 54b886bd6f..f6ff1d13b7 100644
--- a/wiretap/cosine.h
+++ b/wiretap/cosine.h
@@ -30,7 +30,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int cosine_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/csids.h b/wiretap/csids.h
index cbb0b17a98..cff2b68a07 100644
--- a/wiretap/csids.h
+++ b/wiretap/csids.h
@@ -27,7 +27,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int csids_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/daintree-sna.h b/wiretap/daintree-sna.h
index f10d53def7..0b10d30a74 100644
--- a/wiretap/daintree-sna.h
+++ b/wiretap/daintree-sna.h
@@ -29,7 +29,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int daintree_sna_open(wtap *wth, int *err, gchar **err_info _U_);
 
 #endif /* __DAINTREE_SNA_H__ */
diff --git a/wiretap/dbs-etherwatch.h b/wiretap/dbs-etherwatch.h
index 3fc60fa0f9..4e14c0a0ab 100644
--- a/wiretap/dbs-etherwatch.h
+++ b/wiretap/dbs-etherwatch.h
@@ -27,7 +27,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int dbs_etherwatch_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/dct3trace.h b/wiretap/dct3trace.h
index 2c23c96cac..283d31772d 100644
--- a/wiretap/dct3trace.h
+++ b/wiretap/dct3trace.h
@@ -26,7 +26,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int dct3trace_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/erf.h b/wiretap/erf.h
index a666796e2b..4953e5b221 100644
--- a/wiretap/erf.h
+++ b/wiretap/erf.h
@@ -105,14 +105,10 @@ union erf_subhdr {
 #define RECORDS_FOR_ERF_CHECK 20
 #define FCS_BITS	32
 
-WS_DLL_LOCAL
 int erf_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 int erf_dump_can_write_encap(int encap);
-WS_DLL_LOCAL
 int erf_dump_open(wtap_dumper *wdh, int *err);
 
-WS_DLL_LOCAL
 int erf_populate_interfaces(wtap *wth);
 
 #endif /* __W_ERF_H__ */
diff --git a/wiretap/eyesdn.h b/wiretap/eyesdn.h
index 46cee9e53c..185de4bad7 100644
--- a/wiretap/eyesdn.h
+++ b/wiretap/eyesdn.h
@@ -28,7 +28,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int eyesdn_open(wtap *wth, int *err, gchar **err_info);
 
 enum EyeSDN_TYPES {
@@ -43,9 +42,7 @@ enum EyeSDN_TYPES {
     EYESDN_ENCAP_V5_EF
 };
 
-WS_DLL_LOCAL
 gboolean eyesdn_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int eyesdn_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h
index ca02fbbab5..3de26aaefa 100644
--- a/wiretap/file_wrappers.h
+++ b/wiretap/file_wrappers.h
@@ -28,57 +28,33 @@
 #include <wsutil/file_util.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 extern FILE_T file_open(const char *path);
-WS_DLL_LOCAL
 extern FILE_T file_fdopen(int fildes);
-WS_DLL_LOCAL
 extern void file_set_random_access(FILE_T stream, gboolean random_flag, GPtrArray *seek);
-WS_DLL_PUBLIC
-extern gint64 file_seek(FILE_T stream, gint64 offset, int whence, int *err);
-WS_DLL_LOCAL
+WS_DLL_PUBLIC gint64 file_seek(FILE_T stream, gint64 offset, int whence, int *err);
 extern gint64 file_skip(FILE_T file, gint64 delta, int *err);
-WS_DLL_PUBLIC
-extern gint64 file_tell(FILE_T stream);
-WS_DLL_LOCAL
+WS_DLL_PUBLIC gint64 file_tell(FILE_T stream);
 extern gint64 file_tell_raw(FILE_T stream);
-WS_DLL_LOCAL
 extern int file_fstat(FILE_T stream, ws_statb64 *statb, int *err);
-WS_DLL_LOCAL
 extern gboolean file_iscompressed(FILE_T stream);
-WS_DLL_PUBLIC
-extern int file_read(void *buf, unsigned int count, FILE_T file);
-WS_DLL_PUBLIC
-extern int file_getc(FILE_T stream);
-WS_DLL_PUBLIC
-extern char *file_gets(char *buf, int len, FILE_T stream);
-WS_DLL_PUBLIC
-extern int file_eof(FILE_T stream);
-WS_DLL_PUBLIC
-extern int file_error(FILE_T fh, gchar **err_info);
-WS_DLL_LOCAL
+WS_DLL_PUBLIC int file_read(void *buf, unsigned int count, FILE_T file);
+WS_DLL_PUBLIC int file_getc(FILE_T stream);
+WS_DLL_PUBLIC char *file_gets(char *buf, int len, FILE_T stream);
+WS_DLL_PUBLIC int file_eof(FILE_T stream);
+WS_DLL_PUBLIC int file_error(FILE_T fh, gchar **err_info);
 extern void file_clearerr(FILE_T stream);
-WS_DLL_LOCAL
 extern void file_fdclose(FILE_T file);
-WS_DLL_LOCAL
 extern int file_fdreopen(FILE_T file, const char *path);
-WS_DLL_LOCAL
 extern void file_close(FILE_T file);
 
 #ifdef HAVE_LIBZ
 typedef struct wtap_writer *GZWFILE_T;
 
-WS_DLL_LOCAL
 extern GZWFILE_T gzwfile_open(const char *path);
-WS_DLL_LOCAL
 extern GZWFILE_T gzwfile_fdopen(int fd);
-WS_DLL_LOCAL
 extern guint gzwfile_write(GZWFILE_T state, const void *buf, guint len);
-WS_DLL_LOCAL
 extern int gzwfile_flush(GZWFILE_T state);
-WS_DLL_LOCAL
 extern int gzwfile_close(GZWFILE_T state);
-WS_DLL_LOCAL
 extern int gzwfile_geterr(GZWFILE_T state);
 #endif /* HAVE_LIBZ */
 
diff --git a/wiretap/hcidump.h b/wiretap/hcidump.h
index 2d66995999..b0e15df477 100644
--- a/wiretap/hcidump.h
+++ b/wiretap/hcidump.h
@@ -27,7 +27,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int hcidump_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/i4btrace.h b/wiretap/i4btrace.h
index 1a8ccf4ae5..8c1d61b05a 100644
--- a/wiretap/i4btrace.h
+++ b/wiretap/i4btrace.h
@@ -28,7 +28,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int i4btrace_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/ipfix.h b/wiretap/ipfix.h
index 04969599a1..5cdeb877e2 100644
--- a/wiretap/ipfix.h
+++ b/wiretap/ipfix.h
@@ -27,7 +27,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int ipfix_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/iptrace.h b/wiretap/iptrace.h
index aa729e3d2b..edd376ad96 100644
--- a/wiretap/iptrace.h
+++ b/wiretap/iptrace.h
@@ -27,7 +27,6 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int iptrace_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/iseries.h b/wiretap/iseries.h
index dc4388bc72..35b4880a50 100644
--- a/wiretap/iseries.h
+++ b/wiretap/iseries.h
@@ -26,7 +26,6 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int iseries_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/k12.h b/wiretap/k12.h
index 0c214b9532..01f2c552b2 100644
--- a/wiretap/k12.h
+++ b/wiretap/k12.h
@@ -26,17 +26,11 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int k12_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 int k12_dump_can_write_encap(int encap);
-WS_DLL_LOCAL
 gboolean k12_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int k12text_open(wtap *wth, int *err, gchar **err_info _U_);
-WS_DLL_LOCAL
 int k12text_dump_can_write_encap(int encap);
-WS_DLL_LOCAL
 gboolean k12text_dump_open(wtap_dumper *wdh, int *err);
 
 #endif
diff --git a/wiretap/lanalyzer.h b/wiretap/lanalyzer.h
index 532e0b4d23..f225170c9f 100644
--- a/wiretap/lanalyzer.h
+++ b/wiretap/lanalyzer.h
@@ -26,11 +26,8 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int         lanalyzer_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean    lanalyzer_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int         lanalyzer_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h
index dee0122376..c029829acc 100644
--- a/wiretap/libpcap.h
+++ b/wiretap/libpcap.h
@@ -102,11 +102,8 @@ struct pcaprec_nokia_hdr {
 	guint8 stuff[4];	/* mysterious stuff */
 };
 
-WS_DLL_LOCAL
 int libpcap_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean libpcap_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int libpcap_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/mime_file.h b/wiretap/mime_file.h
index 2f03d80e24..35b9e3a65f 100644
--- a/wiretap/mime_file.h
+++ b/wiretap/mime_file.h
@@ -26,7 +26,6 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int mime_file_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/mp2t.h b/wiretap/mp2t.h
index f7f765d069..0bc8dd63a6 100644
--- a/wiretap/mp2t.h
+++ b/wiretap/mp2t.h
@@ -28,7 +28,6 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int mp2t_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/mpeg.h b/wiretap/mpeg.h
index ac86c53461..5cce7cee0a 100644
--- a/wiretap/mpeg.h
+++ b/wiretap/mpeg.h
@@ -28,7 +28,6 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int mpeg_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/netmon.h b/wiretap/netmon.h
index d70085a30e..cca5be3557 100644
--- a/wiretap/netmon.h
+++ b/wiretap/netmon.h
@@ -26,13 +26,9 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int netmon_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean netmon_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int netmon_dump_can_write_encap_1_x(int encap);
-WS_DLL_LOCAL
 int netmon_dump_can_write_encap_2_x(int encap);
 
 #endif
diff --git a/wiretap/netscaler.h b/wiretap/netscaler.h
index 3beee57c96..04eddb3397 100644
--- a/wiretap/netscaler.h
+++ b/wiretap/netscaler.h
@@ -95,14 +95,10 @@
 #define NSPR_HEADER_VERSION203 0x23
 #define NSPR_HEADER_VERSION204 0x24
 #define NSPR_HEADER_VERSION205 0x25
-WS_DLL_LOCAL
 int nstrace_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 int nstrace_10_dump_can_write_encap(int encap);
-WS_DLL_LOCAL
 int nstrace_20_dump_can_write_encap(int encap);
 
-WS_DLL_LOCAL
 gboolean nstrace_dump_open(wtap_dumper *wdh, int *err);
 
 
diff --git a/wiretap/netscreen.h b/wiretap/netscreen.h
index f048520c29..9d6e9fe0e4 100644
--- a/wiretap/netscreen.h
+++ b/wiretap/netscreen.h
@@ -51,7 +51,6 @@
 
 #define NETSCREEN_MAX_PACKET_LEN	65536
 
-WS_DLL_LOCAL
 int netscreen_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/nettl.h b/wiretap/nettl.h
index d03765b97a..3e5227a91d 100644
--- a/wiretap/nettl.h
+++ b/wiretap/nettl.h
@@ -128,11 +128,8 @@
 
 #define NETTL_HDR_PDU_MASK              0x30000000
 
-WS_DLL_LOCAL
 int nettl_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean nettl_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int nettl_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/network_instruments.h b/wiretap/network_instruments.h
index 4ca16400b3..a89e2a63ba 100644
--- a/wiretap/network_instruments.h
+++ b/wiretap/network_instruments.h
@@ -25,11 +25,8 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int network_instruments_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 int network_instruments_dump_can_write_encap(int encap);
-WS_DLL_LOCAL
 gboolean network_instruments_dump_open(wtap_dumper *wdh, int *err);
 
 /*
diff --git a/wiretap/netxray.h b/wiretap/netxray.h
index 36e275732c..9225537207 100644
--- a/wiretap/netxray.h
+++ b/wiretap/netxray.h
@@ -26,15 +26,10 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int netxray_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 int netxray_dump_can_write_encap_1_1(int encap);
-WS_DLL_LOCAL
 gboolean netxray_dump_open_1_1(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int netxray_dump_can_write_encap_2_0(int encap);
-WS_DLL_LOCAL
 gboolean netxray_dump_open_2_0(wtap_dumper *wdh, int *err);
 
 #endif
diff --git a/wiretap/ngsniffer.h b/wiretap/ngsniffer.h
index 7176270faa..5c4cd5afe9 100644
--- a/wiretap/ngsniffer.h
+++ b/wiretap/ngsniffer.h
@@ -26,11 +26,8 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int ngsniffer_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean ngsniffer_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int ngsniffer_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/packetlogger.h b/wiretap/packetlogger.h
index a82256dd4a..a150c9ecf6 100644
--- a/wiretap/packetlogger.h
+++ b/wiretap/packetlogger.h
@@ -29,7 +29,6 @@
 #include <glib.h>
 #include <wtap.h>
 
-WS_DLL_LOCAL
 int packetlogger_open(wtap *wth, int *err, gchar **err_info _U_);
 
 #endif /* __PACKETLOGGER_H__ */
diff --git a/wiretap/pcap-common.h b/wiretap/pcap-common.h
index 1753b792ca..4f7fb25cf2 100644
--- a/wiretap/pcap-common.h
+++ b/wiretap/pcap-common.h
@@ -31,21 +31,17 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 extern int pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap,
     guint packet_size, gboolean check_packet_size, struct wtap_pkthdr *phdr,
     union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info);
 
-WS_DLL_LOCAL
 extern void pcap_read_post_process(int file_type, int wtap_encap,
     union wtap_pseudo_header *pseudo_header,
     guint8 *pd, guint packet_size, gboolean bytes_swapped, int fcs_len);
 
-WS_DLL_LOCAL
 extern int pcap_get_phdr_size(int encap,
     const union wtap_pseudo_header *pseudo_header);
 
-WS_DLL_LOCAL
 extern gboolean pcap_write_phdr(wtap_dumper *wdh, int wtap_encap,
     const union wtap_pseudo_header *pseudo_header, int *err);
 
diff --git a/wiretap/pcap-encap.h b/wiretap/pcap-encap.h
index c86cbfcb56..f75ba67325 100644
--- a/wiretap/pcap-encap.h
+++ b/wiretap/pcap-encap.h
@@ -34,12 +34,9 @@
 extern "C" {
 #endif /* __cplusplus */
 
-WS_DLL_PUBLIC
-extern int wtap_pcap_encap_to_wtap_encap(int encap);
-WS_DLL_PUBLIC
-extern int wtap_wtap_encap_to_pcap_encap(int encap);
-WS_DLL_PUBLIC
-extern gboolean wtap_encap_requires_phdr(int encap);
+WS_DLL_PUBLIC int wtap_pcap_encap_to_wtap_encap(int encap);
+WS_DLL_PUBLIC int wtap_wtap_encap_to_pcap_encap(int encap);
+WS_DLL_PUBLIC gboolean wtap_encap_requires_phdr(int encap);
 
 #ifdef __cplusplus
 }
diff --git a/wiretap/pcapng.h b/wiretap/pcapng.h
index 41c46129ec..337c01f2e2 100644
--- a/wiretap/pcapng.h
+++ b/wiretap/pcapng.h
@@ -27,11 +27,8 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int pcapng_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean pcapng_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int pcapng_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/peekclassic.h b/wiretap/peekclassic.h
index 14121d82c5..825066c2a3 100644
--- a/wiretap/peekclassic.h
+++ b/wiretap/peekclassic.h
@@ -28,7 +28,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int peekclassic_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/peektagged.h b/wiretap/peektagged.h
index ad6626434a..60558e085b 100644
--- a/wiretap/peektagged.h
+++ b/wiretap/peektagged.h
@@ -25,7 +25,6 @@
 #include <glib.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int peektagged_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/pppdump.h b/wiretap/pppdump.h
index d89084d0cc..eef257ac77 100644
--- a/wiretap/pppdump.h
+++ b/wiretap/pppdump.h
@@ -27,7 +27,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int pppdump_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/radcom.h b/wiretap/radcom.h
index 8d9af6460b..808d4fbf66 100644
--- a/wiretap/radcom.h
+++ b/wiretap/radcom.h
@@ -28,7 +28,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int radcom_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/snoop.h b/wiretap/snoop.h
index 8010899661..fb2e28fa10 100644
--- a/wiretap/snoop.h
+++ b/wiretap/snoop.h
@@ -27,11 +27,8 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int snoop_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean snoop_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int snoop_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/tnef.h b/wiretap/tnef.h
index cbe5d8b18a..0bd60d245f 100644
--- a/wiretap/tnef.h
+++ b/wiretap/tnef.h
@@ -29,7 +29,6 @@
 
 #define TNEF_SIGNATURE 0x223E9F78
 
-WS_DLL_LOCAL
 int tnef_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/toshiba.h b/wiretap/toshiba.h
index 26d1432afd..df29366250 100644
--- a/wiretap/toshiba.h
+++ b/wiretap/toshiba.h
@@ -27,7 +27,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int toshiba_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/visual.h b/wiretap/visual.h
index e15bd256ff..23638bea14 100644
--- a/wiretap/visual.h
+++ b/wiretap/visual.h
@@ -32,11 +32,8 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int visual_open(wtap *wth, int *err, gchar **err_info);
-WS_DLL_LOCAL
 gboolean visual_dump_open(wtap_dumper *wdh, int *err);
-WS_DLL_LOCAL
 int visual_dump_can_write_encap(int encap);
 
 #endif
diff --git a/wiretap/vms.h b/wiretap/vms.h
index b4122083de..0e7abbc3ce 100644
--- a/wiretap/vms.h
+++ b/wiretap/vms.h
@@ -28,7 +28,6 @@
 #include <wtap.h>
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int vms_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/vwr.h b/wiretap/vwr.h
index 7cacc54c8c..8092088f41 100644
--- a/wiretap/vwr.h
+++ b/wiretap/vwr.h
@@ -26,7 +26,6 @@
 
 #include "ws_symbol_export.h"
 
-WS_DLL_LOCAL
 int vwr_open(wtap *wth, int *err, gchar **err_info);
 
 #endif
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index 1e62df935e..4e46f4a614 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -113,14 +113,12 @@ struct wtap_dumper {
     GArray                  *interface_data;        /**< An array holding the interface data from pcapng IDB:s or equivalent(?) NULL if not present.*/
 };
 
-WS_DLL_LOCAL
 gboolean wtap_dump_file_write(wtap_dumper *wdh, const void *buf,
     size_t bufsize, int *err);
 extern gint64 wtap_dump_file_seek(wtap_dumper *wdh, gint64 offset, int whence, int *err);
 extern gint64 wtap_dump_file_tell(wtap_dumper *wdh);
 
 
-WS_DLL_LOCAL
 extern gint wtap_num_file_types;
 
 /* Macros to byte-swap 64-bit, 32-bit and 16-bit quantities. */
@@ -366,7 +364,6 @@ extern gint wtap_num_file_types;
 #endif
 
 /*** get GSList of all compressed file extensions ***/
-WS_DLL_LOCAL
 GSList *wtap_get_compressed_file_extensions(void);
 
 #endif /* __WTAP_INT_H__ */
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index fc28b740dc..f82cac5ed9 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1156,7 +1156,6 @@ gboolean wtap_dump_can_write_encaps(int ft, const GArray *file_encaps);
 
 WS_DLL_PUBLIC
 gboolean wtap_dump_can_compress(int filetype);
-WS_DLL_LOCAL
 gboolean wtap_dump_has_name_resolution(int filetype);
 
 WS_DLL_PUBLIC