diff --git a/include/wx/fileback.h b/include/wx/fileback.h
index 5fb48643f7..2f98bb7198 100644
--- a/include/wx/fileback.h
+++ b/include/wx/fileback.h
@@ -14,6 +14,8 @@
 
 #if wxUSE_BACKINGFILE
 
+#include "wx/stream.h"
+
 // ----------------------------------------------------------------------------
 // Backs an input stream with memory or a file to make it seekable.
 //
diff --git a/src/common/fileback.cpp b/src/common/fileback.cpp
index 23d60c349a..3ca4771562 100644
--- a/src/common/fileback.cpp
+++ b/src/common/fileback.cpp
@@ -16,13 +16,13 @@
 
 #if wxUSE_BACKINGFILE
 
+#include "wx/fileback.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/stream.h"
     #include "wx/utils.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/fileback.h"
 #include "wx/private/filename.h"
 
 // Prefer wxFFile unless wxFile has large file support but wxFFile does not.
diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp
index 0211001b92..8985914aa1 100644
--- a/src/generic/collpaneg.cpp
+++ b/src/generic/collpaneg.cpp
@@ -17,12 +17,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/collpane.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/toplevel.h"
     #include "wx/button.h"
     #include "wx/sizer.h"
 #endif // !WX_PRECOMP
 
-#include "wx/collpane.h"
 #include "wx/statline.h"
 
 // ----------------------------------------------------------------------------