diff --git a/src/assistant/clucene/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h
index 738e9672d5a82f3c88d4022a891f16cb831e8d31..6d8e8197c633d03c87f22cd3d7cba44ea8f4828a 100644
--- a/src/assistant/clucene/qclucene_global_p.h
+++ b/src/assistant/clucene/qclucene_global_p.h
@@ -44,8 +44,6 @@
 #   include <qt_windows.h>
 #endif
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #ifdef QT_STATIC
@@ -130,6 +128,4 @@ using namespace QtCLuceneHelpers;
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QCLUCENE_GLOBAL_P_H
diff --git a/src/assistant/help/qhelp_global.h b/src/assistant/help/qhelp_global.h
index 409d49b9d59fb346c5232fcd45156a3bb69da5fc..23adc25db4f95449fbf03db5304b68de9ec793dc 100644
--- a/src/assistant/help/qhelp_global.h
+++ b/src/assistant/help/qhelp_global.h
@@ -46,8 +46,6 @@
 #include <QtCore/QString>
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -72,6 +70,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QHELP_GLOBAL_H
diff --git a/src/assistant/help/qhelpcontentwidget.h b/src/assistant/help/qhelpcontentwidget.h
index f10cb35f2e125506b769008c86c418948b34b643..ba5c1789e3f33e26792bfc2b224a1129ba0be41c 100644
--- a/src/assistant/help/qhelpcontentwidget.h
+++ b/src/assistant/help/qhelpcontentwidget.h
@@ -48,8 +48,6 @@
 #include <QtCore/QString>
 #include <QtWidgets/QTreeView>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -139,7 +137,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/assistant/help/qhelpdatainterface_p.h b/src/assistant/help/qhelpdatainterface_p.h
index 3b4e3ac84bb058477fa16bb025332e598f59b62b..ebb2bc1727530bb3c39ff26f8e70017f9356d6ac 100644
--- a/src/assistant/help/qhelpdatainterface_p.h
+++ b/src/assistant/help/qhelpdatainterface_p.h
@@ -58,8 +58,6 @@
 #include <QtCore/QStringList>
 #include <QtCore/QSharedData>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QHELP_EXPORT QHelpDataContentItem
@@ -150,6 +148,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QHELPDATAINTERFACE_H
diff --git a/src/assistant/help/qhelpengine.h b/src/assistant/help/qhelpengine.h
index 45bdec090941f0ad6c739c97de026040ff568e7c..1a7ffb539b8422d5ffdd111444d0d9788d4ee7f2 100644
--- a/src/assistant/help/qhelpengine.h
+++ b/src/assistant/help/qhelpengine.h
@@ -44,8 +44,6 @@
 
 #include <QtHelp/qhelpenginecore.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -80,6 +78,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/assistant/help/qhelpenginecore.h b/src/assistant/help/qhelpenginecore.h
index e17ae880cb5b58d2e65cbd126c09ed0f83ac3771..76a384fb26f1e0db45aaeeeca324eed25d43667c 100644
--- a/src/assistant/help/qhelpenginecore.h
+++ b/src/assistant/help/qhelpenginecore.h
@@ -49,8 +49,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -130,6 +128,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QHELPENGINECORE_H
diff --git a/src/assistant/help/qhelpgenerator_p.h b/src/assistant/help/qhelpgenerator_p.h
index 3c447e8986498f660741d58c53f4fe7e710444cd..49de20c1a5bc2dc85fa2bd29400a52b54063004b 100644
--- a/src/assistant/help/qhelpgenerator_p.h
+++ b/src/assistant/help/qhelpgenerator_p.h
@@ -58,8 +58,6 @@
 
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QHelpGeneratorPrivate;
@@ -113,6 +111,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/assistant/help/qhelpindexwidget.h b/src/assistant/help/qhelpindexwidget.h
index f852f44ed792834f10ad1de5030132b6038ec29b..fb043c50353f49706662b2add9f8bca87cd211c1 100644
--- a/src/assistant/help/qhelpindexwidget.h
+++ b/src/assistant/help/qhelpindexwidget.h
@@ -48,8 +48,6 @@
 #include <QtCore/QStringListModel>
 #include <QtWidgets/QListView>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -108,6 +106,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/assistant/help/qhelpprojectdata_p.h b/src/assistant/help/qhelpprojectdata_p.h
