diff --git a/CMakeLists.txt b/CMakeLists.txt
index afbcbf2efd..fbf84bc454 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -747,7 +747,6 @@ endif()
 
 set(WTAP_PLUGIN_SOURCES
 	epan/plugins.c
-	epan/filesystem.c
 )
 
 set(SHARK_COMMON_CAPTURE_SRC
diff --git a/Makefile.am b/Makefile.am
index 9c69c814ad..671155123f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -312,8 +312,7 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \
 	-dlopen plugins/wimaxmacphy/wimaxmacphy.la
 
 WTAP_PLUGIN_SOURCES = \
-       epan/plugins.c \
-       epan/filesystem.c
+       epan/plugins.c
 
 else		# HAVE_PLUGINS
 
diff --git a/Makefile.nmake b/Makefile.nmake
index 364fca4fae..7947df6869 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -54,8 +54,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 PLATFORM_SRC = capture-wpcap.c capture_wpcap_packet.c capture_win_ifnames.c
 
 WTAP_PLUGIN_SOURCES = \
-	epan/plugins.c \
-	epan/filesystem.c
+	epan/plugins.c
 
 include Makefile.common
 
diff --git a/capinfos.c b/capinfos.c
index af69da1478..893901579c 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -76,16 +76,16 @@
 #include <glib.h>
 
 #include <wsutil/privileges.h>
+#include <wsutil/filesystem.h>
 
 /*
  * The symbols declared in the below are exported from libwireshark,
- * but we don't want to link whole libwireshark to editcap.
+ * but we don't want to link whole libwireshark to capinfos.
  * We link the object directly instead and this needs a little trick
  * with the WS_BUILD_DLL #define.
  */
 #define WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
-#include <epan/filesystem.h>
 #include <epan/plugins.h>
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
diff --git a/capture_info.c b/capture_info.c
index 42a9a16ade..b792845fb5 100644
--- a/capture_info.c
+++ b/capture_info.c
@@ -32,7 +32,6 @@
 /* XXX - try to remove this later */
 #include <epan/prefs.h>
 /* XXX - try to remove this later */
-#include <epan/filesystem.h>
 
 #include "capture_info.h"
 
@@ -59,6 +58,8 @@
 #include <epan/dissectors/packet-i2c.h>
 #include <epan/dissectors/packet-ax25-kiss.h>
 
+#include <wsutil/filesystem.h>
+
 static void capture_info_packet(
 packet_counts *counts, gint wtap_linktype, const guchar *pd, guint32 caplen, union wtap_pseudo_header *pseudo_header);
 
diff --git a/capture_sync.c b/capture_sync.c
index 252e5e99c2..ec650ff3f8 100644
--- a/capture_sync.c
+++ b/capture_sync.c
@@ -84,7 +84,6 @@
 
 #include "globals.h"
 #include "file.h"
-#include <epan/filesystem.h>
 
 #include "capture.h"
 #include "capture_sync.h"
@@ -97,6 +96,7 @@
 
 #include "ui/ui_util.h"
 
+#include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/report_err.h>
 #include "log.h"
diff --git a/color_filters.c b/color_filters.c
index ae894363d3..ca71e219e4 100644
--- a/color_filters.c
+++ b/color_filters.c
@@ -33,7 +33,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 
 #include <epan/packet.h>
diff --git a/dftest.c b/dftest.c
index 366e6dabd8..3192d3e9f8 100644
--- a/dftest.c
+++ b/dftest.c
@@ -35,7 +35,7 @@
 
 #include <epan/timestamp.h>
 #include <epan/plugins.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #include <epan/prefs.h>
 #include "ui/util.h"
diff --git a/editcap.c b/editcap.c
index 1e9587d755..e28f8b2676 100644
--- a/editcap.c
+++ b/editcap.c
@@ -76,6 +76,7 @@
 #endif
 
 #include <wsutil/privileges.h>
+#include <wsutil/filesystem.h>
 #include <wsutil/report_err.h>
 #include <wsutil/strnatcmp.h>
 #include <wsutil/md5.h>
@@ -89,7 +90,6 @@
 #define WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT /* wsutil/wsgetopt.h set export behavior above. */
 #include "epan/plugins.h"
-#include "epan/filesystem.h"
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
 
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index f287bd58d7..b9424dbd94 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1480,7 +1480,6 @@ set(LIBWIRESHARK_FILES
 	except.c
 	expert.c
 	exported_pdu.c
-	filesystem.c
 	filter_expressions.c
 	follow.c
 	frame_data.c
@@ -1682,8 +1681,6 @@ if(NOT ${ENABLE_STATIC})
 	)
 endif()
 
-add_definitions( -DTOP_SRCDIR=\"${CMAKE_SOURCE_DIR}\" )
-
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 907ae666df..69bd961a98 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -62,8 +62,7 @@ include Makefile.common
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) -I$(builddir)/wslua \
 	@LUA_INCLUDES@ $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) \
