diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index 168bc1a1b0..7d82b005d8 100644
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -28,9 +28,9 @@
     class WXDLLIMPEXP_CORE wxImage;
 #endif // wxUSE_GUI
 
-//--------------------------------------------------------------------------------
-// wxMemoryFSHandler
-//--------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxMemoryFSHandlerBase
+// ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxMemoryFSHandlerBase : public wxFileSystemHandler
 {
@@ -57,17 +57,36 @@ protected:
     static wxHashTable *m_Hash;
 };
 
-class wxMemoryFSHandler : public wxMemoryFSHandlerBase
+// ----------------------------------------------------------------------------
+// wxMemoryFSHandler
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI
+
+// add GUI-only operations to the base class
+class WXDLLIMPEXP_CORE wxMemoryFSHandler : public wxMemoryFSHandlerBase
 {
 public:
-#if wxUSE_GUI
+    // bring the base class versions into the scope, otherwise they would be
+    // inaccessible in wxMemoryFSHandler
+    using wxMemoryFSHandlerBase::AddFile;
+
 #if wxUSE_IMAGE
     static void AddFile(const wxString& filename, wxImage& image, long type);
 #endif // wxUSE_IMAGE
+
     static void AddFile(const wxString& filename, const wxBitmap& bitmap, long type);
-#endif // wxUSE_GUI
 };
 
+#else // !wxUSE_GUI
+
+// just the same thing as the base class in wxBase
+class WXDLLIMPEXP_BASE wxMemoryFSHandler : public wxMemoryFSHandlerBase
+{
+};
+
+#endif // wxUSE_GUI/!wxUSE_GUI
+
 #endif // wxUSE_FILESYSTEM
 
 #endif // _WX_FS_MEM_H_