index 198bac8fc5f56ef95cd15e99f6f214bd9c135847..97db84c9a61f6cb4a2e8ae0138b80f0af87e2851 100644
--- a/src/assistant/help/qhelpprojectdata_p.h
+++ b/src/assistant/help/qhelpprojectdata_p.h
@@ -56,8 +56,6 @@
 #include "qhelp_global.h"
 #include "qhelpdatainterface_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QHelpProjectDataPrivate;
@@ -84,6 +82,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/assistant/help/qhelpsearchengine.h b/src/assistant/help/qhelpsearchengine.h
index 5312ff25a20ee307e6f4348ed046a6e39cb09693..6979871518525b59e2703b25eae7cf7e92e0fd72 100644
--- a/src/assistant/help/qhelpsearchengine.h
+++ b/src/assistant/help/qhelpsearchengine.h
@@ -50,8 +50,6 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -119,6 +117,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif  // QHELPSEARCHENGINE_H
diff --git a/src/assistant/help/qhelpsearchquerywidget.h b/src/assistant/help/qhelpsearchquerywidget.h
index b55961c2355a55f9a5c8a79d52dc367dd6731c38..f72e2ae3942a3507edd068a1aa12c3173a581462 100644
--- a/src/assistant/help/qhelpsearchquerywidget.h
+++ b/src/assistant/help/qhelpsearchquerywidget.h
@@ -51,8 +51,6 @@
 
 #include <QtWidgets/QWidget>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -86,6 +84,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif  // QHELPSEARCHQUERYWIDGET_H
diff --git a/src/assistant/help/qhelpsearchresultwidget.h b/src/assistant/help/qhelpsearchresultwidget.h
index a8af7f04d0e5dab7c8b808ebf1a037b4739364bb..13f8ac201fa4ac42695a85df08063218bb82f30c 100644
--- a/src/assistant/help/qhelpsearchresultwidget.h
+++ b/src/assistant/help/qhelpsearchresultwidget.h
@@ -51,8 +51,6 @@
 
 #include <QtWidgets/QWidget>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -79,6 +77,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif  // QHELPSEARCHRESULTWIDGET_H
diff --git a/src/designer/src/lib/components/qdesigner_components.h b/src/designer/src/lib/components/qdesigner_components.h
index f27a49b37bd05e42854e28d5cfe45a923a3b8c66..e5c16829295c87beda2b7b1e362c0a9d852aef56 100644
--- a/src/designer/src/lib/components/qdesigner_components.h
+++ b/src/designer/src/lib/components/qdesigner_components.h
@@ -45,8 +45,6 @@
 #include <QtDesigner/qdesigner_components_global.h>
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QObject;
@@ -77,6 +75,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QDESIGNER_COMPONENTS_H
diff --git a/src/designer/src/lib/components/qdesigner_components_global.h b/src/designer/src/lib/components/qdesigner_components_global.h
index 1a7701fdb9fd13ecef923b1b5ce67c90f0062d03..98b289a859579c13acbb28d66fe3ddcd165a7948 100644
--- a/src/designer/src/lib/components/qdesigner_components_global.h
+++ b/src/designer/src/lib/components/qdesigner_components_global.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #define QDESIGNER_COMPONENTS_EXTERN Q_DECL_EXPORT
@@ -61,6 +59,4 @@ QT_BEGIN_NAMESPACE
 
 
 QT_END_NAMESPACE
-QT_END_HEADER
-
 #endif // QDESIGNER_COMPONENTS_GLOBAL_H
diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h
index 685444700c5f8f1225c919198c4d530fe46936b6..c9ae323979c5e4f7cdac1afedcd235b60a42fef8 100644
--- a/src/designer/src/lib/extension/default_extensionfactory.h
+++ b/src/designer/src/lib/extension/default_extensionfactory.h
@@ -49,8 +49,6 @@
 #include <QtCore/QHash>
 #include <QtCore/QPair>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QExtensionManager;
