#if wxUSE_GAUGE
+#include "wx/gauge.h"
+
#ifndef WX_PRECOMP
#endif
-#include "wx/gauge.h"
#include "wx/msw/private.h"
-#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
- #include <commctrl.h>
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
// ----------------------------------------------------------------------------
// constants