diff --git a/python/core/auto_generated/qgsdatadefinedsizelegend.sip.in b/python/core/auto_generated/qgsdatadefinedsizelegend.sip.in
index d7d244a9095..44c59adea57 100644
--- a/python/core/auto_generated/qgsdatadefinedsizelegend.sip.in
+++ b/python/core/auto_generated/qgsdatadefinedsizelegend.sip.in
@@ -31,6 +31,8 @@ legend nodes or whether to collapse them into one legend node.
 Constructor for QgsDataDefinedSizeLegend.
 %End
 
+    ~QgsDataDefinedSizeLegend();
+
     QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other );
 %Docstring
 Copy constructor
diff --git a/python/core/auto_generated/qgsfield.sip.in b/python/core/auto_generated/qgsfield.sip.in
index 42bead8980c..4e161327ed1 100644
--- a/python/core/auto_generated/qgsfield.sip.in
+++ b/python/core/auto_generated/qgsfield.sip.in
@@ -12,6 +12,7 @@
 
 
 
+
 class QgsField
 {
 %Docstring
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
index cb3c62838e4..304c786b1cc 100644
--- a/src/app/qgsdiagramproperties.cpp
+++ b/src/app/qgsdiagramproperties.cpp
@@ -42,6 +42,7 @@
 #include "qgsnewauxiliarylayerdialog.h"
 #include "qgsauxiliarystorage.h"
 #include "qgsexpressioncontextutils.h"
+#include "qgspropertytransformer.h"
 
 #include <QList>
 #include <QMessageBox>
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index f220a54c727..0c132385664 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -723,7 +723,6 @@ SET(QGIS_CORE_HDRS
   qgsfeaturestore.h
   qgsfeedback.h
   qgsfield.h
-  qgsfield_p.h
   qgsfieldconstraints.h
   qgsfieldformatter.h
   qgsfieldformatterregistry.h
@@ -1234,6 +1233,7 @@ SET(QGIS_CORE_PRIVATE_HDRS
   qgseditformconfig_p.h
   qgsfeaturefiltermodel_p.h
   qgsfeature_p.h
+  qgsfield_p.h
   qgsfields_p.h
   qgsrelation_p.h
   qgsspatialindexkdbush_p.h
diff --git a/src/core/qgsdatadefinedsizelegend.cpp b/src/core/qgsdatadefinedsizelegend.cpp
index d0838278463..05864e62ed5 100644
--- a/src/core/qgsdatadefinedsizelegend.cpp
+++ b/src/core/qgsdatadefinedsizelegend.cpp
@@ -21,6 +21,10 @@
 #include "qgsxmlutils.h"
 
 
+QgsDataDefinedSizeLegend::QgsDataDefinedSizeLegend() = default;
+
+QgsDataDefinedSizeLegend::~QgsDataDefinedSizeLegend() = default;
+
 QgsDataDefinedSizeLegend::QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other )
   : mType( other.mType )
   , mTitleLabel( other.mTitleLabel )
diff --git a/src/core/qgsdatadefinedsizelegend.h b/src/core/qgsdatadefinedsizelegend.h
index 4b7cac70865..074ba1f5cd5 100644
--- a/src/core/qgsdatadefinedsizelegend.h
+++ b/src/core/qgsdatadefinedsizelegend.h
@@ -44,7 +44,9 @@ class CORE_EXPORT QgsDataDefinedSizeLegend
     /**
      * Constructor for QgsDataDefinedSizeLegend.
      */
-    QgsDataDefinedSizeLegend() = default;
+    QgsDataDefinedSizeLegend();
+
+    ~QgsDataDefinedSizeLegend();
 
     //! Copy constructor
     QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other );
diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp
index 30f4181c40a..fe0e643f423 100644
--- a/src/core/qgsfield.cpp
+++ b/src/core/qgsfield.cpp
@@ -57,6 +57,8 @@ QgsField::QgsField( const QgsField &other ) //NOLINT
 
 }
 
+QgsField::~QgsField() = default;
+
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
  * full unit tests in testqgsfield.cpp.
diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h
index 3d5e69f8fb0..5a33761e46c 100644
--- a/src/core/qgsfield.h
+++ b/src/core/qgsfield.h
@@ -20,7 +20,6 @@
 #include <QVariant>
 #include <QVector>
 #include <QSharedDataPointer>
-#include "qgsfield_p.h"
 #include "qgis_core.h"
 #include "qgis_sip.h"
 
@@ -36,6 +35,8 @@ typedef QList<int> QgsAttributeList SIP_SKIP;
 #include "qgsfieldconstraints.h"
 #include "qgsdefaultvalue.h"
 
+class QgsFieldPrivate;
+
 /**
  * \class QgsField
   * \ingroup core
@@ -95,7 +96,7 @@ class CORE_EXPORT QgsField
      */
     QgsField &operator =( const QgsField &other ) SIP_SKIP;
 