@@ -81,6 +79,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // DEFAULT_EXTENSIONFACTORY_H
diff --git a/src/designer/src/lib/extension/extension.h b/src/designer/src/lib/extension/extension.h
index 75fd129376c6a65d175b6f7c5956e4227ecfee72..7f06855889ce7456f3197567a0e631562417a5b0 100644
--- a/src/designer/src/lib/extension/extension.h
+++ b/src/designer/src/lib/extension/extension.h
@@ -45,8 +45,6 @@
 #include <QtCore/QString>
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #define Q_TYPEID(IFace) QLatin1String(IFace##_iid)
@@ -104,6 +102,4 @@ template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manag
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // EXTENSION_H
diff --git a/src/designer/src/lib/extension/extension_global.h b/src/designer/src/lib/extension/extension_global.h
index f1c9adf8c2462e46050fefcd5d9e49c8fd5219cd..1ea217e5f02a2a6dcb37bacc180d9414743b6620 100644
--- a/src/designer/src/lib/extension/extension_global.h
+++ b/src/designer/src/lib/extension/extension_global.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 #define QDESIGNER_EXTENSION_EXTERN Q_DECL_EXPORT
@@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE
 #endif
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // EXTENSION_GLOBAL_H
diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h
index aaf413fec783bc0bf71482899ab1aa36b23f3c86..e220cee463d656f5d1cc9f76fdb80e906d068e40 100644
--- a/src/designer/src/lib/extension/qextensionmanager.h
+++ b/src/designer/src/lib/extension/qextensionmanager.h
@@ -46,8 +46,6 @@
 #include <QtDesigner/extension.h>
 #include <QtCore/QHash>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QObject; // Fool syncqt
@@ -74,6 +72,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QEXTENSIONMANAGER_H
diff --git a/src/designer/src/lib/sdk/abstractactioneditor.h b/src/designer/src/lib/sdk/abstractactioneditor.h
index a1e12428302347031c9592d65d87c5361882e669..5ab5532447640e90a5b7a130085be21c9773c8b5 100644
--- a/src/designer/src/lib/sdk/abstractactioneditor.h
+++ b/src/designer/src/lib/sdk/abstractactioneditor.h
@@ -46,8 +46,6 @@
 
 #include <QtWidgets/QWidget>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormEditorInterface;
@@ -71,6 +69,4 @@ public Q_SLOTS:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTACTIONEDITOR_H
diff --git a/src/designer/src/lib/sdk/abstractdialoggui_p.h b/src/designer/src/lib/sdk/abstractdialoggui_p.h
index 9b533b3bfc847c12e8f6146e188d669354f44edb..635646456680cbadec651b2905b376dad5c3b67f 100644
--- a/src/designer/src/lib/sdk/abstractdialoggui_p.h
+++ b/src/designer/src/lib/sdk/abstractdialoggui_p.h
@@ -57,8 +57,6 @@
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QFileDialog>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QWidget;
@@ -102,6 +100,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTDIALOGGUI_H
diff --git a/src/designer/src/lib/sdk/abstractdnditem.h b/src/designer/src/lib/sdk/abstractdnditem.h
index d43f13a1c96cc5e9ef734a6f00298826ddf1e2c2..342f584689cf07d0aed1182863d7255078af3ba6 100644
--- a/src/designer/src/lib/sdk/abstractdnditem.h
+++ b/src/designer/src/lib/sdk/abstractdnditem.h
@@ -44,8 +44,6 @@
 
 #include <QtDesigner/sdk_global.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class DomUI;
