-#ifndef __TREECTRLH_BASE__
-#define __TREECTRLH_BASE__
-
-#if defined(__WINDOWS__)
-#include "wx/msw/treectrl.h"
-#elif defined(__MOTIF__)
-#include "wx/generic/treectrl.h"
-#elif defined(__GTK__)
-#include "wx/generic/treectrl.h"
+#ifndef _WX_TREECTRL_H_BASE_
+#define _WX_TREECTRL_H_BASE_
+
+#include "wx/treebase.h"
+
+// ----------------------------------------------------------------------------
+// include the platform-dependent wxTreeCtrl class
+// ----------------------------------------------------------------------------
+
+#if defined(__WXMSW__)
+ #ifdef __WIN16__
+ #include "wx/generic/treectlg.h"
+ #else
+ #include "wx/msw/treectrl.h"
+ #endif
+#elif defined(__WXMOTIF__)
+ #include "wx/generic/treectlg.h"
+#elif defined(__WXGTK__)
+ #include "wx/generic/treectlg.h"
+#elif defined(__WXQT__)
+ #include "wx/qt/treectrl.h"
+#elif defined(__WXMAC__)
+ #include "wx/generic/treectlg.h"
+#elif defined(__WXPM__)
+ #include "wx/generic/treectlg.h"
+#elif defined(__WXSTUBS__)
+ #include "wx/generic/treectlg.h"