-	$(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) $(PY_CFLAGS) \
-	-DTOP_SRCDIR=\"$(abs_top_srcdir)\"
+	$(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) $(PY_CFLAGS)
 
 AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL
 
diff --git a/epan/Makefile.common b/epan/Makefile.common
index a18a468fb0..d4946abe60 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -51,7 +51,6 @@ LIBWIRESHARK_SRC =		\
 	except.c		\
 	expert.c		\
 	exported_pdu.c		\
-	filesystem.c		\
 	filter_expressions.c	\
 	follow.c		\
 	frame_data.c		\
@@ -189,7 +188,6 @@ LIBWIRESHARK_INCLUDES =		\
 	expert.h		\
 	exported_pdu.h		\
 	filter_expressions.h	\
-	filesystem.h		\
 	follow.h		\
 	frame_data.h		\
 	frame_data_sequence.h	\
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 4322d1cb2a..98b969c7f2 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -122,7 +122,7 @@
 #include "addr_and_mask.h"
 #include "ipv6-utils.h"
 #include "addr_resolv.h"
-#include "filesystem.h"
+#include "wsutil/filesystem.h"
 
 #include <wsutil/report_err.h>
 #include <wsutil/file_util.h>
diff --git a/epan/disabled_protos.c b/epan/disabled_protos.c
index 56b2622692..23f7b26547 100644
--- a/epan/disabled_protos.c
+++ b/epan/disabled_protos.c
@@ -35,7 +35,7 @@
 
 #include <glib.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/proto.h>
 
 #include "disabled_protos.h"
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 8f28b29d60..e984bfbb3a 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -52,7 +52,7 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
 #include <epan/wmem/wmem.h>
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index 06423ae988..b148ea4afb 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -29,7 +29,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 32a01d1291..08c2c88ea5 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -69,7 +69,7 @@
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/addr_resolv.h>
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 9406c78807..dfd5773c23 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -103,7 +103,7 @@
 #include <epan/dissectors/packet-x509af.h>
 #include <epan/dissectors/packet-ocsp.h>
 #include <epan/tap.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/expert.h>
 #include "packet-x509if.h"
 #include "packet-ssl.h"
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c
index fe48c4aea7..1b03430c7b 100644
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@@ -40,7 +40,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/emem.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/strutil.h>
 
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index 4e34e991d9..9f34ca53ee 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -45,7 +45,7 @@
 #include <epan/packet.h>
 #include <epan/tvbparse.h>
 #include <epan/dtd.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/garrayfix.h>
 
diff --git a/epan/oids.c b/epan/oids.c
index b34f9593bb..b5c9b63d32 100644
--- a/epan/oids.c
+++ b/epan/oids.c
@@ -39,7 +39,7 @@
 #include "prefs.h"
 #include "proto.h"
 #include "packet.h"
-#include "filesystem.h"
+#include "wsutil/filesystem.h"
 #include "dissectors/packet-ber.h"
 
 #ifdef HAVE_LIBSMI