@@ -70,6 +68,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTDNDITEM_H
diff --git a/src/designer/src/lib/sdk/abstractformeditor.h b/src/designer/src/lib/sdk/abstractformeditor.h
index 1ced0611f8be2e3c13f92884441f805621d4eead..1e7ae1d5b7792947d47e5d7181b3d4e362440492 100644
--- a/src/designer/src/lib/sdk/abstractformeditor.h
+++ b/src/designer/src/lib/sdk/abstractformeditor.h
@@ -47,8 +47,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerWidgetBoxInterface;
@@ -141,6 +139,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTFORMEDITOR_H
diff --git a/src/designer/src/lib/sdk/abstractformeditorplugin.h b/src/designer/src/lib/sdk/abstractformeditorplugin.h
index 57dbba0c253bdcd74bb5fd24bd5c3960cfe28673..54d007162bcbb76ed17080b9e4b3050673ae017b 100644
--- a/src/designer/src/lib/sdk/abstractformeditorplugin.h
+++ b/src/designer/src/lib/sdk/abstractformeditorplugin.h
@@ -46,8 +46,6 @@
 
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormEditorInterface;
@@ -68,6 +66,4 @@ Q_DECLARE_INTERFACE(QDesignerFormEditorPluginInterface, "org.qt-project.Qt.Desig
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTFORMEDITORPLUGIN_H
diff --git a/src/designer/src/lib/sdk/abstractformwindow.h b/src/designer/src/lib/sdk/abstractformwindow.h
index d7667d5fc38d6eedf5b1f717eb06c0ea29560982..b38d2ca414d1c172ef73a9353cf8270518caea09 100644
--- a/src/designer/src/lib/sdk/abstractformwindow.h
+++ b/src/designer/src/lib/sdk/abstractformwindow.h
@@ -46,8 +46,6 @@
 
 #include <QtWidgets/QWidget>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormEditorInterface;
@@ -196,6 +194,4 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTFORMWINDOW_H
diff --git a/src/designer/src/lib/sdk/abstractformwindowcursor.h b/src/designer/src/lib/sdk/abstractformwindowcursor.h
index a03149c35841f1e55ceae2271c3d513765551f07..707f657511d2462690ccc06e01c7d865d3061b2b 100644
--- a/src/designer/src/lib/sdk/abstractformwindowcursor.h
+++ b/src/designer/src/lib/sdk/abstractformwindowcursor.h
@@ -44,8 +44,6 @@
 
 #include <QtDesigner/sdk_global.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormWindowInterface;
@@ -104,6 +102,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTFORMWINDOWCURSOR_H
diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.h b/src/designer/src/lib/sdk/abstractformwindowmanager.h
index 9f16ded6f6d7776cdd5a39da07732e6e64fa428c..e70ebdd54ab4e0f3473bef0d0077f25f4c93ae2a 100644
--- a/src/designer/src/lib/sdk/abstractformwindowmanager.h
+++ b/src/designer/src/lib/sdk/abstractformwindowmanager.h
@@ -48,8 +48,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormEditorInterface;
@@ -157,6 +155,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTFORMWINDOWMANAGER_H
diff --git a/src/designer/src/lib/sdk/abstractformwindowtool.h b/src/designer/src/lib/sdk/abstractformwindowtool.h
index 74e1f7afbc4755efb65298ceb3356104b7b38974..28ed11d162ba8cb5c16cf66adee16eb06e514225 100644
--- a/src/designer/src/lib/sdk/abstractformwindowtool.h
+++ b/src/designer/src/lib/sdk/abstractformwindowtool.h
@@ -46,8 +46,6 @@
 
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormEditorInterface;
@@ -80,6 +78,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTFORMWINDOWTOOL_H
diff --git a/src/designer/src/lib/sdk/abstractintegration.h b/src/designer/src/lib/sdk/abstractintegration.h
index e15f0df15d3d594273667024918c0f278795028d..d28f61f327e624274638cf8ed6468d28d75b799f 100644
--- a/src/designer/src/lib/sdk/abstractintegration.h
+++ b/src/designer/src/lib/sdk/abstractintegration.h
@@ -49,8 +49,6 @@
 #include <QtCore/QStringList>
 #include <QtCore/QFlags>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormWindowInterface;
@@ -189,6 +187,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTINTEGRATION_H
diff --git a/src/designer/src/lib/sdk/abstractintrospection_p.h b/src/designer/src/lib/sdk/abstractintrospection_p.h
index 12dbdc461a8f6546794bcd712fc744563dc648d3..327e40d732593cd19530356beeeaa2fa92385620 100644
--- a/src/designer/src/lib/sdk/abstractintrospection_p.h
+++ b/src/designer/src/lib/sdk/abstractintrospection_p.h
@@ -57,8 +57,6 @@
 #include <QtCore/QVariant>
 #include <QtCore/QFlags>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDESIGNER_SDK_EXPORT QDesignerMetaEnumInterface
@@ -169,6 +167,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTMETAOBJECT_H
diff --git a/src/designer/src/lib/sdk/abstractlanguage.h b/src/designer/src/lib/sdk/abstractlanguage.h
index 1d20b8c896fcbf69f25d27da8517022916774e21..11c56c3d159a45805698c2acb4c4a25066581417 100644
--- a/src/designer/src/lib/sdk/abstractlanguage.h
+++ b/src/designer/src/lib/sdk/abstractlanguage.h
@@ -55,8 +55,6 @@
 
 #include <QtDesigner/extension.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDialog;
@@ -103,6 +101,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerLanguageExtension, "org.qt-project.Qt.Des
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QDESIGNER_ABTRACT_LANGUAGE_H
diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.h b/src/designer/src/lib/sdk/abstractmetadatabase.h
index bd97bde93a03d5023a1c37e9ad829fbd67bdfc6f..80aae6bf3ff2b324537952bd71f884ca07c98ae0 100644
--- a/src/designer/src/lib/sdk/abstractmetadatabase.h
+++ b/src/designer/src/lib/sdk/abstractmetadatabase.h
@@ -48,8 +48,6 @@
 #include <QtCore/QList>
 #include <QtCore/QHash>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QCursor;
@@ -94,6 +92,4 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTMETADATABASE_H
diff --git a/src/designer/src/lib/sdk/abstractnewformwidget.h b/src/designer/src/lib/sdk/abstractnewformwidget.h
index c40f9969656689edf47414c93b416350b330a844..b1295851b2bf10283f68af04c77217f1701cf425 100644
--- a/src/designer/src/lib/sdk/abstractnewformwidget.h
+++ b/src/designer/src/lib/sdk/abstractnewformwidget.h
@@ -46,8 +46,6 @@
 
 #include <QtWidgets/QWidget>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormEditorInterface;
@@ -72,6 +70,4 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTNEWFORMWIDGET_H
diff --git a/src/designer/src/lib/sdk/abstractobjectinspector.h b/src/designer/src/lib/sdk/abstractobjectinspector.h
index 4462c58349fd0d0a6b16fba469e30f0497ce154f..d461c6116a3a50fe9423206bfb0c008d69686da0 100644
--- a/src/designer/src/lib/sdk/abstractobjectinspector.h
+++ b/src/designer/src/lib/sdk/abstractobjectinspector.h
@@ -46,8 +46,6 @@
 
 #include <QtWidgets/QWidget>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormEditorInterface;
@@ -68,6 +66,4 @@ public Q_SLOTS:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTOBJECTINSPECTOR_H
diff --git a/src/designer/src/lib/sdk/abstractoptionspage.h b/src/designer/src/lib/sdk/abstractoptionspage.h
index e98e5b012e118ecfb0375e4d6a34eaa97415d65e..2e3aecea65787058240142ceb1ee7fbdb24bb38f 100644
--- a/src/designer/src/lib/sdk/abstractoptionspage.h
+++ b/src/designer/src/lib/sdk/abstractoptionspage.h
@@ -44,8 +44,6 @@
 
 #include <QtDesigner/sdk_global.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -63,6 +61,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTOPTIONSPAGE_P_H
diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.h b/src/designer/src/lib/sdk/abstractpromotioninterface.h
index 3d1eb716acbcf89a3aeb268ce78b3ed9241f706f..dd8510071dd8df3e488876d44671ba21e2450ef7 100644
--- a/src/designer/src/lib/sdk/abstractpromotioninterface.h
+++ b/src/designer/src/lib/sdk/abstractpromotioninterface.h
@@ -48,8 +48,6 @@
 #include <QtCore/QList>
 #include <QtCore/QSet>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerWidgetDataBaseItemInterface;
@@ -86,6 +84,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTPROMOTIONINTERFACE_H
diff --git a/src/designer/src/lib/sdk/abstractpropertyeditor.h b/src/designer/src/lib/sdk/abstractpropertyeditor.h
index 87dc43a453951df9dfa68b7ad853ae56bc384de0..39a6ad2b33cafc0e2c3fce8f48372347c3ffbd7a 100644
--- a/src/designer/src/lib/sdk/abstractpropertyeditor.h
+++ b/src/designer/src/lib/sdk/abstractpropertyeditor.h
@@ -46,8 +46,6 @@
 
 #include <QtWidgets/QWidget>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormEditorInterface;
@@ -79,6 +77,4 @@ public Q_SLOTS:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTPROPERTYEDITOR_H
diff --git a/src/designer/src/lib/sdk/abstractresourcebrowser.h b/src/designer/src/lib/sdk/abstractresourcebrowser.h
index 3177818284cdec63e408f30dd9abc6e6e119c655..d369a8cbdb3aaaf212bf3e1c04e2f41b296839c2 100644
--- a/src/designer/src/lib/sdk/abstractresourcebrowser.h
+++ b/src/designer/src/lib/sdk/abstractresourcebrowser.h
@@ -46,8 +46,6 @@
 
 #include <QtWidgets/QWidget>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QWidget; // FIXME: fool syncqt
@@ -69,7 +67,5 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTFORMEDITOR_H
 
diff --git a/src/designer/src/lib/sdk/abstractsettings.h b/src/designer/src/lib/sdk/abstractsettings.h
index deb0f07637568a776ca3daa9420cb26596615aaf..8aa787861ef03701e81cb08a3e0dfd945729f0c3 100644
--- a/src/designer/src/lib/sdk/abstractsettings.h
+++ b/src/designer/src/lib/sdk/abstractsettings.h
@@ -46,8 +46,6 @@
 
 #include <QtCore/QVariant>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -68,6 +66,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTSETTINGS_P_H
diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h
index 6f37129fef0e9289f1b14ddcf198355bf21a3f87..15396fc17619421a1666b1d5bfe9a9befb4b2b9a 100644
--- a/src/designer/src/lib/sdk/abstractwidgetbox.h
+++ b/src/designer/src/lib/sdk/abstractwidgetbox.h
@@ -49,8 +49,6 @@
 #include <QtWidgets/QWidget>
 #include <QtGui/QIcon>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class DomUI;
@@ -141,6 +139,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QDesignerWidgetBoxInterface::Widget))
 
