diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 1790a5b1c4..c3d2dfd478 100644
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -25,6 +25,10 @@
     #include "wx/msw/wrapwin.h"
 #endif
 
+#if defined(__WXQT__)
+    #include <QtGui/QFont>
+#endif
+
 class WXDLLIMPEXP_FWD_BASE wxArrayString;
 struct WXDLLIMPEXP_FWD_CORE wxNativeEncodingInfo;
 
diff --git a/include/wx/qt/private/converter.h b/include/wx/qt/private/converter.h
index 5bc0f2d8f8..208ac86fce 100644
--- a/include/wx/qt/private/converter.h
+++ b/include/wx/qt/private/converter.h
@@ -14,6 +14,8 @@
 #include "wx/defs.h"
 #include <QtCore/Qt>
 
+#include "wx/kbdstate.h"
+
 // Rely on overloading and let the compiler pick the correct version, which makes
 // them easier to use then to write wxQtConvertQtRectToWxRect() or wxQtConvertWxRectToQtRect()
 
diff --git a/include/wx/qt/private/winevent.h b/include/wx/qt/private/winevent.h
index 13c3ad6b18..5ca7d466d5 100644
--- a/include/wx/qt/private/winevent.h
+++ b/include/wx/qt/private/winevent.h
@@ -11,6 +11,7 @@
 #ifndef _WX_QT_EVENTSIGNALFORWARDER_H_
 #define _WX_QT_EVENTSIGNALFORWARDER_H_
 
+#include "wx/log.h"
 #include "wx/window.h"
 #include "wx/qt/private/converter.h"
 #include "wx/qt/private/utils.h"
diff --git a/include/wx/qt/toolbar.h b/include/wx/qt/toolbar.h
index 0697d372ea..0c9e4506f3 100644
--- a/include/wx/qt/toolbar.h
+++ b/include/wx/qt/toolbar.h
@@ -10,6 +10,7 @@
 #ifndef _WX_QT_TOOLBAR_H_
 #define _WX_QT_TOOLBAR_H_
 
+class QActionGroup;
 class wxQtToolBar;
 
 class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
diff --git a/src/qt/bitmap.cpp b/src/qt/bitmap.cpp
index 0e6244893b..e17876527a 100644
--- a/src/qt/bitmap.cpp
+++ b/src/qt/bitmap.cpp
@@ -8,16 +8,25 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/bitmap.h"
-#include "wx/image.h"
-#include "wx/rawbmp.h"
-#include "wx/qt/private/converter.h"
-#include "wx/qt/private/utils.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #include <QtGui/QPixmap>
 #include <QtGui/QBitmap>
 #include <QtWidgets/QLabel>
 