-    virtual ~QgsField() = default;
+    virtual ~QgsField();
 
     bool operator==( const QgsField &other ) const;
     bool operator!=( const QgsField &other ) const;
diff --git a/src/core/qgsproperty.cpp b/src/core/qgsproperty.cpp
index fd75799b732..cf266dba2e8 100644
--- a/src/core/qgsproperty.cpp
+++ b/src/core/qgsproperty.cpp
@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsproperty.h"
+#include "qgsproperty_p.h"
 
 #include "qgslogger.h"
 #include "qgsexpression.h"
@@ -201,6 +202,8 @@ QgsProperty::QgsProperty()
   d = new QgsPropertyPrivate();
 }
 
+QgsProperty::~QgsProperty() = default;
+
 QgsProperty QgsProperty::fromExpression( const QString &expression, bool isActive )
 {
   QgsProperty p;
diff --git a/src/core/qgsproperty.h b/src/core/qgsproperty.h
index 1dfc32ed6a6..39e4576cb14 100644
--- a/src/core/qgsproperty.h
+++ b/src/core/qgsproperty.h
@@ -17,7 +17,6 @@
 
 #include "qgis_core.h"
 #include "qgis_sip.h"
-#include "qgsproperty_p.h"
 #include "qgsexpression.h"
 #include "qgsexpressioncontext.h"
 #include "qgscolorramp.h"
@@ -31,6 +30,7 @@
 #include <QColor>
 
 class QgsPropertyTransformer;
+class QgsPropertyPrivate;
 
 /**
  * \ingroup core
@@ -244,7 +244,7 @@ class CORE_EXPORT QgsProperty
      */
     QgsProperty();
 
-    virtual ~QgsProperty() = default;
+    virtual ~QgsProperty();
 
     /**
      * Returns a new ExpressionBasedProperty created from the specified expression.
diff --git a/src/core/qgspropertytransformer.cpp b/src/core/qgspropertytransformer.cpp
index 0e5dc92c67e..4198d5c2542 100644
--- a/src/core/qgspropertytransformer.cpp
+++ b/src/core/qgspropertytransformer.cpp
@@ -64,6 +64,8 @@ QgsPropertyTransformer &QgsPropertyTransformer::operator=( const QgsPropertyTran
   return *this;
 }
 
+QgsPropertyTransformer::~QgsPropertyTransformer() = default;
+
 bool QgsPropertyTransformer::loadVariant( const QVariant &transformer )
 {
   QVariantMap transformerMap = transformer.toMap();
diff --git a/src/core/qgspropertytransformer.h b/src/core/qgspropertytransformer.h
index c2464e2df2b..a0ff6de1529 100644
--- a/src/core/qgspropertytransformer.h
+++ b/src/core/qgspropertytransformer.h
@@ -212,7 +212,7 @@ class CORE_EXPORT QgsPropertyTransformer
     QgsPropertyTransformer( const QgsPropertyTransformer &other );
     QgsPropertyTransformer &operator=( const QgsPropertyTransformer &other );
 
-    virtual ~QgsPropertyTransformer() = default;
+    virtual ~QgsPropertyTransformer();
 
     /**
      * Returns the transformer type.
diff --git a/src/gui/qgsbrowserdockwidget.h b/src/gui/qgsbrowserdockwidget.h
index da34a7936ec..cd994dad983 100644
--- a/src/gui/qgsbrowserdockwidget.h
+++ b/src/gui/qgsbrowserdockwidget.h
@@ -23,7 +23,6 @@
 #include "qgsdataitem.h"
 #include "qgsbrowsertreeview.h"
 #include "qgsdockwidget.h"
-#include "qgsbrowserdockwidget_p.h"
 #include "qgis_gui.h"
 #include <QSortFilterProxyModel>
 
diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp
index 2aa07c5cdf2..31402f12850 100644
--- a/tests/src/core/testqgslegendrenderer.cpp
+++ b/tests/src/core/testqgslegendrenderer.cpp
@@ -42,6 +42,7 @@
 #include "qgsgeometry.h"
 #include "qgsdiagramrenderer.h"
 #include "diagram/qgspiediagram.h"
+#include "qgspropertytransformer.h"
 
 static QString _fileNameForTest( const QString &testName )
 {
diff --git a/tests/src/core/testqgsproperty.cpp b/tests/src/core/testqgsproperty.cpp
index ac0a5de01e2..a49f6dfa5e2 100644
--- a/tests/src/core/testqgsproperty.cpp
+++ b/tests/src/core/testqgsproperty.cpp
@@ -22,6 +22,7 @@
 #include "qgsapplication.h"
 #include "qgscolorramp.h"
 #include "qgssymbollayerutils.h"
+#include "qgspropertytransformer.h"
 #include <QObject>
 
 enum PropertyKeys