-QT_END_HEADER
-
 #endif // ABSTRACTWIDGETBOX_H
diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.h b/src/designer/src/lib/sdk/abstractwidgetdatabase.h
index 44e9e7beaf30ca44559a326b99c629507366547e..b993ef49a6c6cd2c413753e25734e99e5725ed22 100644
--- a/src/designer/src/lib/sdk/abstractwidgetdatabase.h
+++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.h
@@ -47,8 +47,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QIcon;
@@ -132,6 +130,4 @@ protected:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTWIDGETDATABASE_H
diff --git a/src/designer/src/lib/sdk/abstractwidgetfactory.h b/src/designer/src/lib/sdk/abstractwidgetfactory.h
index 24084ac6c465bbe04837d95bf191eb7cc3deab94..eb76da59897a9408ed54ae303ae612db49f830c8 100644
--- a/src/designer/src/lib/sdk/abstractwidgetfactory.h
+++ b/src/designer/src/lib/sdk/abstractwidgetfactory.h
@@ -45,8 +45,6 @@
 #include <QtDesigner/sdk_global.h>
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDesignerFormEditorInterface;
@@ -74,6 +72,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTWIDGETFACTORY_H
diff --git a/src/designer/src/lib/sdk/dynamicpropertysheet.h b/src/designer/src/lib/sdk/dynamicpropertysheet.h
index 9904bc12eb0f001dcbc3451f18d5d77ae32f8aa1..9bf431ef2efcb375c2f9f9b895adcbdaacf6ec2f 100644
--- a/src/designer/src/lib/sdk/dynamicpropertysheet.h
+++ b/src/designer/src/lib/sdk/dynamicpropertysheet.h
@@ -55,8 +55,6 @@
 
 #include <QtDesigner/extension.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QString; // FIXME: fool syncqt