+#ifndef WX_PRECOMP
+    #include "wx/icon.h"
+    #include "wx/image.h"
+#endif // WX_PRECOMP
+
+#include "wx/bitmap.h"
+#include "wx/rawbmp.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/utils.h"
+
+
 static wxImage ConvertImage( QImage qtImage )
 {
     bool hasAlpha = qtImage.hasAlphaChannel();
diff --git a/src/qt/button.cpp b/src/qt/button.cpp
index d06e145730..382f12626c 100644
--- a/src/qt/button.cpp
+++ b/src/qt/button.cpp
@@ -8,8 +8,16 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+#endif // WX_PRECOMP
+
 #include "wx/button.h"
-#include "wx/bitmap.h"
+#include "wx/stockitem.h"
 #include "wx/qt/private/utils.h"
 #include "wx/qt/private/winevent.h"
 
diff --git a/src/qt/clipbrd.cpp b/src/qt/clipbrd.cpp
index 827ea69df9..aa09e516af 100644
--- a/src/qt/clipbrd.cpp
+++ b/src/qt/clipbrd.cpp
@@ -8,12 +8,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include <QApplication>
+#include <QClipboard>
+
 #include "wx/clipbrd.h"
 #include "wx/scopedarray.h"
 #include "wx/scopeguard.h"
 #include "wx/qt/private/converter.h"
 
-#include <QClipboard>
 
 // ----------------------------------------------------------------------------
 // wxClipboard ctor/dtor
diff --git a/src/qt/colour.cpp b/src/qt/colour.cpp
index e64784e902..bad77af5d6 100644
--- a/src/qt/colour.cpp
+++ b/src/qt/colour.cpp
@@ -9,12 +9,18 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include "wx/qt/private/utils.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+#endif // WX_PRECOMP
+
+#include "wx/qt/private/utils.h"
+
+
 int wxColour::GetPixel() const
 {
     wxMISSING_IMPLEMENTATION( "wxColour::GetPixel" );
diff --git a/src/qt/converter.cpp b/src/qt/converter.cpp
index 5b407f5e3c..334c41d131 100644
--- a/src/qt/converter.cpp
+++ b/src/qt/converter.cpp
@@ -9,8 +9,9 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/gdicmn.h"
-#include "wx/gdicmn.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #include <QtCore/QRect>
 #include <QtCore/QString>
@@ -22,6 +23,11 @@
     #include <QtCore/QDate>
 #endif // wxUSE_DATETIME
 
+#include "wx/kbdstate.h"
+#include "wx/gdicmn.h"
+#include "wx/gdicmn.h"
+
+
 wxPoint wxQtConvertPoint( const QPoint &point )
 {
     if (point.isNull())
diff --git a/src/qt/cursor.cpp b/src/qt/cursor.cpp
index c72ada4450..85714af8cc 100644
--- a/src/qt/cursor.cpp
+++ b/src/qt/cursor.cpp
@@ -7,11 +7,21 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include "wx/cursor.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #include <QApplication>
 #include <QBitmap>
 
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+#endif // WX_PRECOMP
+
+#include "wx/cursor.h"
+
+
 void wxSetCursor(const wxCursor& cursor)
 {
     if (cursor.m_qtCursor.shape() == Qt::ArrowCursor)
diff --git a/src/qt/dataobj.cpp b/src/qt/dataobj.cpp
index 7ecb014877..85935786bf 100644
--- a/src/qt/dataobj.cpp
+++ b/src/qt/dataobj.cpp
@@ -8,6 +8,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include <QObject>
+
 #include "wx/qt/private/converter.h"
 #include "wx/qt/private/utils.h"
 #include "wx/dataobj.h"
diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp
index 2b7860788b..05ac9f5988 100644
--- a/src/qt/dc.cpp
+++ b/src/qt/dc.cpp
@@ -8,12 +8,22 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include <QtGui/QBitmap>
+
+#ifndef WX_PRECOMP
+    #include "wx/icon.h"
+    #include "wx/log.h"
+#endif // WX_PRECOMP
+
 #include "wx/dc.h"
-#include "wx/icon.h"
 #include "wx/qt/dc.h"
 #include "wx/qt/private/converter.h"
 #include "wx/qt/private/utils.h"
-#include <QtGui/QBitmap>
+
 
 static void SetPenColour( QPainter *qtPainter, QColor col )
 {
diff --git a/src/qt/dcclient.cpp b/src/qt/dcclient.cpp
index b7e7270522..3b8dfce898 100644
--- a/src/qt/dcclient.cpp
+++ b/src/qt/dcclient.cpp
@@ -8,12 +8,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/dcclient.h"
-#include "wx/log.h"
-#include "wx/qt/dcclient.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #include <QtGui/QPicture>
 
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/window.h"
+#endif // WX_PRECOMP
+
+#include "wx/dcclient.h"
+#include "wx/qt/dcclient.h"
+
+
 //##############################################################################
 
 wxWindowDCImpl::wxWindowDCImpl( wxDC *owner )
diff --git a/src/qt/font.cpp b/src/qt/font.cpp
index 41e7673520..f9d5525d4a 100644
--- a/src/qt/font.cpp
+++ b/src/qt/font.cpp
@@ -8,13 +8,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include <QtGui/QFont>
+#include <QtGui/QFontInfo>
+
 #include "wx/font.h"
 #include "wx/fontutil.h"
 #include "wx/qt/private/utils.h"
 #include "wx/qt/private/converter.h"
 
-#include <QtGui/QFont>
-#include <QtGui/QFontInfo>
 
 static QFont::StyleHint ConvertFontFamily(wxFontFamily family)
 {
diff --git a/src/qt/fontutil.cpp b/src/qt/fontutil.cpp
index d77d7dc77d..3ce79b04d0 100644
--- a/src/qt/fontutil.cpp
+++ b/src/qt/fontutil.cpp
@@ -8,6 +8,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include <QtGui/QFont>
+
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 
diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp
index 4944181f22..5f39c9f974 100644
--- a/src/qt/frame.cpp
+++ b/src/qt/frame.cpp
@@ -8,12 +8,21 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include <QtWidgets/QScrollArea>
+
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/toolbar.h"
+#endif // WX_PRECOMP
+
 #include "wx/frame.h"
-#include "wx/menu.h"
 #include "wx/qt/private/utils.h"
 #include "wx/qt/private/converter.h"
 #include "wx/qt/private/winevent.h"
-#include <QtWidgets/QScrollArea>
 
 
 class wxQtMainWindow : public wxQtEventSignalHandler< QMainWindow, wxFrame >
diff --git a/src/qt/listctrl.cpp b/src/qt/listctrl.cpp
index 4b52c54f76..fdf6972be7 100644
--- a/src/qt/listctrl.cpp
+++ b/src/qt/listctrl.cpp
@@ -8,12 +8,20 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include <QHeaderView>
+
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+#endif // WX_PRECOMP
+
 #include "wx/listctrl.h"
 #include "wx/imaglist.h"
 #include "wx/qt/private/winevent.h"
 
-#include <QHeaderView>
-
 
 class wxQtTreeWidget : public wxQtEventSignalHandler< QTreeWidget, wxListCtrl >
 {
diff --git a/src/qt/tglbtn.cpp b/src/qt/tglbtn.cpp
index 02210d87bc..d89eb54134 100644
--- a/src/qt/tglbtn.cpp
+++ b/src/qt/tglbtn.cpp
@@ -8,8 +8,16 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+#endif // WX_PRECOMP
+
+#include "wx/stockitem.h"
 #include "wx/tglbtn.h"
-#include "wx/bitmap.h"
 #include "wx/qt/private/converter.h"
 #include "wx/qt/private/winevent.h"
 
diff --git a/src/qt/toolbar.cpp b/src/qt/toolbar.cpp
index 9535a5d671..5704942d10 100644
--- a/src/qt/toolbar.cpp
+++ b/src/qt/toolbar.cpp
@@ -8,14 +8,23 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/toolbar.h"
-#include "wx/qt/private/winevent.h"
-#include "wx/qt/private/converter.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #if wxUSE_TOOLBAR
 
+#include <QActionGroup>
 #include <QtWidgets/QToolButton>
 
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+#endif // WX_PRECOMP
+
+#include "wx/toolbar.h"
+#include "wx/qt/private/winevent.h"
+#include "wx/qt/private/converter.h"
+
 class wxQtToolButton;
 class wxToolBarTool : public wxToolBarToolBase
 {
diff --git a/src/qt/tooltip.cpp b/src/qt/tooltip.cpp
index 409035a2f7..f78b44f978 100644
--- a/src/qt/tooltip.cpp
+++ b/src/qt/tooltip.cpp
@@ -8,6 +8,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif // WX_PRECOMP
+
 #include "wx/tooltip.h"
 #include "wx/qt/private/utils.h"
 
diff --git a/src/qt/uiaction.cpp b/src/qt/uiaction.cpp
index b37d946b40..127843440e 100644
--- a/src/qt/uiaction.cpp
+++ b/src/qt/uiaction.cpp
@@ -8,12 +8,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include <QtTest/QtTestGui>
+
 #include "wx/qt/defs.h"
 #include "wx/qt/private/utils.h"
 #include "wx/uiaction.h"
 #include "wx/qt/private/converter.h"
 
-#include <QtTest/QtTestGui>
 
 #if wxUSE_UIACTIONSIMULATOR
 
diff --git a/src/qt/utils.cpp b/src/qt/utils.cpp
index 907e1c19de..f1e9db341b 100644
--- a/src/qt/utils.cpp
+++ b/src/qt/utils.cpp
@@ -8,11 +8,9 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/utils.h"
-#include "wx/window.h"
-#include "wx/cursor.h"
-#include "wx/qt/private/utils.h"
-#include "wx/qt/private/converter.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #include <QtGui/QCursor>
 #include <QtWidgets/QApplication>
@@ -20,6 +18,17 @@
 #include <QtGui/QDesktopServices>
 #include <QtCore/QUrl>
 
+#ifndef WX_PRECOMP
+    #include "wx/cursor.h"
+    #include "wx/log.h"
+    #include "wx/window.h"
+#endif // WX_PRECOMP
+
+#include "wx/utils.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+
+
 void wxMissingImplementation( const char fileName[], unsigned lineNumber,
     const char feature[] )
 {
diff --git a/src/qt/window.cpp b/src/qt/window.cpp
index a8b00ae9b5..1db35744b5 100644
--- a/src/qt/window.cpp
+++ b/src/qt/window.cpp
@@ -8,14 +8,9 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/window.h"
-#include "wx/log.h"
-#include "wx/menu.h"
-#include "wx/tooltip.h"
-#include "wx/scrolbar.h"
-#include "wx/qt/private/utils.h"
-#include "wx/qt/private/converter.h"
-#include "wx/qt/private/winevent.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #include <QtGui/QPicture>
 #include <QtGui/QPainter>
@@ -24,6 +19,20 @@
 #include <QtWidgets/QWidget>
 #include <QtWidgets/QScrollArea>
 
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
+    #include "wx/frame.h"
+    #include "wx/log.h"
+    #include "wx/menu.h"
+    #include "wx/scrolbar.h"
+#endif // WX_PRECOMP
+
+#include "wx/window.h"
+#include "wx/tooltip.h"
+#include "wx/qt/private/utils.h"
+#include "wx/qt/private/converter.h"
+#include "wx/qt/private/winevent.h"
+
 
 #define VERT_SCROLLBAR_POSITION 0, 1
 #define HORZ_SCROLLBAR_POSITION 1, 0