#include "wx/log.h"
#include "wx/event.h"
#include "wx/app.h"
+ #include "wx/dcclient.h"
+ #include "wx/dcmemory.h"
+ #include "wx/control.h"
#endif // WX_PRECOMP
#include "wx/imaglist.h"
-#include "wx/control.h"
#include "wx/sysopt.h"
-#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
#include "wx/msw/private.h"
#include <windowsx.h>
-
-#include <commctrl.h>
-
#include "wx/msw/winundef.h"
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
+
#if wxUSE_UXTHEME
#include "wx/msw/uxtheme.h"
#endif