diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index ba1308c7d0..ae40a1599f 100644
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -16,8 +16,7 @@
 #include "wx/filesys.h"
 
 #if wxUSE_GUI
-    class WXDLLIMPEXP_FWD_CORE wxBitmap;
-    class WXDLLIMPEXP_FWD_CORE wxImage;
+    #include "wx/bitmap.h"
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index bd6b01618a..4d9ba72339 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -23,7 +23,6 @@
     #include "wx/hash.h"
     #include "wx/wxcrtvararg.h"
     #if wxUSE_GUI
-        #include "wx/bitmap.h"
         #include "wx/image.h"
     #endif // wxUSE_GUI
 #endif
diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index e76f7a0edb..74d6bbf9d7 100644
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/module.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/filename.h"