diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 586680b307..82bb132b8a 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -2345,6 +2345,15 @@
 #           define wxUSE_STC 0
 #       endif
 #   endif
+
+#   if !wxUSE_SCROLLBAR
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxStyledTextCtrl requires wxUSE_SCROLLBAR"
+#       else
+#           undef wxUSE_STC
+#           define wxUSE_STC 0
+#       endif
+#   endif
 #endif /* wxUSE_STC */
 
 #if wxUSE_RICHTEXT
diff --git a/include/wx/qt/window.h b/include/wx/qt/window.h
index df402a42d4..3a07aed4c4 100644
--- a/include/wx/qt/window.h
+++ b/include/wx/qt/window.h
@@ -11,6 +11,9 @@
 
 #include <list>
 
+class QShortcut;
+template < class T > class QList;
+
 class QWidget;
 class QScrollWindow;
 class QAbstractScrollArea;
diff --git a/include/wx/univ/scrarrow.h b/include/wx/univ/scrarrow.h
index 6e6997c687..5746c7607a 100644
--- a/include/wx/univ/scrarrow.h
+++ b/include/wx/univ/scrarrow.h
@@ -11,6 +11,7 @@
 #ifndef _WX_UNIV_SCRARROW_H_
 #define _WX_UNIV_SCRARROW_H_
 
+#if wxUSE_SCROLLBAR
 // ----------------------------------------------------------------------------
 // wxScrollArrows is not a control but just a class containing the common
 // functionality of scroll arrows, whether part of scrollbars, spin ctrls or
@@ -107,5 +108,6 @@ public:
     // false to stop it
     virtual bool OnArrow(wxScrollArrows::Arrow arrow) = 0;
 };
+#endif // wxUSE_SCROLLBAR
 
 #endif // _WX_UNIV_SCRARROW_H_
diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 17c15f8788..0c0262384a 100644
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -35,6 +35,7 @@
     #include "wx/textctrl.h"
     #include "wx/intl.h"
     #include "wx/sizer.h"
+    #include "wx/wxcrtvararg.h"
 #endif
 
 #if wxUSE_STATLINE
diff --git a/src/msw/timectrl.cpp b/src/msw/timectrl.cpp
index 7469e12c3c..e02af0d273 100644
--- a/src/msw/timectrl.cpp
+++ b/src/msw/timectrl.cpp
@@ -21,7 +21,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_DATEPICKCTRL
+#if wxUSE_TIMEPICKCTRL
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcctl.h"
@@ -61,4 +61,4 @@ bool wxTimePickerCtrl::MSWOnDateTimeChange(const NMDATETIMECHANGE& dtch)
     wxDateEvent event(this, m_date, wxEVT_TIME_CHANGED);
     return HandleWindowEvent(event);
 }
-#endif // wxUSE_DATEPICKCTRL
+#endif // wxUSE_TIMEPICKCTRL
diff --git a/src/univ/scrarrow.cpp b/src/univ/scrarrow.cpp
index a540046aea..f693b8bbff 100644
--- a/src/univ/scrarrow.cpp
+++ b/src/univ/scrarrow.cpp
@@ -33,6 +33,7 @@
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 
+#if wxUSE_SCROLLBAR
 // ----------------------------------------------------------------------------
 // wxScrollArrowCaptureData: contains the data used while the arrow is being
 // pressed by the user
@@ -298,3 +299,4 @@ bool wxScrollArrows::HandleMouse(const wxMouseEvent& event) const
 
     return true;
 }
+#endif // wxUSE_SCROLLBAR
diff --git a/src/univ/scrolbar.cpp b/src/univ/scrolbar.cpp
index 61da0cf772..0f63eabd08 100644
--- a/src/univ/scrolbar.cpp
+++ b/src/univ/scrolbar.cpp
@@ -1153,7 +1153,7 @@ bool wxStdScrollBarInputHandler::HandleMouseMove(wxInputConsumer *consumer,
 
 #endif // wxUSE_SCROLLBAR
 
-#if wxUSE_TIMER
+#if wxUSE_TIMER && wxUSE_SCROLLBAR
 
 // ----------------------------------------------------------------------------
 // wxScrollTimer
@@ -1198,4 +1198,4 @@ void wxScrollTimer::Notify()
     }
 }
 
-#endif // wxUSE_TIMER
+#endif // wxUSE_TIMER && wxUSE_SCROLLBAR
diff --git a/src/univ/scrthumb.cpp b/src/univ/scrthumb.cpp
index 604c4044b5..33b7806d31 100644
--- a/src/univ/scrthumb.cpp
+++ b/src/univ/scrthumb.cpp
@@ -30,6 +30,7 @@
 #include "wx/univ/scrtimer.h"
 #include "wx/univ/scrthumb.h"
 
+#if wxUSE_SCROLLBAR
 // ----------------------------------------------------------------------------
 // wxScrollThumbCaptureData: the struct used while dragging the scroll thumb
 // ----------------------------------------------------------------------------
@@ -290,3 +291,4 @@ int wxScrollThumb::GetThumbPos(const wxMouseEvent& event) const
     int x = GetMouseCoord(event) - m_captureData->m_ofsMouse;
     return m_control->PixelToThumbPos(x);
 }
+#endif // wxUSE_SCROLLBAR
diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 553d9cb151..ac4b4bfc92 100644
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -59,6 +59,7 @@
 // implementation
 // ============================================================================
 
+#if wxUSE_SCROLLBAR
 // ----------------------------------------------------------------------------
 // scrollbars class
 // ----------------------------------------------------------------------------
@@ -80,6 +81,7 @@ public:
 
     virtual bool CanBeOutsideClientArea() const { return true; }
 };
+#endif // wxUSE_SCROLLBAR
 
 
 // ----------------------------------------------------------------------------