@@ -76,6 +74,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerDynamicPropertySheetExtension, "org.qt-pr
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // DYNAMICPROPERTYSHEET_H
diff --git a/src/designer/src/lib/sdk/extrainfo.h b/src/designer/src/lib/sdk/extrainfo.h
index 34be80b3a7bc2e43398533560348404799a1d3e3..96930dffdc03bbbb64c46236b15db2e06ca9f8f2 100644
--- a/src/designer/src/lib/sdk/extrainfo.h
+++ b/src/designer/src/lib/sdk/extrainfo.h
@@ -45,8 +45,6 @@
 #include <QtDesigner/sdk_global.h>
 #include <QtDesigner/extension.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class DomWidget;
@@ -79,6 +77,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerExtraInfoExtension, "org.qt-project.Qt.De
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // EXTRAINFO_H
diff --git a/src/designer/src/lib/sdk/layoutdecoration.h b/src/designer/src/lib/sdk/layoutdecoration.h
index 2965cf76533ccae7609050215fda6fca79d49d44..91d08964b4811630ed42560019d04954a958befa 100644
--- a/src/designer/src/lib/sdk/layoutdecoration.h
+++ b/src/designer/src/lib/sdk/layoutdecoration.h
@@ -47,8 +47,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QPair>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPoint;
@@ -94,6 +92,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerLayoutDecorationExtension, "org.qt-projec
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // LAYOUTDECORATION_H
diff --git a/src/designer/src/lib/sdk/membersheet.h b/src/designer/src/lib/sdk/membersheet.h
index a2d87c324102f3bf744c309c4092a7b23b623691..4b33a11cfe42aad2d8257a7738944a6a010d2ffa 100644
--- a/src/designer/src/lib/sdk/membersheet.h
+++ b/src/designer/src/lib/sdk/membersheet.h
@@ -47,8 +47,6 @@
 #include <QtCore/QList>
 #include <QtCore/QByteArray>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QString; // FIXME: fool syncqt