diff --git a/epan/plugins.c b/epan/plugins.c
index c5995b84e5..51955e06ca 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -50,7 +50,7 @@ wslua_plugin *wslua_plugin_list = NULL;
 #include <unistd.h>
 #endif
 
-#include "filesystem.h"
+#include "wsutil/filesystem.h"
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>
 #include <wsutil/report_err.h>
diff --git a/epan/prefs.c b/epan/prefs.c
index 1476dc9e87..d0cf5817bc 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -36,7 +36,7 @@
 #include <glib.h>
 
 #include <stdio.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 #include <epan/oids.h>
diff --git a/epan/print.c b/epan/print.c
index d4a84d3d8a..5a45d58fdc 100644
--- a/epan/print.c
+++ b/epan/print.c
@@ -50,7 +50,7 @@
 #include <epan/charsets.h>
 #include <epan/dissectors/packet-data.h>
 #include <epan/dissectors/packet-frame.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #define PDML_VERSION "0"
 #define PSML_VERSION "0"
diff --git a/epan/uat.c b/epan/uat.c
index 2bbc7f77b8..fdf93f5524 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -42,7 +42,7 @@
 #include <wsutil/report_err.h>
 
 #include <epan/emem.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/packet.h>
 #include <epan/range.h>
 
diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h
index 7eb4a39378..237a224416 100644
--- a/epan/wslua/wslua.h
+++ b/epan/wslua/wslua.h
@@ -50,7 +50,7 @@
 #include <epan/proto.h>
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/funnel.h>
 #include <epan/tvbparse.h>
 #include <epan/epan.h>
diff --git a/file.c b/file.c
index a935438755..967eda5991 100644
--- a/file.c
+++ b/file.c
@@ -43,6 +43,7 @@
 
 #include <wsutil/tempfile.h>
 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>
 
 #include <wiretap/merge.h>
 
@@ -53,7 +54,6 @@
 #include <epan/packet.h>
 #include <epan/column-utils.h>
 #include <epan/expert.h>
-#include <epan/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/dfilter/dfilter.h>
 #include <epan/epan_dissect.h>
diff --git a/fileset.c b/fileset.c
index 869ae26b09..6318a41467 100644
--- a/fileset.c
+++ b/fileset.c
@@ -51,9 +51,9 @@
 #include <glib.h>
 
 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>
 #include "globals.h"
 
-#include <epan/filesystem.h>
 #include <epan/strutil.h>
 
 #include "fileset.h"
diff --git a/filters.c b/filters.c
index 5fb5ac4991..68eb9e418f 100644
--- a/filters.c
+++ b/filters.c
@@ -35,10 +35,10 @@
 
 #include <glib.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>
 
 #include "filters.h"
