diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp
index 026c86fd9c26dc1f264027ec5edd9eac1e1a4284..81afa517a9fa39bdeed56bf3d2a6aaf36da2a967 100644
--- a/src/activeqt/container/qaxselect.cpp
+++ b/src/activeqt/container/qaxselect.cpp
@@ -52,13 +52,13 @@
 
 #include "ui_qaxselect.h"
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QSortFilterProxyModel>
-#include <QtCore/QItemSelectionModel>
-#include <QtCore/QSysInfo>
-#include <QtCore/QTextStream>
-#include <QtWidgets/QDesktopWidget>
-#include <QtWidgets/QPushButton>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qsortfilterproxymodel.h>
+#include <QtCore/qitemselectionmodel.h>
+#include <QtCore/qsysinfo.h>
+#include <QtCore/qtextstream.h>
+#include <QtWidgets/qdesktopwidget.h>
+#include <QtWidgets/qpushbutton.h>
 
 #include <qt_windows.h>
 
diff --git a/src/activeqt/container/qaxselect.h b/src/activeqt/container/qaxselect.h
index 8921a17e7f763922c0ecdf06dcb211f7299feb0a..54552d9b10ba2c24c9fff96e3331ffbb37b63b87 100644
--- a/src/activeqt/container/qaxselect.h
+++ b/src/activeqt/container/qaxselect.h
@@ -50,7 +50,7 @@
 
 #ifndef QAXSELECT_H
 #define QAXSELECT_H
-#include <QtWidgets/QDialog>
+#include <QtWidgets/qdialog.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h
index 3a9f19ea2b7c6a8d64b9b663fa6a8c5ec60b87e1..db1f73a9b57c996967989fd990e2686ba3a5fceb 100644
--- a/src/activeqt/container/qaxwidget.h
+++ b/src/activeqt/container/qaxwidget.h
@@ -52,7 +52,7 @@
 #define QAXWIDGET_H
 
 #include <ActiveQt/qaxbase.h>
-#include <QtWidgets/QWidget>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/activeqt/control/qaxaggregated.cpp b/src/activeqt/control/qaxaggregated.cpp
index 61e858b5f5534368a50a951fc23f3197f0081ea0..0e95308b2698aee6080dc643db2799325d5baebe 100644
--- a/src/activeqt/control/qaxaggregated.cpp
+++ b/src/activeqt/control/qaxaggregated.cpp
@@ -51,7 +51,7 @@
 #include "qaxaggregated.h"
 
 #ifdef QT_WIDGETS_LIB
-#  include <QtWidgets/QWidget>
+#  include <QtWidgets/qwidget.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/activeqt/control/qaxbindable.h b/src/activeqt/control/qaxbindable.h
index d2dcc3673c44c436d759f2e1a1dc6b9f2079c472..1bb3b0c4b294f78a276e2ec622e8db8e11ccdcc6 100644
--- a/src/activeqt/control/qaxbindable.h
+++ b/src/activeqt/control/qaxbindable.h
@@ -51,7 +51,7 @@
 #ifndef QAXBINDABLE_H
 #define QAXBINDABLE_H
 
-#include <QtWidgets/QWidget>
+#include <QtWidgets/qwidget.h>
 
 struct IUnknown;
 
diff --git a/src/activeqt/shared/qaxutils.cpp b/src/activeqt/shared/qaxutils.cpp
index c41b321fc383e26c0e1d6e167d85642146c2737b..fb610f570f847789639d985aaaeef55bdbae55bd 100644
--- a/src/activeqt/shared/qaxutils.cpp
+++ b/src/activeqt/shared/qaxutils.cpp
@@ -50,19 +50,19 @@
 
 #include "qaxutils_p.h"
 
-#include <QtWidgets/QWidget>
-#include <QtGui/QPixmap>
-#include <QtGui/QRegion>
-#include <QtGui/QWindow>
-#include <QtGui/QGuiApplication>
+#include <QtWidgets/qwidget.h>
+#include <QtGui/qpixmap.h>
+#include <QtGui/qregion.h>
+#include <QtGui/qwindow.h>
+#include <QtGui/qguiapplication.h>
 #include <private/qhighdpiscaling_p.h>
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatformpixmap.h>
 #include <QtGui/private/qpixmap_raster_p.h>
-#include <QtCore/QScopedArrayPointer>
-#include <QtCore/QRect>
+#include <QtCore/qscopedpointer.h>
+#include <QtCore/qrect.h>
 
-#include <QtCore/QDebug>
+#include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/activeqt/shared/qaxutils_p.h b/src/activeqt/shared/qaxutils_p.h
index 2894a57522e1a08d87eec714d80e64b86a846fd0..21dcfebef804372bff717246b40c1090b63bce2f 100644
--- a/src/activeqt/shared/qaxutils_p.h
+++ b/src/activeqt/shared/qaxutils_p.h
@@ -63,9 +63,9 @@
 //
 
 #include <QtCore/qt_windows.h>
-#include <QtCore/QMetaType>
-#include <QtCore/QPair>
-#include <QtCore/QRect>
+#include <QtCore/qmetatype.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qrect.h>
 
 QT_BEGIN_NAMESPACE