@@ -84,6 +82,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerMemberSheetExtension, "org.qt-project.Qt.
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // MEMBERSHEET_H
diff --git a/src/designer/src/lib/sdk/propertysheet.h b/src/designer/src/lib/sdk/propertysheet.h
index c29102389eb51694032cbe9be40265c6887243d4..ca1dfd4ebcbe0425ccb6a2b7ed6ef3e8385f9858 100644
--- a/src/designer/src/lib/sdk/propertysheet.h
+++ b/src/designer/src/lib/sdk/propertysheet.h
@@ -44,8 +44,6 @@
 
 #include <QtDesigner/extension.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QVariant;
@@ -88,6 +86,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerPropertySheetExtension,
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // PROPERTYSHEET_H
diff --git a/src/designer/src/lib/sdk/sdk_global.h b/src/designer/src/lib/sdk/sdk_global.h
index 8eb0d0a3188709e06bffdc74fd499c6b20c337fb..3621b660e9a226516e53c7bcda9ab7825b07e85c 100644
--- a/src/designer/src/lib/sdk/sdk_global.h
+++ b/src/designer/src/lib/sdk/sdk_global.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 #define QDESIGNER_SDK_EXTERN Q_DECL_EXPORT
@@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE
 #endif
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // SDK_GLOBAL_H
diff --git a/src/designer/src/lib/sdk/taskmenu.h b/src/designer/src/lib/sdk/taskmenu.h
index a483b08805407d25d362826aaf4432ff10bd30ee..7948d7181a97f1400adc2ac820e5f7711b1183f4 100644
--- a/src/designer/src/lib/sdk/taskmenu.h
+++ b/src/designer/src/lib/sdk/taskmenu.h
@@ -44,8 +44,6 @@
 
 #include <QtDesigner/extension.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QAction;
@@ -67,6 +65,4 @@ inline QAction *QDesignerTaskMenuExtension::preferredEditAction() const
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // TASKMENU_H
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h
index c0b7bf16d7d878a19d20c149618858b51651a689..332291bbd29a60650bd7282a32d1f4fa588cc4b0 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.h
+++ b/src/designer/src/lib/uilib/abstractformbuilder.h
@@ -52,8 +52,6 @@
 #include <QtWidgets/QSizePolicy>
 #include <QtGui/QPalette>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 #if 0
 // pragma for syncqt, don't remove.
@@ -268,6 +266,4 @@ protected:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // ABSTRACTFORMBUILDER_H
diff --git a/src/designer/src/lib/uilib/container.h b/src/designer/src/lib/uilib/container.h
index 2da07c77a87efc68924888da3603783b67744d1e..f4ed62d77b22fec8887d5e0ed961aa9415ead09d 100644
--- a/src/designer/src/lib/uilib/container.h
+++ b/src/designer/src/lib/uilib/container.h
@@ -45,8 +45,6 @@
 #include <QtDesigner/extension.h>
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QWidget;
@@ -77,6 +75,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerContainerExtension, "org.qt-project.Qt.De
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // CONTAINER_H
diff --git a/src/designer/src/lib/uilib/customwidget.h b/src/designer/src/lib/uilib/customwidget.h
index 75e15ad0bae7391dbc4c7aac00f01d2489314354..d051866f0b31c4f3e941b4af38ad54da00ba2aaf 100644
--- a/src/designer/src/lib/uilib/customwidget.h
+++ b/src/designer/src/lib/uilib/customwidget.h
@@ -47,8 +47,6 @@
 #include <QtCore/QString>
 #include <QtGui/QIcon>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QWidget;
