diff --git a/docs/changes.txt b/docs/changes.txt
index 423d79f114..1335498ddd 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -63,6 +63,9 @@ Changes in behaviour which may result in build errors
   This only affects code defining its own custom renderers, code just using
   wxGraphicsContext::CreatePen() continues to compile and work as before.
 
+- wx/treebook.h doesn't include wx/treectrl.h (and, via it, wx/textctrl.h) any
+  more, include these headers explicitly from your code if necessary.
+
 
 3.1.2: (released 2018-??-??)
 ----------------------------
diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index 8661349c78..9e93d9cb2a 100644
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -17,10 +17,11 @@
 
 #include "wx/bookctrl.h"
 #include "wx/containr.h"
-#include "wx/treectrl.h"        // for wxArrayTreeItemIds
+#include "wx/treebase.h"        // for wxTreeItemId
 
 typedef wxWindow wxTreebookPage;
 
+class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
 class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
 
 // ----------------------------------------------------------------------------