-#include <wsutil/file_util.h>
 
 /*
  * Old filter file name.
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index cbd02b3460..8e3af9dd58 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -76,7 +76,7 @@
 #include <epan/exceptions.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/oids.h>
 #include <epan/emem.h>
diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h
index 74cae5258b..5a1124d22a 100644
--- a/plugins/mate/mate.h
+++ b/plugins/mate/mate.h
@@ -50,7 +50,7 @@
 #include <epan/proto.h>
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "mate_util.h"
 
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index 6ea1c64d30..fca46c301f 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -43,7 +43,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/ipproto.h>
 #include <epan/expert.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/eap.h>
 
 #include "wimaxasncp_dict.h"
diff --git a/rawshark.c b/rawshark.c
index 85c7d4b0de..b86de656b3 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -66,10 +66,10 @@
 #include <glib.h>
 #include <epan/epan-int.h>
 #include <epan/epan.h>
-#include <epan/filesystem.h>
 #include <wsutil/crash_info.h>
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>
 
 #include "globals.h"
 #include <epan/packet.h>
diff --git a/tshark.c b/tshark.c
index 066096531e..52e621faad 100644
--- a/tshark.c
+++ b/tshark.c
@@ -62,10 +62,10 @@
 #include <epan/exceptions.h>
 #include <epan/epan-int.h>
 #include <epan/epan.h>
-#include <epan/filesystem.h>
 #include <wsutil/crash_info.h>
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>
 
 #include "globals.h"
 #include <epan/timestamp.h>
diff --git a/ui/alert_box.c b/ui/alert_box.c
index e5325523ba..72aed85061 100644
--- a/ui/alert_box.c
+++ b/ui/alert_box.c
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dfilter/dfilter.h>
 
 #include "ui/alert_box.h"
diff --git a/ui/follow.c b/ui/follow.c
index fe08c02156..4756bb6279 100644
--- a/ui/follow.c
+++ b/ui/follow.c
@@ -27,7 +27,7 @@
 
 #include <glib.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dfilter/dfilter.h>
 
 #include "ui/follow.h"
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c
index 906c0717d0..acb5f4f521 100644
--- a/ui/gtk/about_dlg.c
+++ b/ui/gtk/about_dlg.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/plugins.h>
 #ifdef HAVE_LIBSMI
 #include <epan/oids.h>
diff --git a/ui/gtk/addr_resolution_dlg.c b/ui/gtk/addr_resolution_dlg.c
index e87e19cdbf..57ad8e1459 100644
--- a/ui/gtk/addr_resolution_dlg.c
+++ b/ui/gtk/addr_resolution_dlg.c
@@ -31,7 +31,7 @@
 #include <gtk/gtk.h>
 
 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/addr_resolv.h>
 
 #include "../cfile.h"
diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c
index f6891da48e..eb9f9cbd2f 100644
--- a/ui/gtk/airpcap_dlg.c
+++ b/ui/gtk/airpcap_dlg.c
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/emem.h>
 #include <epan/prefs.h>
 #include <epan/frequency-utils.h>
diff --git a/ui/gtk/airpcap_gui_utils.c b/ui/gtk/airpcap_gui_utils.c
index e8d0f58a19..ab8be042ab 100644
--- a/ui/gtk/airpcap_gui_utils.c
+++ b/ui/gtk/airpcap_gui_utils.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/strutil.h>
 #include <epan/frequency-utils.h>
 #include <epan/crypt/airpdcap_ws.h>
diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 34845c3827..edd65a69d3 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -36,7 +36,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "../capture.h"
 #include "../capture_ifinfo.h"
diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index 1b9952d94a..4ca389a45e 100644
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -32,7 +32,7 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 
diff --git a/ui/gtk/conversation_hastables_dlg.c b/ui/gtk/conversation_hastables_dlg.c
index 6b9f245765..7f6648b87c 100644
--- a/ui/gtk/conversation_hastables_dlg.c
+++ b/ui/gtk/conversation_hastables_dlg.c
@@ -31,7 +31,7 @@
 #include <gtk/gtk.h>
 
 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/conversation.h>
 
 #include "ui/main_statusbar.h"
diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c
index dc6f48a54f..80b2baf51f 100644
--- a/ui/gtk/decode_as_dlg.c
+++ b/ui/gtk/decode_as_dlg.c
@@ -33,7 +33,7 @@
 
 #include <epan/packet.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
 
diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c
index bce3c9e992..22eca80b79 100644
--- a/ui/gtk/dlg_utils.c
+++ b/ui/gtk/dlg_utils.c
@@ -34,7 +34,7 @@
 #include "ui/gtk/stock_icons.h"
 #include "ui/gtk/old-gtk-compat.h"
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 
 
 static void
diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c
index 9cffb6cb67..0765d7f59e 100644
--- a/ui/gtk/edit_packet_comment_dlg.c
+++ b/ui/gtk/edit_packet_comment_dlg.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 
 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "ui/main_statusbar.h"
 
diff --git a/ui/gtk/export_sslkeys.c b/ui/gtk/export_sslkeys.c
index 57f4fc6a23..ab3c38005a 100644
--- a/ui/gtk/export_sslkeys.c
+++ b/ui/gtk/export_sslkeys.c
@@ -45,7 +45,7 @@
 # include <gdk/gdkkeysyms-compat.h>
 #endif
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/packet.h>
 #include <epan/epan_dissect.h>
 #include <epan/charsets.h>
diff --git a/ui/gtk/file_dlg.c b/ui/gtk/file_dlg.c
index 88b3f84660..5a4a9df0a5 100644
--- a/ui/gtk/file_dlg.c
+++ b/ui/gtk/file_dlg.c
@@ -47,7 +47,7 @@
 
 #include <wsutil/file_util.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "ui/last_open_dir.h"
 #include "ui/util.h"
diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c
index bcfe64bf91..fbfa866772 100644
--- a/ui/gtk/fileset_dlg.c
+++ b/ui/gtk/fileset_dlg.c
@@ -33,7 +33,7 @@
 #include <gtk/gtk.h>
 
 #include "file.h"
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "../fileset.h"
 
diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c
index b3319b4826..e1963027b4 100644
--- a/ui/gtk/filter_dlg.c
+++ b/ui/gtk/filter_dlg.c
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/proto.h>
 
diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c
index cfa83a0a2c..3a065fd7b0 100644
--- a/ui/gtk/firewall_dlg.c
+++ b/ui/gtk/firewall_dlg.c
@@ -52,7 +52,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/dissectors/packet-ipv6.h>
 
 #include <ui/alert_box.h>
diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c
index ae76a0d000..70d57fe458 100644
--- a/ui/gtk/flow_graph.c
+++ b/ui/gtk/flow_graph.c
@@ -31,7 +31,7 @@
 
 #include <epan/epan.h>
 #include <epan/packet.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/stat_cmd_args.h>
 #include <epan/to_str.h>
 #include <epan/strutil.h>
diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c
index 7e826e9211..b96c5e0686 100644
--- a/ui/gtk/follow_ssl.c
+++ b/ui/gtk/follow_ssl.c
@@ -41,7 +41,7 @@
 #include <epan/prefs.h>
 #include <epan/addr_resolv.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/tap.h>
 
 #include <ui/alert_box.h>
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c
index f43fdaf7f5..b040f3d1d4 100644
--- a/ui/gtk/follow_stream.c
+++ b/ui/gtk/follow_stream.c
@@ -35,7 +35,7 @@
 
 #include <epan/addr_resolv.h>
 #include <epan/follow.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/charsets.h>
 
diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c
index 9325309994..48ceec3b94 100644
--- a/ui/gtk/follow_tcp.c
+++ b/ui/gtk/follow_tcp.c
@@ -42,7 +42,7 @@
 #include <epan/addr_resolv.h>
 #include <epan/charsets.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/ipproto.h>
 #include <epan/charsets.h>
 
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index f1f1291e2d..2314009466 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -48,7 +48,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/addr_resolv.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "ui/util.h"
 
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index cdd939d1a4..11468e8db2 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -42,7 +42,7 @@
 #include <GeoIP.h>
 #include <epan/geoip_db.h>
 #include <wsutil/pint.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #endif
 
 #include <wsutil/file_util.h>
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 2ae2d2e171..62a33d9974 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -57,7 +57,7 @@
 #include <wsutil/pint.h>
 
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/tap.h>
 #include <epan/tap-voip.h>
 #include <epan/dissectors/packet-iax2.h>
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 8111264da1..ab35934156 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -71,7 +71,7 @@
 #include <wiretap/merge.h>
 
 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/epan_dissect.h>
 #include <epan/timestamp.h>
 #include <epan/plugins.h>
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 52b4128f68..be4ba6740a 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -44,7 +44,7 @@
 #include <epan/epan_dissect.h>
 #include <epan/column.h>
 #include <epan/stats_tree_priv.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/print.h>
 
 #include "cfile.h"
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index bc199e197a..8ad286e62c 100644
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -31,7 +31,7 @@
 #include <gtk/gtk.h>
 
 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/epan_dissect.h>
 #include <epan/expert.h>
 #include <epan/prefs.h>
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
index b80ffdcdf4..18a994fdc5 100644
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@@ -37,7 +37,7 @@
 
 #include <gtk/gtk.h>
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c
index cf749ea425..60c7494c55 100644
--- a/ui/gtk/packet_panes.c
+++ b/ui/gtk/packet_panes.c
@@ -50,7 +50,7 @@
 #include <epan/packet.h>
 #include <epan/charsets.h>
 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "../isprint.h"
 
diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c
index 900f8b949a..fceb2afdcb 100644
--- a/ui/gtk/pixmap_save.c
+++ b/ui/gtk/pixmap_save.c
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "ui/last_open_dir.h"
 #include "ui/simple_dialog.h"
diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c
index 54036b3622..ecbbfc25ee 100644
--- a/ui/gtk/print_dlg.c
+++ b/ui/gtk/print_dlg.c
@@ -30,7 +30,7 @@
 
 #include <epan/prefs.h>
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/print.h>
 
 #include "ui/alert_box.h"
diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c
index ba3620d310..a4f8b31f3b 100644
--- a/ui/gtk/profile_dlg.c
+++ b/ui/gtk/profile_dlg.c
@@ -31,7 +31,7 @@
 # include <gdk/gdkkeysyms-compat.h>
 #endif
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 
 #include "ui/profile.h"
diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c
index 983893f3ca..304ffe844d 100644
--- a/ui/gtk/proto_dlg.c
+++ b/ui/gtk/proto_dlg.c
@@ -33,7 +33,7 @@
 #endif
 
 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/disabled_protos.h>
 
 #include "ui/util.h"
diff --git a/ui/gtk/proto_help.c b/ui/gtk/proto_help.c
index bbf5fe04d0..8864961542 100644
--- a/ui/gtk/proto_help.c
+++ b/ui/gtk/proto_help.c
@@ -40,7 +40,7 @@
 #include "../file.h"
 
 #include <epan/prefs.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/strutil.h>
 #include <epan/proto.h>
 
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 080f2517cd..d1afddd0a6 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -57,7 +57,7 @@
 #include <wsutil/pint.h>
 
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/tap.h>
 #include <epan/dissectors/packet-rtp.h>
 #include <epan/rtp_pt.h>
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c
index d6fb56c8b0..e2280c5738 100644
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@@ -35,7 +35,7 @@
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 
 #include "../globals.h"
 #include "../stat_menu.h"
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index 38b3103472..72296813b1 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 
 #include <epan/epan_dissect.h>
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/to_str.h>
 #include <epan/strutil.h>
 
diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c
index 88778f6d4e..31b559db34 100644
--- a/ui/gtk/sctp_byte_graph_dlg.c
+++ b/ui/gtk/sctp_byte_graph_dlg.c
@@ -31,7 +31,7 @@
 
 #include <gtk/gtk.h>
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/strutil.h>
 
 #include "../globals.h"
diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c
index 22ad6545f2..4fb1d40ff9 100644
--- a/ui/gtk/sctp_chunk_stat_dlg.c
+++ b/ui/gtk/sctp_chunk_stat_dlg.c
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include "epan/to_str.h"
 
 #include "../globals.h"
diff --git a/ui/gtk/sctp_error_dlg.c b/ui/gtk/sctp_error_dlg.c
index 8840c113ec..55bc6c4ea4 100644
--- a/ui/gtk/sctp_error_dlg.c
+++ b/ui/gtk/sctp_error_dlg.c
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 
 #include "../globals.h"
 #include "ui/simple_dialog.h"
diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c
index d09175e7a4..2e2b7a10a9 100644
--- a/ui/gtk/sctp_graph_dlg.c
+++ b/ui/gtk/sctp_graph_dlg.c
@@ -32,7 +32,7 @@
 
 #include <gtk/gtk.h>
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/strutil.h>
 
 #include "../globals.h"
diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c
index d08a923526..6d7093b99b 100644
--- a/ui/gtk/sctp_stat_dlg.c
+++ b/ui/gtk/sctp_stat_dlg.c
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include "epan/to_str.h"
 
 #include "../globals.h"
diff --git a/ui/gtk/text_page_utils.c b/ui/gtk/text_page_utils.c
index 79ed47b8a8..f65225f6a9 100644
--- a/ui/gtk/text_page_utils.c
+++ b/ui/gtk/text_page_utils.c
@@ -31,7 +31,7 @@
 
 #include <gtk/gtk.h>
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 
 #include "ui/simple_dialog.h"
 #include <wsutil/file_util.h>
diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c
index cc58605ceb..95a5d53dfb 100644
--- a/ui/gtk/uat_gui.c
+++ b/ui/gtk/uat_gui.c
@@ -56,7 +56,7 @@
 #include <epan/packet.h>
 #include <epan/uat-int.h>
 #include <epan/value_string.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "../stat_menu.h"
 
diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c
index a05983c57a..49c4ec3a6e 100644
--- a/ui/gtk/voip_calls_dlg.c
+++ b/ui/gtk/voip_calls_dlg.c
@@ -43,7 +43,7 @@
 
 #include <epan/epan.h>
 #include <epan/packet.h>
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
 #include <epan/to_str.h>
diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c
index 5696865e9b..401b8492de 100644
--- a/ui/gtk/webbrowser.c
+++ b/ui/gtk/webbrowser.c
@@ -109,7 +109,7 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 
 #include "ui/simple_dialog.h"
diff --git a/ui/help_url.c b/ui/help_url.c
index c2ffa70f99..eddacbc713 100644
--- a/ui/help_url.c
+++ b/ui/help_url.c
@@ -30,7 +30,7 @@
 #include <glib.h>
 
 #include "help_url.h"
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 
 #ifdef HHC_DIR
 #include <windows.h>
diff --git a/ui/preference_utils.c b/ui/preference_utils.c
index efcc160a35..602412b5ff 100644
--- a/ui/preference_utils.c
+++ b/ui/preference_utils.c
@@ -30,7 +30,7 @@
 
 #include <epan/column-info.h>
 #include <epan/column.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
 
diff --git a/ui/profile.c b/ui/profile.c
index 60326646be..29ae5d1d12 100644
--- a/ui/profile.c
+++ b/ui/profile.c
@@ -31,7 +31,7 @@
 #include <glib.h>
 
 #include <epan/emem.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 
 #include "profile.h"
diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp
index a048b4dbb0..850b81d06c 100644
--- a/ui/qt/capture_file_dialog.cpp
+++ b/ui/qt/capture_file_dialog.cpp
@@ -36,7 +36,7 @@
 #include "file.h"
 #include "../../epan/addr_resolv.h"
 #include "../../epan/prefs.h"
-#include "../../epan/filesystem.h"
+#include "../../wsutil/filesystem.h"
 #include "../../wsutil/nstime.h"
 
 #include <wireshark_application.h>
diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp
index e4890f1ac5..af8a8b9212 100644
--- a/ui/qt/export_dissection_dialog.cpp
+++ b/ui/qt/export_dissection_dialog.cpp
@@ -34,7 +34,7 @@
 #include "ui/util.h"
 
 #include <epan/print.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include "qt_ui_utils.h"
 
diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp
index 7de589879a..ced6e32c5c 100644
--- a/ui/qt/export_object_dialog.cpp
+++ b/ui/qt/export_object_dialog.cpp
@@ -32,7 +32,7 @@
 
 #include <ui/alert_box.h>
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 
 #include <wsutil/str_util.h>
 
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index c4f2eb6e8e..97ee1ffa19 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -43,7 +43,7 @@
 #include <wiretap/merge.h>
 
 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #include <epan/epan_dissect.h>
 #include <epan/timestamp.h>
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index 2705ce2d80..d1af80ec1e 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -26,7 +26,7 @@
 #include <glib.h>
 
 #include "epan/expert.h"
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 
 #include "ui/main_statusbar.h"
 #include "ui/profile.h"
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 0dcbbea564..95e2179177 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -27,7 +27,7 @@
 #include "globals.h"
 
 #include <epan/epan_dissect.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/ipproto.h>
 #include <epan/prefs.h>
 
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index cdff3850b7..8c41cf8911 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -36,7 +36,7 @@
 
 #include "globals.h"
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 
 #ifdef _WIN32
diff --git a/ui/qt/profile_dialog.cpp b/ui/qt/profile_dialog.cpp
index dfd22afe45..b6660b0f16 100644
--- a/ui/qt/profile_dialog.cpp
+++ b/ui/qt/profile_dialog.cpp
@@ -24,7 +24,7 @@
 #include "config.h"
 #include <glib.h>
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include "epan/prefs.h"
 
 #include "ui/profile.h"
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 7338780ce0..613cdce3b6 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -23,7 +23,7 @@
 
 #include "wireshark_application.h"
 
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/timestamp.h>
 #include <epan/disabled_protos.h>
 
diff --git a/ui/recent.c b/ui/recent.c
index 41f5f93263..6abcbf45f8 100644
--- a/ui/recent.c
+++ b/ui/recent.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 
 #include <epan/epan.h>
-#include <epan/filesystem.h>
+#include <wsutil/filesystem.h>
 #include <epan/emem.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index b53ef90562..7b4d829ed2 100644
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -45,7 +45,7 @@
 
 #include "wiretap/merge.h"
 
-#include "epan/filesystem.h"
+#include "wsutil/filesystem.h"
 #include "epan/addr_resolv.h"
 #include "epan/prefs.h"
 #include "epan/print.h"
diff --git a/update.c b/update.c
index 13bb7adfbe..d89e5beb7f 100644
--- a/update.c
+++ b/update.c
@@ -30,7 +30,6 @@
 
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
-#include <epan/filesystem.h>
 
 #include "simple_dialog.h"
 #include "version_info.h"
@@ -40,6 +39,7 @@
 #endif
 
 #include <wsutil/file_util.h>
+#include <wsutil/filesystem.h>
 
 #include <wininet.h>
 #include "nio-ie5.h"
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index a2cc259fa5..283bd567a1 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -52,6 +52,7 @@ set(WSUTIL_FILES
   crcdrm.c
   des.c
   eax.c
+  filesystem.c
   g711.c
   md4.c
   md5.c
@@ -121,3 +122,17 @@ if(NOT ${ENABLE_STATIC})
 	)
 endif()
 
+add_definitions( -DTOP_SRCDIR=\"${CMAKE_SOURCE_DIR}\" )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index 8077de8dc0..6ead86a92f 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -65,7 +65,8 @@ lib_LTLIBRARIES = libwsutil.la
 libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 
 AM_CPPFLAGS = -I$(srcdir)/.. \
-	$(LIBGCRYPT_CFLAGS)
+	$(LIBGCRYPT_CFLAGS) \
+	-DTOP_SRCDIR=\"$(abs_top_srcdir)\"
 
 libwsutil_la_SOURCES =		\
 	$(LIBWSUTIL_SRC)	\
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index 4bf9cfa25f..063c2a95b3 100644
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -45,6 +45,7 @@ LIBWSUTIL_SRC = 	\
 	crcdrm.c	\
 	des.c		\
 	eax.c		\
+	filesystem.c	\
 	g711.c		\
 	md4.c		\
 	md5.c		\
@@ -79,6 +80,7 @@ LIBWSUTIL_INCLUDES = 	\
 	crcdrm.h	\
 	des.h		\
 	eax.h		\
+	filesystem.h	\
 	g711.h		\
 	md4.h		\
 	md5.h		\
diff --git a/epan/filesystem.c b/wsutil/filesystem.c
similarity index 100%
rename from epan/filesystem.c
rename to wsutil/filesystem.c
diff --git a/epan/filesystem.h b/wsutil/filesystem.h
similarity index 100%
rename from epan/filesystem.h
rename to wsutil/filesystem.h