@@ -100,6 +98,4 @@ Q_DECLARE_INTERFACE(QDesignerCustomWidgetCollectionInterface, QDesignerCustomWid
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // CUSTOMWIDGET_H
diff --git a/src/designer/src/lib/uilib/extension.h b/src/designer/src/lib/uilib/extension.h
index 75fd129376c6a65d175b6f7c5956e4227ecfee72..7f06855889ce7456f3197567a0e631562417a5b0 100644
--- a/src/designer/src/lib/uilib/extension.h
+++ b/src/designer/src/lib/uilib/extension.h
@@ -45,8 +45,6 @@
 #include <QtCore/QString>
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #define Q_TYPEID(IFace) QLatin1String(IFace##_iid)
@@ -104,6 +102,4 @@ template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manag
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // EXTENSION_H
diff --git a/src/designer/src/lib/uilib/formbuilder.h b/src/designer/src/lib/uilib/formbuilder.h
index bbbb0919a49c59efc847a9eb3e770ebbff0888ec..91d34275fed1af0dde285e1b336bbc768c6ebc62 100644
--- a/src/designer/src/lib/uilib/formbuilder.h
+++ b/src/designer/src/lib/uilib/formbuilder.h
@@ -45,8 +45,6 @@
 #include "uilib_global.h"
 #include "abstractformbuilder.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 #if 0
 // pragma for syncqt, don't remove.
@@ -105,6 +103,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // FORMBUILDER_H
diff --git a/src/designer/src/lib/uilib/qdesignerexportwidget.h b/src/designer/src/lib/uilib/qdesignerexportwidget.h
index f5f62571c780382e5bf101afe3a8367fa01fda9a..74ffe27fee1c03dc8344906d6d9698066537788e 100644
--- a/src/designer/src/lib/uilib/qdesignerexportwidget.h
+++ b/src/designer/src/lib/uilib/qdesignerexportwidget.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/QtGlobal>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #if 0
@@ -61,6 +59,4 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif //QDESIGNEREXPORTWIDGET_H
diff --git a/src/designer/src/lib/uilib/uilib_global.h b/src/designer/src/lib/uilib/uilib_global.h
index 873c540cebf5a2be81bd8fb31f7111edd89558b3..f8624cb73754e46f3ec928dc4bdce41ca2f8feb2 100644
--- a/src/designer/src/lib/uilib/uilib_global.h
+++ b/src/designer/src/lib/uilib/uilib_global.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 #define QDESIGNER_UILIB_EXTERN Q_DECL_EXPORT
@@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE
 #endif
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // UILIB_GLOBAL_H
diff --git a/src/designer/src/uitools/quiloader.h b/src/designer/src/uitools/quiloader.h
index 6977d20a434bf91002b4ea6417da54f938256c70..12124dc0c7ec06abecf1f8f51b2cd2bea87a5255 100644
--- a/src/designer/src/uitools/quiloader.h
+++ b/src/designer/src/uitools/quiloader.h
@@ -45,8 +45,6 @@
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QWidget;
@@ -97,6 +95,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QUILOADER_H
diff --git a/src/designer/src/uitools/quiloader_p.h b/src/designer/src/uitools/quiloader_p.h
index 6ee4ca325227c089977384e1ca501549b2e1a3b8..e7cbfb6071b8f5b42e8c5e31f3c6118085d80ee2 100644
--- a/src/designer/src/uitools/quiloader_p.h
+++ b/src/designer/src/uitools/quiloader_p.h
@@ -66,8 +66,6 @@
 #define PROP_TABPAGETOOLTIP "_q_tabPageToolTip_notr"
 #define PROP_TABPAGEWHATSTHIS "_q_tabPageWhatsThis_notr"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QUiTranslatableStringValue
@@ -101,8 +99,6 @@ extern const QUiItemRolePair qUiItemRoles[];
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 Q_DECLARE_METATYPE(QUiTranslatableStringValue)