diff --git a/python/analysis/analysis_auto.sip b/python/analysis/analysis_auto.sip
index 5d606778fc1..012a1695142 100644
--- a/python/analysis/analysis_auto.sip
+++ b/python/analysis/analysis_auto.sip
@@ -1,5 +1,21 @@
 // Include auto-generated SIP files
 %Include auto_generated/qgsanalysis.sip
+%Include auto_generated/interpolation/qgsgridfilewriter.sip
+%Include auto_generated/interpolation/qgsidwinterpolator.sip
+%Include auto_generated/interpolation/qgsinterpolator.sip
+%Include auto_generated/interpolation/qgstininterpolator.sip
+%Include auto_generated/mesh/qgsmeshcalculator.sip
+%Include auto_generated/mesh/qgsmeshcontours.sip
+%Include auto_generated/network/qgsgraph.sip
+%Include auto_generated/network/qgsgraphanalyzer.sip
+%Include auto_generated/network/qgsgraphbuilder.sip
+%Include auto_generated/network/qgsgraphbuilderinterface.sip
+%Include auto_generated/network/qgsgraphdirector.sip
+%Include auto_generated/network/qgsnetworkdistancestrategy.sip
+%Include auto_generated/network/qgsnetworkspeedstrategy.sip
+%Include auto_generated/network/qgsnetworkstrategy.sip
+%Include auto_generated/network/qgsvectorlayerdirector.sip
+%Include auto_generated/processing/qgsnativealgorithms.sip
 %Include auto_generated/raster/qgsalignraster.sip
 %Include auto_generated/raster/qgsaspectfilter.sip
 %Include auto_generated/raster/qgsderivativefilter.sip
@@ -7,37 +23,21 @@
 %Include auto_generated/raster/qgshillshadefilter.sip
 %Include auto_generated/raster/qgskde.sip
 %Include auto_generated/raster/qgsninecellfilter.sip
+%Include auto_generated/raster/qgsrastercalcnode.sip
 %Include auto_generated/raster/qgsrastercalculator.sip
+%Include auto_generated/raster/qgsrastermatrix.sip
 %Include auto_generated/raster/qgsrelief.sip
 %Include auto_generated/raster/qgsruggednessfilter.sip
 %Include auto_generated/raster/qgsslopefilter.sip
-%Include auto_generated/raster/qgsrastermatrix.sip
-%Include auto_generated/raster/qgsrastercalcnode.sip
 %Include auto_generated/raster/qgstotalcurvaturefilter.sip
-%Include auto_generated/mesh/qgsmeshcalculator.sip
-%Include auto_generated/mesh/qgsmeshcontours.sip
+%Include auto_generated/vector/geometry_checker/qgsfeaturepool.sip
+%Include auto_generated/vector/geometry_checker/qgsgeometrycheck.sip
+%Include auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip
+%Include auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip
+%Include auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip
+%Include auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip
+%Include auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip
+%Include auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip
 %Include auto_generated/vector/qgsgeometrysnapper.sip
 %Include auto_generated/vector/qgsgeometrysnappersinglesource.sip
 %Include auto_generated/vector/qgszonalstatistics.sip
-%Include auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip
-%Include auto_generated/vector/geometry_checker/qgsfeaturepool.sip
-%Include auto_generated/interpolation/qgsinterpolator.sip
-%Include auto_generated/interpolation/qgsgridfilewriter.sip
-%Include auto_generated/interpolation/qgsidwinterpolator.sip
-%Include auto_generated/interpolation/qgstininterpolator.sip
-%Include auto_generated/network/qgsgraph.sip
-%Include auto_generated/network/qgsgraphbuilderinterface.sip
-%Include auto_generated/network/qgsgraphbuilder.sip
-%Include auto_generated/network/qgsnetworkstrategy.sip
-%Include auto_generated/network/qgsnetworkspeedstrategy.sip
-%Include auto_generated/network/qgsnetworkdistancestrategy.sip
-%Include auto_generated/network/qgsgraphanalyzer.sip
-%Include auto_generated/network/qgsvectorlayerdirector.sip
-%Include auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip
-%Include auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip
-%Include auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip
-%Include auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip
-%Include auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip
-%Include auto_generated/processing/qgsnativealgorithms.sip
-%Include auto_generated/network/qgsgraphdirector.sip
-%Include auto_generated/vector/geometry_checker/qgsgeometrycheck.sip
diff --git a/python/core/auto_generated/raster/qgsrasterminmaxorigin.sip.in b/python/core/auto_generated/raster/qgsrasterminmaxorigin.sip.in
index 6d09cbdc251..2b0a017335b 100644
--- a/python/core/auto_generated/raster/qgsrasterminmaxorigin.sip.in
+++ b/python/core/auto_generated/raster/qgsrasterminmaxorigin.sip.in
@@ -32,7 +32,11 @@ itself the min/max values.
 
     enum Limits
     {
+#ifdef SIP_RUN
       None /PyName=None_/,
+#else
+      None,
+#endif
       MinMax,
       StdDev,
       CumulativeCut
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
index 0084254fdc3..5bddeda0644 100644
--- a/python/core/core_auto.sip
+++ b/python/core/core_auto.sip
@@ -1,21 +1,26 @@
 // Include auto-generated SIP files
-%Include auto_generated/expression/qgsexpression.sip
-%Include auto_generated/expression/qgsexpressioncontextutils.sip
-%Include auto_generated/expression/qgsexpressionnode.sip
-%Include auto_generated/expression/qgsexpressionnodeimpl.sip
-%Include auto_generated/expression/qgsexpressionfunction.sip
-%Include auto_generated/qgstessellator.sip
-%Include auto_generated/qgsabstractproviderconnection.sip
+%Include auto_generated/qgis.sip
+%Include auto_generated/qgsabstractcontentcache.sip
 %Include auto_generated/qgsabstractdatabaseproviderconnection.sip
+%Include auto_generated/qgsabstractproviderconnection.sip
 %Include auto_generated/qgsaction.sip
-%Include auto_generated/qgsactionscope.sip
 %Include auto_generated/qgsactionmanager.sip
+%Include auto_generated/qgsactionscope.sip
+%Include auto_generated/qgsactionscoperegistry.sip
 %Include auto_generated/qgsaggregatecalculator.sip
-%Include auto_generated/qgspostgresstringutils.sip
+%Include auto_generated/qgsanimatedicon.sip
+%Include auto_generated/qgsapplication.sip
+%Include auto_generated/qgsarchive.sip
+%Include auto_generated/qgsattributeeditorelement.sip
 %Include auto_generated/qgsattributes.sip
 %Include auto_generated/qgsattributetableconfig.sip
-%Include auto_generated/qgsattributeeditorelement.sip
+%Include auto_generated/qgsauxiliarystorage.sip
 %Include auto_generated/qgsbearingutils.sip
+%Include auto_generated/qgsblockingnetworkrequest.sip
+%Include auto_generated/qgsbookmarkmanager.sip
+%Include auto_generated/qgsbookmarkmodel.sip
+%Include auto_generated/qgsbrowsermodel.sip
+%Include auto_generated/qgsbrowserproxymodel.sip
 %Include auto_generated/qgscachedfeatureiterator.sip
 %Include auto_generated/qgscacheindex.sip
 %Include auto_generated/qgscacheindexfeatureid.sip
@@ -24,16 +29,23 @@
 %Include auto_generated/qgscolorramp.sip
 %Include auto_generated/qgscolorscheme.sip
 %Include auto_generated/qgscolorschemeregistry.sip
+%Include auto_generated/qgsconditionalstyle.sip
 %Include auto_generated/qgscoordinateformatter.sip
+%Include auto_generated/qgscoordinatereferencesystem.sip
 %Include auto_generated/qgscoordinatetransform.sip
 %Include auto_generated/qgscoordinatetransformcontext.sip
+%Include auto_generated/qgscredentials.sip
 %Include auto_generated/qgsdartmeasurement.sip
 %Include auto_generated/qgsdatadefinedsizelegend.sip
+%Include auto_generated/qgsdataitem.sip
 %Include auto_generated/qgsdataitemprovider.sip
 %Include auto_generated/qgsdataitemproviderregistry.sip
+%Include auto_generated/qgsdataprovider.sip
+%Include auto_generated/qgsdatasourceuri.sip
 %Include auto_generated/qgsdatetimestatisticalsummary.sip
 %Include auto_generated/qgsdatumtransform.sip
 %Include auto_generated/qgsdbfilterproxymodel.sip
+%Include auto_generated/qgsdefaultvalue.sip
 %Include auto_generated/qgsdiagramrenderer.sip
 %Include auto_generated/qgsdistancearea.sip
 %Include auto_generated/qgseditformconfig.sip
@@ -44,6 +56,8 @@
 %Include auto_generated/qgsexpressioncontextgenerator.sip
 %Include auto_generated/qgsexpressioncontextscopegenerator.sip
 %Include auto_generated/qgsexpressionfieldbuffer.sip
+%Include auto_generated/qgsfeature.sip
+%Include auto_generated/qgsfeaturefiltermodel.sip
 %Include auto_generated/qgsfeaturefilterprovider.sip
 %Include auto_generated/qgsfeatureid.sip
 %Include auto_generated/qgsfeatureiterator.sip
@@ -51,38 +65,72 @@
 %Include auto_generated/qgsfeaturesink.sip
 %Include auto_generated/qgsfeaturesource.sip
 %Include auto_generated/qgsfeaturestore.sip
+%Include auto_generated/qgsfeedback.sip
+%Include auto_generated/qgsfield.sip
+%Include auto_generated/qgsfieldconstraints.sip
 %Include auto_generated/qgsfieldformatter.sip
+%Include auto_generated/qgsfieldformatterregistry.sip
+%Include auto_generated/qgsfieldmodel.sip
+%Include auto_generated/qgsfieldproxymodel.sip
 %Include auto_generated/qgsfields.sip
+%Include auto_generated/qgsfiledownloader.sip
 %Include auto_generated/qgsfileutils.sip
 %Include auto_generated/qgsfontutils.sip
+%Include auto_generated/qgsgeometryoptions.sip
 %Include auto_generated/qgsgeometrysimplifier.sip
+%Include auto_generated/qgsgeometryvalidator.sip
+%Include auto_generated/qgsgml.sip
+%Include auto_generated/qgsgmlschema.sip
 %Include auto_generated/qgshistogram.sip
 %Include auto_generated/qgshstoreutils.sip
 %Include auto_generated/qgshtmlutils.sip
+%Include auto_generated/qgsimagecache.sip
 %Include auto_generated/qgsinterval.sip
 %Include auto_generated/qgsjsonutils.sip
-%Include auto_generated/qgslayerdefinition.sip
 %Include auto_generated/qgslabelingenginesettings.sip
 %Include auto_generated/qgslabelsearchtree.sip
+%Include auto_generated/qgslayerdefinition.sip
 %Include auto_generated/qgslegendrenderer.sip
 %Include auto_generated/qgslegendsettings.sip
 %Include auto_generated/qgslegendstyle.sip
 %Include auto_generated/qgslogger.sip
 %Include auto_generated/qgsmapdecoration.sip
 %Include auto_generated/qgsmaphittest.sip
+%Include auto_generated/qgsmaplayer.sip
 %Include auto_generated/qgsmaplayerdependency.sip
+%Include auto_generated/qgsmaplayerlegend.sip
+%Include auto_generated/qgsmaplayermodel.sip
+%Include auto_generated/qgsmaplayerproxymodel.sip
 %Include auto_generated/qgsmaplayerrenderer.sip
+%Include auto_generated/qgsmaplayerstore.sip
 %Include auto_generated/qgsmaplayerstyle.sip
+%Include auto_generated/qgsmaplayerstylemanager.sip
+%Include auto_generated/qgsmaprenderercache.sip
+%Include auto_generated/qgsmaprenderercustompainterjob.sip
+%Include auto_generated/qgsmaprendererjob.sip
+%Include auto_generated/qgsmaprendererparalleljob.sip
+%Include auto_generated/qgsmaprenderersequentialjob.sip
+%Include auto_generated/qgsmaprenderertask.sip
 %Include auto_generated/qgsmapsettings.sip
 %Include auto_generated/qgsmapsettingsutils.sip
+%Include auto_generated/qgsmapthemecollection.sip
 %Include auto_generated/qgsmaptopixel.sip
 %Include auto_generated/qgsmaptopixelgeometrysimplifier.sip
 %Include auto_generated/qgsmapunitscale.sip
 %Include auto_generated/qgsmargins.sip
+%Include auto_generated/qgsmessagelog.sip
+%Include auto_generated/qgsmessageoutput.sip
 %Include auto_generated/qgsmimedatautils.sip
 %Include auto_generated/qgsmultirenderchecker.sip
+%Include auto_generated/qgsnetworkaccessmanager.sip
+%Include auto_generated/qgsnetworkcontentfetcher.sip
+%Include auto_generated/qgsnetworkcontentfetcherregistry.sip
+%Include auto_generated/qgsnetworkcontentfetchertask.sip
 %Include auto_generated/qgsnetworkreply.sip
+%Include auto_generated/qgsnewsfeedmodel.sip
+%Include auto_generated/qgsnewsfeedparser.sip
 %Include auto_generated/qgsobjectcustomproperties.sip
+%Include auto_generated/qgsofflineediting.sip
 %Include auto_generated/qgsogcutils.sip
 %Include auto_generated/qgsoptional.sip
 %Include auto_generated/qgsoptionalexpression.sip
@@ -91,8 +139,12 @@
 %Include auto_generated/qgspainting.sip
 %Include auto_generated/qgspallabeling.sip
 %Include auto_generated/qgspathresolver.sip
+%Include auto_generated/qgspluginlayer.sip
 %Include auto_generated/qgspluginlayerregistry.sip
 %Include auto_generated/qgspointlocator.sip
+%Include auto_generated/qgspointxy.sip
+%Include auto_generated/qgspostgresstringutils.sip
+%Include auto_generated/qgsproject.sip
 %Include auto_generated/qgsprojectbadlayerhandler.sip
 %Include auto_generated/qgsprojectfiletransform.sip
 %Include auto_generated/qgsprojectproperty.sip
@@ -100,205 +152,141 @@
 %Include auto_generated/qgsprojectstorageregistry.sip
 %Include auto_generated/qgsprojecttranslator.sip
 %Include auto_generated/qgsprojectversion.sip
+%Include auto_generated/qgsprojectviewsettings.sip
 %Include auto_generated/qgsprojutils.sip
 %Include auto_generated/qgsproperty.sip
 %Include auto_generated/qgspropertycollection.sip
 %Include auto_generated/qgspropertytransformer.sip
 %Include auto_generated/qgsprovidermetadata.sip
 %Include auto_generated/qgsproviderregistry.sip
+%Include auto_generated/qgsproxyprogresstask.sip
 %Include auto_generated/qgspythonrunner.sip
 %Include auto_generated/qgsrange.sip
 %Include auto_generated/qgsreadwritecontext.sip
 %Include auto_generated/qgsreadwritelocker.sip
+%Include auto_generated/qgsrelation.sip
+%Include auto_generated/qgsrelationmanager.sip
 %Include auto_generated/qgsrenderchecker.sip
 %Include auto_generated/qgsrendercontext.sip
 %Include auto_generated/qgsrenderedfeaturehandlerinterface.sip
 %Include auto_generated/qgsrulebasedlabeling.sip
+%Include auto_generated/qgsrunprocess.sip
 %Include auto_generated/qgsruntimeprofiler.sip
 %Include auto_generated/qgsscalecalculator.sip
 %Include auto_generated/qgsscaleutils.sip
+%Include auto_generated/qgssettings.sip
 %Include auto_generated/qgssimplifymethod.sip
+%Include auto_generated/qgssnappingconfig.sip
 %Include auto_generated/qgssnappingutils.sip
 %Include auto_generated/qgsspatialindex.sip
 %Include auto_generated/qgsspatialindexkdbush.sip
 %Include auto_generated/qgsspatialindexkdbushdata.sip
-%Include auto_generated/qgssqlstatement.sip
 %Include auto_generated/qgssqliteutils.sip
+%Include auto_generated/qgssqlstatement.sip
 %Include auto_generated/qgsstatisticalsummary.sip
+%Include auto_generated/qgsstoredexpressionmanager.sip
 %Include auto_generated/qgsstringstatisticalsummary.sip
 %Include auto_generated/qgsstringutils.sip
+%Include auto_generated/qgstaskmanager.sip
+%Include auto_generated/qgstessellator.sip
+%Include auto_generated/qgstestutils.sip
 %Include auto_generated/qgstextrenderer.sip
+%Include auto_generated/qgstolerance.sip
 %Include auto_generated/qgstracer.sip
+%Include auto_generated/qgstrackedvectorlayertools.sip
+%Include auto_generated/qgstransaction.sip
+%Include auto_generated/qgstransactiongroup.sip
 %Include auto_generated/qgstranslationcontext.sip
+%Include auto_generated/qgsunittypes.sip
+%Include auto_generated/qgsuserprofilemanager.sip
+%Include auto_generated/qgsvector.sip
+%Include auto_generated/qgsvector3d.sip
 %Include auto_generated/qgsvectordataprovider.sip
-%Include auto_generated/qgsvectorlayercache.sip
 %Include auto_generated/qgsvectorfilewriter.sip
+%Include auto_generated/qgsvectorfilewritertask.sip
+%Include auto_generated/qgsvectorlayer.sip
+%Include auto_generated/qgsvectorlayercache.sip
+%Include auto_generated/qgsvectorlayereditbuffer.sip
+%Include auto_generated/qgsvectorlayereditpassthrough.sip
 %Include auto_generated/qgsvectorlayereditutils.sip
-%Include auto_generated/qgsvectorlayerfeatureiterator.sip
 %Include auto_generated/qgsvectorlayerexporter.sip
+%Include auto_generated/qgsvectorlayerfeaturecounter.sip
+%Include auto_generated/qgsvectorlayerfeatureiterator.sip
+%Include auto_generated/qgsvectorlayerjoinbuffer.sip
 %Include auto_generated/qgsvectorlayerjoininfo.sip
 %Include auto_generated/qgsvectorlayerlabeling.sip
+%Include auto_generated/qgsvectorlayerserverproperties.sip
+%Include auto_generated/qgsvectorlayertools.sip
 %Include auto_generated/qgsvectorlayerundocommand.sip
 %Include auto_generated/qgsvectorlayerundopassthroughcommand.sip
 %Include auto_generated/qgsvectorlayerutils.sip
+%Include auto_generated/qgsvectorsimplifymethod.sip
 %Include auto_generated/qgsvirtuallayerdefinition.sip
 %Include auto_generated/qgsvirtuallayerdefinitionutils.sip
-%Include auto_generated/qgsmapthemecollection.sip
+%Include auto_generated/qgsvirtuallayertask.sip
 %Include auto_generated/qgsxmlutils.sip
-%Include auto_generated/qgsarchive.sip
-%Include auto_generated/qgstestutils.sip
 %Include auto_generated/qgsziputils.sip
-%Include auto_generated/qgsvector.sip
-%Include auto_generated/qgsvector3d.sip
+%Include auto_generated/./3d/qgs3drendererregistry.sip
+%Include auto_generated/./3d/qgsabstract3drenderer.sip
+%Include auto_generated/annotations/qgsannotation.sip
+%Include auto_generated/annotations/qgsannotationmanager.sip
+%Include auto_generated/annotations/qgshtmlannotation.sip
+%Include auto_generated/annotations/qgssvgannotation.sip
+%Include auto_generated/annotations/qgstextannotation.sip
 %Include auto_generated/auth/qgsauthcertutils.sip
 %Include auto_generated/auth/qgsauthconfig.sip
 %Include auto_generated/auth/qgsauthmanager.sip
 %Include auto_generated/auth/qgsauthmethod.sip
 %Include auto_generated/callouts/qgscallout.sip
 %Include auto_generated/callouts/qgscalloutsregistry.sip
-%Include auto_generated/classification/qgsclassificationmethodregistry.sip
-%Include auto_generated/classification/qgsclassificationmethod.sip
 %Include auto_generated/classification/qgsclassificationcustom.sip
 %Include auto_generated/classification/qgsclassificationequalinterval.sip
+%Include auto_generated/classification/qgsclassificationjenks.sip
+%Include auto_generated/classification/qgsclassificationlogarithmic.sip
+%Include auto_generated/classification/qgsclassificationmethod.sip
+%Include auto_generated/classification/qgsclassificationmethodregistry.sip
 %Include auto_generated/classification/qgsclassificationprettybreaks.sip
 %Include auto_generated/classification/qgsclassificationquantile.sip
-%Include auto_generated/classification/qgsclassificationjenks.sip
 %Include auto_generated/classification/qgsclassificationstandarddeviation.sip
-%Include auto_generated/classification/qgsclassificationlogarithmic.sip
 %Include auto_generated/diagram/qgsdiagram.sip
+%Include auto_generated/diagram/qgshistogramdiagram.sip
 %Include auto_generated/diagram/qgspiediagram.sip
 %Include auto_generated/diagram/qgstextdiagram.sip
-%Include auto_generated/diagram/qgshistogramdiagram.sip
 %Include auto_generated/dxf/qgsdxfexport.sip
+%Include auto_generated/effects/qgsblureffect.sip
+%Include auto_generated/effects/qgscoloreffect.sip
+%Include auto_generated/effects/qgseffectstack.sip
+%Include auto_generated/effects/qgsgloweffect.sip
 %Include auto_generated/effects/qgsimageoperation.sip
 %Include auto_generated/effects/qgspainteffect.sip
-%Include auto_generated/effects/qgseffectstack.sip
-%Include auto_generated/effects/qgsblureffect.sip
-%Include auto_generated/effects/qgsshadoweffect.sip
-%Include auto_generated/effects/qgsgloweffect.sip
 %Include auto_generated/effects/qgspainteffectregistry.sip
+%Include auto_generated/effects/qgsshadoweffect.sip
 %Include auto_generated/effects/qgstransformeffect.sip
-%Include auto_generated/effects/qgscoloreffect.sip
-%Include auto_generated/layout/qgsabstractlayoutiterator.sip
-%Include auto_generated/layout/qgsabstractreportsection.sip
-%Include auto_generated/layout/qgsmasterlayoutinterface.sip
-%Include auto_generated/layout/qgslayoutaligner.sip
-%Include auto_generated/layout/qgslayoutexporter.sip
-%Include auto_generated/layout/qgslayoutgridsettings.sip
-%Include auto_generated/layout/qgslayoutmeasurement.sip
-%Include auto_generated/layout/qgslayoutmeasurementconverter.sip
-%Include auto_generated/layout/qgspagesizeregistry.sip
-%Include auto_generated/layout/qgslayoutpoint.sip
-%Include auto_generated/layout/qgslayoutserializableobject.sip
-%Include auto_generated/layout/qgslayoutsize.sip
-%Include auto_generated/layout/qgslayoutsnapper.sip
-%Include auto_generated/layout/qgslayoutundocommand.sip
-%Include auto_generated/layout/qgslayoututils.sip
-%Include auto_generated/layout/qgsreportsectionfieldgroup.sip
-%Include auto_generated/layout/qgsreportsectionlayout.sip
-%Include auto_generated/metadata/qgsabstractmetadatabase.sip
-%Include auto_generated/metadata/qgslayermetadata.sip
-%Include auto_generated/metadata/qgslayermetadatavalidator.sip
-%Include auto_generated/metadata/qgslayermetadataformatter.sip
-%Include auto_generated/metadata/qgsprojectmetadata.sip
-%Include auto_generated/processing/qgsprocessing.sip
-%Include auto_generated/processing/qgsprocessingalgorithm.sip
-%Include auto_generated/processing/qgsprocessingcontext.sip
-%Include auto_generated/processing/qgsprocessingoutputs.sip
-%Include auto_generated/processing/qgsprocessingparameters.sip
-%Include auto_generated/processing/qgsprocessingparametertype.sip
-%Include auto_generated/processing/qgsprocessingutils.sip
-%Include auto_generated/processing/models/qgsprocessingmodelalgorithm.sip
-%Include auto_generated/processing/models/qgsprocessingmodelchildalgorithm.sip
-%Include auto_generated/processing/models/qgsprocessingmodelchildparametersource.sip
-%Include auto_generated/processing/models/qgsprocessingmodelcomponent.sip
-%Include auto_generated/processing/models/qgsprocessingmodeloutput.sip
-%Include auto_generated/processing/models/qgsprocessingmodelparameter.sip
-%Include auto_generated/providers/memory/qgsmemoryproviderutils.sip
-%Include auto_generated/raster/qgsbilinearrasterresampler.sip
-%Include auto_generated/raster/qgsbrightnesscontrastfilter.sip
-%Include auto_generated/raster/qgscliptominmaxenhancement.sip
-%Include auto_generated/raster/qgscolorrampshader.sip
-%Include auto_generated/raster/qgscontrastenhancement.sip
-%Include auto_generated/raster/qgscontrastenhancementfunction.sip
-%Include auto_generated/raster/qgscubicrasterresampler.sip
-%Include auto_generated/raster/qgshuesaturationfilter.sip
-%Include auto_generated/raster/qgslinearminmaxenhancement.sip
-%Include auto_generated/raster/qgslinearminmaxenhancementwithclip.sip
-%Include auto_generated/raster/qgsmultibandcolorrenderer.sip
-%Include auto_generated/raster/qgspalettedrasterrenderer.sip
-%Include auto_generated/raster/qgsraster.sip
-%Include auto_generated/raster/qgsrasterbandstats.sip
-%Include auto_generated/raster/qgsrasterblock.sip
-%Include auto_generated/raster/qgsrasterchecker.sip
-%Include auto_generated/raster/qgsrasterdrawer.sip
-%Include auto_generated/raster/qgsrasterfilewriter.sip
-%Include auto_generated/raster/qgsrasterhistogram.sip
-%Include auto_generated/raster/qgsrasteridentifyresult.sip
-%Include auto_generated/raster/qgsrasteriterator.sip
-%Include auto_generated/raster/qgsrasterminmaxorigin.sip
-%Include auto_generated/raster/qgsrasternuller.sip
-%Include auto_generated/raster/qgsrasterpipe.sip
-%Include auto_generated/raster/qgsrasterpyramid.sip
-%Include auto_generated/raster/qgsrasterrange.sip
-%Include auto_generated/raster/qgsrasterrenderer.sip
-%Include auto_generated/raster/qgsrasterresamplefilter.sip
-%Include auto_generated/raster/qgsrasterresampler.sip
-%Include auto_generated/raster/qgsrastershader.sip
-%Include auto_generated/raster/qgsrastershaderfunction.sip
-%Include auto_generated/raster/qgsrastertransparency.sip
-%Include auto_generated/raster/qgsrasterviewport.sip
-%Include auto_generated/raster/qgssinglebandcolordatarenderer.sip
-%Include auto_generated/raster/qgssinglebandgrayrenderer.sip
-%Include auto_generated/raster/qgssinglebandpseudocolorrenderer.sip
-%Include auto_generated/raster/qgshillshaderenderer.sip
-%Include auto_generated/mesh/qgsmeshlayerinterpolator.sip
-%Include auto_generated/mesh/qgsmeshrenderersettings.sip
-%Include auto_generated/mesh/qgsmeshspatialindex.sip
-%Include auto_generated/mesh/qgsmeshtimesettings.sip
-%Include auto_generated/scalebar/qgsdoubleboxscalebarrenderer.sip
-%Include auto_generated/scalebar/qgsnumericscalebarrenderer.sip
-%Include auto_generated/scalebar/qgsscalebarsettings.sip
-%Include auto_generated/scalebar/qgsscalebarrenderer.sip
-%Include auto_generated/scalebar/qgssingleboxscalebarrenderer.sip
-%Include auto_generated/scalebar/qgsticksscalebarrenderer.sip
-%Include auto_generated/symbology/qgs25drenderer.sip
-%Include auto_generated/symbology/qgsarrowsymbollayer.sip
-%Include auto_generated/symbology/qgscategorizedsymbolrenderer.sip
-%Include auto_generated/symbology/qgscolorbrewerpalette.sip
-%Include auto_generated/symbology/qgsellipsesymbollayer.sip
-%Include auto_generated/symbology/qgsfillsymbollayer.sip
-%Include auto_generated/symbology/qgsgraduatedsymbolrenderer.sip
-%Include auto_generated/symbology/qgslegendsymbolitem.sip
-%Include auto_generated/symbology/qgslinesymbollayer.sip
-%Include auto_generated/symbology/qgsmarkersymbollayer.sip
-%Include auto_generated/symbology/qgspointclusterrenderer.sip
-%Include auto_generated/symbology/qgspointdisplacementrenderer.sip
-%Include auto_generated/symbology/qgspointdistancerenderer.sip
-%Include auto_generated/symbology/qgsrenderer.sip
-%Include auto_generated/symbology/qgsrendererrange.sip
-%Include auto_generated/symbology/qgsrendererregistry.sip
-%Include auto_generated/symbology/qgsrulebasedrenderer.sip
-%Include auto_generated/symbology/qgssinglesymbolrenderer.sip
-%Include auto_generated/symbology/qgsheatmaprenderer.sip
-%Include auto_generated/symbology/qgsinvertedpolygonrenderer.sip
-%Include auto_generated/symbology/qgsnullsymbolrenderer.sip
-%Include auto_generated/symbology/qgsstyleentityvisitor.sip
-%Include auto_generated/symbology/qgssymbollayer.sip
-%Include auto_generated/symbology/qgssymbollayerregistry.sip
-%Include auto_generated/symbology/qgssymbollayerutils.sip
-%Include auto_generated/symbology/qgssymbol.sip
-%Include auto_generated/symbology/qgsvectorfieldsymbollayer.sip
-%Include auto_generated/symbology/qgsgeometrygeneratorsymbollayer.sip
-%Include auto_generated/layertree/qgslayertreeutils.sip
-%Include auto_generated/locator/qgslocatorcontext.sip
+%Include auto_generated/expression/qgsexpression.sip
+%Include auto_generated/expression/qgsexpressioncontextutils.sip
+%Include auto_generated/expression/qgsexpressionfunction.sip
+%Include auto_generated/expression/qgsexpressionnode.sip
+%Include auto_generated/expression/qgsexpressionnodeimpl.sip
+%Include auto_generated/fieldformatter/qgscheckboxfieldformatter.sip
+%Include auto_generated/fieldformatter/qgsdatetimefieldformatter.sip
+%Include auto_generated/fieldformatter/qgsfallbackfieldformatter.sip
+%Include auto_generated/fieldformatter/qgskeyvaluefieldformatter.sip
+%Include auto_generated/fieldformatter/qgslistfieldformatter.sip
+%Include auto_generated/fieldformatter/qgsrangefieldformatter.sip
+%Include auto_generated/fieldformatter/qgsrelationreferencefieldformatter.sip
+%Include auto_generated/fieldformatter/qgsvaluemapfieldformatter.sip
+%Include auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip
+%Include auto_generated/geocms/geonode/qgsgeonodeconnection.sip
+%Include auto_generated/geocms/geonode/qgsgeonoderequest.sip
+%Include auto_generated/geometry/qgsabstractgeometry.sip
 %Include auto_generated/geometry/qgsbox3d.sip
-%Include auto_generated/geometry/qgscircularstring.sip
 %Include auto_generated/geometry/qgscircle.sip
+%Include auto_generated/geometry/qgscircularstring.sip
 %Include auto_generated/geometry/qgscompoundcurve.sip
-%Include auto_generated/geometry/qgscurvepolygon.sip
 %Include auto_generated/geometry/qgscurve.sip
+%Include auto_generated/geometry/qgscurvepolygon.sip
 %Include auto_generated/geometry/qgsellipse.sip
+%Include auto_generated/geometry/qgsgeometry.sip
 %Include auto_generated/geometry/qgsgeometrycollection.sip
 %Include auto_generated/geometry/qgsgeometryengine.sip
 %Include auto_generated/geometry/qgsgeometryutils.sip
@@ -309,145 +297,38 @@
 %Include auto_generated/geometry/qgsmultipoint.sip
 %Include auto_generated/geometry/qgsmultipolygon.sip
 %Include auto_generated/geometry/qgsmultisurface.sip
+%Include auto_generated/geometry/qgspoint.sip
 %Include auto_generated/geometry/qgspolygon.sip
 %Include auto_generated/geometry/qgsquadrilateral.sip
 %Include auto_generated/geometry/qgsrectangle.sip
 %Include auto_generated/geometry/qgsreferencedgeometry.sip
 %Include auto_generated/geometry/qgsregularpolygon.sip
-%Include auto_generated/geometry/qgstriangle.sip
 %Include auto_generated/geometry/qgssurface.sip
+%Include auto_generated/geometry/qgstriangle.sip
 %Include auto_generated/geometry/qgswkbptr.sip
-%Include auto_generated/./3d/qgs3drendererregistry.sip
-%Include auto_generated/./3d/qgsabstract3drenderer.sip
-%Include auto_generated/fieldformatter/qgscheckboxfieldformatter.sip
-%Include auto_generated/fieldformatter/qgsrangefieldformatter.sip
-%Include auto_generated/fieldformatter/qgsdatetimefieldformatter.sip
-%Include auto_generated/fieldformatter/qgsfallbackfieldformatter.sip
-%Include auto_generated/fieldformatter/qgskeyvaluefieldformatter.sip
-%Include auto_generated/fieldformatter/qgslistfieldformatter.sip
-%Include auto_generated/fieldformatter/qgsrelationreferencefieldformatter.sip
-%Include auto_generated/fieldformatter/qgsvaluemapfieldformatter.sip
-%Include auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip
-%Include auto_generated/geocms/geonode/qgsgeonodeconnection.sip
-%Include auto_generated/validity/qgsabstractvaliditycheck.sip
-%Include auto_generated/validity/qgsvaliditycheckcontext.sip
-%Include auto_generated/validity/qgsvaliditycheckregistry.sip
-%Include auto_generated/gps/qgsqtlocationconnection.sip
-%Include auto_generated/gps/qgsgpsconnectionregistry.sip
-%Include auto_generated/qgis.sip
-%Include auto_generated/qgsabstractcontentcache.sip
-%Include auto_generated/qgsapplication.sip
-%Include auto_generated/qgsactionscoperegistry.sip
-%Include auto_generated/qgsanimatedicon.sip
-%Include auto_generated/qgsauxiliarystorage.sip
-%Include auto_generated/qgsblockingnetworkrequest.sip
-%Include auto_generated/qgsbookmarkmanager.sip
-%Include auto_generated/qgsbookmarkmodel.sip
-%Include auto_generated/qgsbrowsermodel.sip
-%Include auto_generated/qgsbrowserproxymodel.sip
-%Include auto_generated/qgsconditionalstyle.sip
-%Include auto_generated/qgscoordinatereferencesystem.sip
-%Include auto_generated/qgscredentials.sip
-%Include auto_generated/qgsdataitem.sip
-%Include auto_generated/qgsdataprovider.sip
-%Include auto_generated/qgsdatasourceuri.sip
-%Include auto_generated/qgsdefaultvalue.sip
-%Include auto_generated/qgsfeature.sip
-%Include auto_generated/qgsfeedback.sip
-%Include auto_generated/qgsfield.sip
-%Include auto_generated/qgsfieldconstraints.sip
-%Include auto_generated/qgsfieldformatterregistry.sip
-%Include auto_generated/qgsfieldmodel.sip
-%Include auto_generated/qgsfieldproxymodel.sip
-%Include auto_generated/qgsfiledownloader.sip
-%Include auto_generated/qgsfeaturefiltermodel.sip
-%Include auto_generated/qgsgeometryoptions.sip
-%Include auto_generated/qgsgeometryvalidator.sip
-%Include auto_generated/qgsgml.sip
-%Include auto_generated/qgsgmlschema.sip
-%Include auto_generated/qgsimagecache.sip
-%Include auto_generated/qgsmaplayer.sip
-%Include auto_generated/qgsmaplayerlegend.sip
-%Include auto_generated/qgsmaplayermodel.sip
-%Include auto_generated/qgsmaplayerproxymodel.sip
-%Include auto_generated/qgsmaplayerstore.sip
-%Include auto_generated/qgsmaplayerstylemanager.sip
-%Include auto_generated/qgsmaprenderercache.sip
-%Include auto_generated/qgsmaprenderercustompainterjob.sip
-%Include auto_generated/qgsmaprendererjob.sip
-%Include auto_generated/qgsmaprendererparalleljob.sip
-%Include auto_generated/qgsmaprenderersequentialjob.sip
-%Include auto_generated/qgsmaprenderertask.sip
-%Include auto_generated/qgsmessagelog.sip
-%Include auto_generated/qgsmessageoutput.sip
-%Include auto_generated/qgsnetworkaccessmanager.sip
-%Include auto_generated/qgsnetworkcontentfetcher.sip
-%Include auto_generated/qgsnetworkcontentfetcherregistry.sip
-%Include auto_generated/qgsnetworkcontentfetchertask.sip
-%Include auto_generated/qgsnewsfeedmodel.sip
-%Include auto_generated/qgsnewsfeedparser.sip
-%Include auto_generated/qgsofflineediting.sip
-%Include auto_generated/qgspluginlayer.sip
-%Include auto_generated/qgspointxy.sip
-%Include auto_generated/qgsproject.sip
-%Include auto_generated/qgsprojectviewsettings.sip
-%Include auto_generated/qgsproxyprogresstask.sip
-%Include auto_generated/qgsrelationmanager.sip
-%Include auto_generated/qgsrelation.sip
-%Include auto_generated/qgsrunprocess.sip
-%Include auto_generated/qgssnappingconfig.sip
-%Include auto_generated/qgsstoredexpressionmanager.sip
-%Include auto_generated/qgstaskmanager.sip
-%Include auto_generated/qgstolerance.sip
-%Include auto_generated/qgstrackedvectorlayertools.sip
-%Include auto_generated/qgstransaction.sip
-%Include auto_generated/qgstransactiongroup.sip
-%Include auto_generated/qgsunittypes.sip
-%Include auto_generated/qgsvectorfilewritertask.sip
-%Include auto_generated/qgsvectorlayereditbuffer.sip
-%Include auto_generated/qgsvectorlayereditpassthrough.sip
-%Include auto_generated/qgsvectorlayer.sip
-%Include auto_generated/qgsvirtuallayertask.sip
-%Include auto_generated/qgsvectorlayerfeaturecounter.sip
-%Include auto_generated/qgsvectorlayerjoinbuffer.sip
-%Include auto_generated/qgsvectorlayertools.sip
-%Include auto_generated/qgsvectorsimplifymethod.sip
-%Include auto_generated/qgsvectorlayerserverproperties.sip
-%Include auto_generated/qgssettings.sip
-%Include auto_generated/annotations/qgsannotation.sip
-%Include auto_generated/annotations/qgsannotationmanager.sip
-%Include auto_generated/annotations/qgshtmlannotation.sip
-%Include auto_generated/annotations/qgssvgannotation.sip
-%Include auto_generated/annotations/qgstextannotation.sip
-%Include auto_generated/locator/qgslocator.sip
-%Include auto_generated/locator/qgslocatorfilter.sip
-%Include auto_generated/locator/qgslocatormodel.sip
-%Include auto_generated/locator/qgslocatormodelbridge.sip
-%Include auto_generated/processing/qgsprocessingalgrunnertask.sip
-%Include auto_generated/processing/qgsprocessingfeedback.sip
-%Include auto_generated/processing/qgsprocessingprovider.sip
-%Include auto_generated/processing/qgsprocessingregistry.sip
-%Include auto_generated/raster/qgsrasterfilewritertask.sip
-%Include auto_generated/raster/qgsrasterlayer.sip
-%Include auto_generated/raster/qgsrasterdataprovider.sip
-%Include auto_generated/raster/qgsrasterinterface.sip
-%Include auto_generated/raster/qgsrasterprojector.sip
-%Include auto_generated/mesh/qgsmeshdataprovider.sip
-%Include auto_generated/mesh/qgsmeshlayer.sip
-%Include auto_generated/geometry/qgsabstractgeometry.sip
-%Include auto_generated/geometry/qgsgeometry.sip
-%Include auto_generated/geometry/qgspoint.sip
 %Include auto_generated/geometry/qgswkbtypes.sip
-%Include auto_generated/geocms/geonode/qgsgeonoderequest.sip
 %Include auto_generated/gps/qgsgpsconnection.sip
+%Include auto_generated/gps/qgsgpsdconnection.sip
 %Include auto_generated/gps/qgsgpsdetector.sip
 %Include auto_generated/gps/qgsnmeaconnection.sip
-%Include auto_generated/gps/qgsgpsdconnection.sip
+%Include auto_generated/layertree/qgslayertree.sip
+%Include auto_generated/layertree/qgslayertreegroup.sip
+%Include auto_generated/layertree/qgslayertreelayer.sip
+%Include auto_generated/layertree/qgslayertreemodel.sip
+%Include auto_generated/layertree/qgslayertreemodellegendnode.sip
+%Include auto_generated/layertree/qgslayertreenode.sip
+%Include auto_generated/layertree/qgslayertreeregistrybridge.sip
+%Include auto_generated/layertree/qgslayertreeutils.sip
+%Include auto_generated/layout/qgsabstractlayoutiterator.sip
+%Include auto_generated/layout/qgsabstractreportsection.sip
 %Include auto_generated/layout/qgslayout.sip
+%Include auto_generated/layout/qgslayoutaligner.sip
 %Include auto_generated/layout/qgslayoutatlas.sip
 %Include auto_generated/layout/qgslayouteffect.sip
-%Include auto_generated/layout/qgslayoutguidecollection.sip
+%Include auto_generated/layout/qgslayoutexporter.sip
 %Include auto_generated/layout/qgslayoutframe.sip
+%Include auto_generated/layout/qgslayoutgridsettings.sip
+%Include auto_generated/layout/qgslayoutguidecollection.sip
 %Include auto_generated/layout/qgslayoutitem.sip
 %Include auto_generated/layout/qgslayoutitemattributetable.sip
 %Include auto_generated/layout/qgslayoutitemgroup.sip
@@ -468,27 +349,146 @@
 %Include auto_generated/layout/qgslayoutitemshape.sip
 %Include auto_generated/layout/qgslayoutitemtexttable.sip
 %Include auto_generated/layout/qgslayoutmanager.sip
+%Include auto_generated/layout/qgslayoutmeasurement.sip
+%Include auto_generated/layout/qgslayoutmeasurementconverter.sip
 %Include auto_generated/layout/qgslayoutmodel.sip
 %Include auto_generated/layout/qgslayoutmultiframe.sip
-%Include auto_generated/layout/qgslayoutpagecollection.sip
 %Include auto_generated/layout/qgslayoutobject.sip
+%Include auto_generated/layout/qgslayoutpagecollection.sip
+%Include auto_generated/layout/qgslayoutpoint.sip
 %Include auto_generated/layout/qgslayoutrendercontext.sip
 %Include auto_generated/layout/qgslayoutreportcontext.sip
+%Include auto_generated/layout/qgslayoutserializableobject.sip
+%Include auto_generated/layout/qgslayoutsize.sip
+%Include auto_generated/layout/qgslayoutsnapper.sip
 %Include auto_generated/layout/qgslayouttable.sip
 %Include auto_generated/layout/qgslayouttablecolumn.sip
+%Include auto_generated/layout/qgslayoutundocommand.sip
 %Include auto_generated/layout/qgslayoutundostack.sip
+%Include auto_generated/layout/qgslayoututils.sip
+%Include auto_generated/layout/qgsmasterlayoutinterface.sip
+%Include auto_generated/layout/qgspagesizeregistry.sip
 %Include auto_generated/layout/qgsprintlayout.sip
 %Include auto_generated/layout/qgsreport.sip
+%Include auto_generated/layout/qgsreportsectionfieldgroup.sip
+%Include auto_generated/layout/qgsreportsectionlayout.sip
+%Include auto_generated/locator/qgslocator.sip
+%Include auto_generated/locator/qgslocatorcontext.sip
+%Include auto_generated/locator/qgslocatorfilter.sip
+%Include auto_generated/locator/qgslocatormodel.sip
+%Include auto_generated/locator/qgslocatormodelbridge.sip
+%Include auto_generated/mesh/qgsmeshdataprovider.sip
+%Include auto_generated/mesh/qgsmeshlayer.sip
+%Include auto_generated/mesh/qgsmeshlayerinterpolator.sip
+%Include auto_generated/mesh/qgsmeshrenderersettings.sip
+%Include auto_generated/mesh/qgsmeshspatialindex.sip
+%Include auto_generated/mesh/qgsmeshtimesettings.sip
+%Include auto_generated/metadata/qgsabstractmetadatabase.sip
+%Include auto_generated/metadata/qgslayermetadata.sip
+%Include auto_generated/metadata/qgslayermetadataformatter.sip
+%Include auto_generated/metadata/qgslayermetadatavalidator.sip
+%Include auto_generated/metadata/qgsprojectmetadata.sip
+%Include auto_generated/processing/models/qgsprocessingmodelalgorithm.sip
+%Include auto_generated/processing/models/qgsprocessingmodelchildalgorithm.sip
+%Include auto_generated/processing/models/qgsprocessingmodelchildparametersource.sip
+%Include auto_generated/processing/models/qgsprocessingmodelcomponent.sip
+%Include auto_generated/processing/models/qgsprocessingmodeloutput.sip
+%Include auto_generated/processing/models/qgsprocessingmodelparameter.sip
+%Include auto_generated/processing/qgsprocessing.sip
+%Include auto_generated/processing/qgsprocessingalgorithm.sip
+%Include auto_generated/processing/qgsprocessingalgrunnertask.sip
+%Include auto_generated/processing/qgsprocessingcontext.sip
+%Include auto_generated/processing/qgsprocessingfeedback.sip
+%Include auto_generated/processing/qgsprocessingoutputs.sip
+%Include auto_generated/processing/qgsprocessingparameters.sip
+%Include auto_generated/processing/qgsprocessingparametertype.sip
+%Include auto_generated/processing/qgsprocessingprovider.sip
+%Include auto_generated/processing/qgsprocessingregistry.sip
+%Include auto_generated/processing/qgsprocessingutils.sip
+%Include auto_generated/providers/memory/qgsmemoryproviderutils.sip
+%Include auto_generated/raster/qgsbilinearrasterresampler.sip
+%Include auto_generated/raster/qgsbrightnesscontrastfilter.sip
+%Include auto_generated/raster/qgscliptominmaxenhancement.sip
+%Include auto_generated/raster/qgscolorrampshader.sip
+%Include auto_generated/raster/qgscontrastenhancement.sip
+%Include auto_generated/raster/qgscontrastenhancementfunction.sip
+%Include auto_generated/raster/qgscubicrasterresampler.sip
+%Include auto_generated/raster/qgshillshaderenderer.sip
+%Include auto_generated/raster/qgshuesaturationfilter.sip
+%Include auto_generated/raster/qgslinearminmaxenhancement.sip
+%Include auto_generated/raster/qgslinearminmaxenhancementwithclip.sip
+%Include auto_generated/raster/qgsmultibandcolorrenderer.sip
+%Include auto_generated/raster/qgspalettedrasterrenderer.sip
+%Include auto_generated/raster/qgsraster.sip
+%Include auto_generated/raster/qgsrasterbandstats.sip
+%Include auto_generated/raster/qgsrasterblock.sip
+%Include auto_generated/raster/qgsrasterchecker.sip
+%Include auto_generated/raster/qgsrasterdataprovider.sip
+%Include auto_generated/raster/qgsrasterdrawer.sip
+%Include auto_generated/raster/qgsrasterfilewriter.sip
+%Include auto_generated/raster/qgsrasterfilewritertask.sip
+%Include auto_generated/raster/qgsrasterhistogram.sip
+%Include auto_generated/raster/qgsrasteridentifyresult.sip
+%Include auto_generated/raster/qgsrasterinterface.sip
+%Include auto_generated/raster/qgsrasteriterator.sip
+%Include auto_generated/raster/qgsrasterlayer.sip
+%Include auto_generated/raster/qgsrasterminmaxorigin.sip
+%Include auto_generated/raster/qgsrasternuller.sip
+%Include auto_generated/raster/qgsrasterpipe.sip
+%Include auto_generated/raster/qgsrasterprojector.sip
+%Include auto_generated/raster/qgsrasterpyramid.sip
+%Include auto_generated/raster/qgsrasterrange.sip
+%Include auto_generated/raster/qgsrasterrenderer.sip
+%Include auto_generated/raster/qgsrasterresamplefilter.sip
+%Include auto_generated/raster/qgsrasterresampler.sip
+%Include auto_generated/raster/qgsrastershader.sip
+%Include auto_generated/raster/qgsrastershaderfunction.sip
+%Include auto_generated/raster/qgsrastertransparency.sip
+%Include auto_generated/raster/qgsrasterviewport.sip
+%Include auto_generated/raster/qgssinglebandcolordatarenderer.sip
+%Include auto_generated/raster/qgssinglebandgrayrenderer.sip
+%Include auto_generated/raster/qgssinglebandpseudocolorrenderer.sip
+%Include auto_generated/scalebar/qgsdoubleboxscalebarrenderer.sip
+%Include auto_generated/scalebar/qgsnumericscalebarrenderer.sip
+%Include auto_generated/scalebar/qgsscalebarrenderer.sip
+%Include auto_generated/scalebar/qgsscalebarsettings.sip
+%Include auto_generated/scalebar/qgssingleboxscalebarrenderer.sip
+%Include auto_generated/scalebar/qgsticksscalebarrenderer.sip
+%Include auto_generated/symbology/qgs25drenderer.sip
+%Include auto_generated/symbology/qgsarrowsymbollayer.sip
+%Include auto_generated/symbology/qgscategorizedsymbolrenderer.sip
+%Include auto_generated/symbology/qgscolorbrewerpalette.sip
 %Include auto_generated/symbology/qgscptcityarchive.sip
-%Include auto_generated/symbology/qgssvgcache.sip
+%Include auto_generated/symbology/qgsellipsesymbollayer.sip
+%Include auto_generated/symbology/qgsfillsymbollayer.sip
+%Include auto_generated/symbology/qgsgeometrygeneratorsymbollayer.sip
+%Include auto_generated/symbology/qgsgraduatedsymbolrenderer.sip
+%Include auto_generated/symbology/qgsheatmaprenderer.sip
+%Include auto_generated/symbology/qgsinvertedpolygonrenderer.sip
+%Include auto_generated/symbology/qgslegendsymbolitem.sip
+%Include auto_generated/symbology/qgslinesymbollayer.sip
+%Include auto_generated/symbology/qgsmarkersymbollayer.sip
+%Include auto_generated/symbology/qgsnullsymbolrenderer.sip
+%Include auto_generated/symbology/qgspointclusterrenderer.sip
+%Include auto_generated/symbology/qgspointdisplacementrenderer.sip
+%Include auto_generated/symbology/qgspointdistancerenderer.sip
+%Include auto_generated/symbology/qgsrenderer.sip
+%Include auto_generated/symbology/qgsrendererrange.sip
+%Include auto_generated/symbology/qgsrendererregistry.sip
+%Include auto_generated/symbology/qgsrulebasedrenderer.sip
+%Include auto_generated/symbology/qgssinglesymbolrenderer.sip
 %Include auto_generated/symbology/qgsstyle.sip
+%Include auto_generated/symbology/qgsstyleentityvisitor.sip
 %Include auto_generated/symbology/qgsstylemodel.sip
-%Include auto_generated/layertree/qgslayertree.sip
-%Include auto_generated/layertree/qgslayertreegroup.sip
-%Include auto_generated/layertree/qgslayertreelayer.sip
-%Include auto_generated/layertree/qgslayertreemodel.sip
-%Include auto_generated/layertree/qgslayertreemodellegendnode.sip
-%Include auto_generated/layertree/qgslayertreenode.sip
-%Include auto_generated/layertree/qgslayertreeregistrybridge.sip
-%Include auto_generated/qgsuserprofilemanager.sip
+%Include auto_generated/symbology/qgssvgcache.sip
+%Include auto_generated/symbology/qgssymbol.sip
+%Include auto_generated/symbology/qgssymbollayer.sip
+%Include auto_generated/symbology/qgssymbollayerregistry.sip
+%Include auto_generated/symbology/qgssymbollayerutils.sip
+%Include auto_generated/symbology/qgsvectorfieldsymbollayer.sip
+%Include auto_generated/validity/qgsabstractvaliditycheck.sip
+%Include auto_generated/validity/qgsvaliditycheckcontext.sip
+%Include auto_generated/validity/qgsvaliditycheckregistry.sip
+%Include auto_generated/gps/qgsqtlocationconnection.sip
+%Include auto_generated/gps/qgsgpsconnectionregistry.sip
 %Include auto_generated/qgsuserprofile.sip
diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
index a93fa529158..537c34e4821 100644
--- a/python/gui/gui_auto.sip
+++ b/python/gui/gui_auto.sip
@@ -1,72 +1,21 @@
 // Include auto-generated SIP files
-%Include auto_generated/qgsattributeforminterface.sip
-%Include auto_generated/qgsdataitemguiprovider.sip
-%Include auto_generated/qgsdataitemguiproviderregistry.sip
-%Include auto_generated/qgsdetaileditemdata.sip
-%Include auto_generated/qgsexpressionbuilderdialog.sip
-%Include auto_generated/qgsgeometryrubberband.sip
-%Include auto_generated/qgsproviderguimetadata.sip
-%Include auto_generated/qgsproviderguiregistry.sip
-%Include auto_generated/qgsprojectstorageguiregistry.sip
-%Include auto_generated/qgshelp.sip
-%Include auto_generated/qgshighlight.sip
-%Include auto_generated/qgsmapcanvasitem.sip
-%Include auto_generated/qgsmapcanvassnappingutils.sip
-%Include auto_generated/qgsmapcanvastracer.sip
-%Include auto_generated/qgsmaplayerconfigwidgetfactory.sip
-%Include auto_generated/qgsmapmouseevent.sip
-%Include auto_generated/qgsmaptip.sip
-%Include auto_generated/qgssnapindicator.sip
-%Include auto_generated/qgstablewidgetitem.sip
-%Include auto_generated/qgsuserinputwidget.sip
-%Include auto_generated/qgsbrowserdockwidget.sip
-%Include auto_generated/qgsvertexmarker.sip
-%Include auto_generated/qgsdatasourceselectdialog.sip
-%Include auto_generated/qgsabstractdatasourcewidget.sip
-%Include auto_generated/qgssourceselectprovider.sip
-%Include auto_generated/qgssourceselectproviderregistry.sip
-%Include auto_generated/qgswindowmanagerinterface.sip
-%Include auto_generated/qgsprojectstorageguiprovider.sip
-%Include auto_generated/attributetable/qgsfeaturemodel.sip
-%Include auto_generated/auth/qgsauthauthoritieseditor.sip
-%Include auto_generated/auth/qgsauthcertificateinfo.sip
-%Include auto_generated/auth/qgsauthcertificatemanager.sip
-%Include auto_generated/auth/qgsauthcerttrustpolicycombobox.sip
-%Include auto_generated/auth/qgsauthconfigeditor.sip
-%Include auto_generated/auth/qgsauthconfigselect.sip
-%Include auto_generated/auth/qgsauthsettingswidget.sip
-%Include auto_generated/auth/qgsautheditorwidgets.sip
-%Include auto_generated/auth/qgsauthidentitieseditor.sip
-%Include auto_generated/auth/qgsauthimportcertdialog.sip
-%Include auto_generated/auth/qgsauthimportidentitydialog.sip
-%Include auto_generated/auth/qgsauthmethodedit.sip
-%Include auto_generated/auth/qgsauthserverseditor.sip
-%Include auto_generated/auth/qgsauthsslconfigwidget.sip
-%Include auto_generated/auth/qgsauthsslerrorsdialog.sip
-%Include auto_generated/auth/qgsauthsslimportdialog.sip
-%Include auto_generated/auth/qgsauthtrustedcasdialog.sip
-%Include auto_generated/editorwidgets/core/qgseditorwidgetfactory.sip
-%Include auto_generated/editorwidgets/core/qgseditorwidgetautoconf.sip
-%Include auto_generated/layertree/qgslayertreeembeddedconfigwidget.sip
-%Include auto_generated/layertree/qgslayertreeembeddedwidgetregistry.sip
-%Include auto_generated/layout/qgslayoutviewmouseevent.sip
-%Include auto_generated/processing/qgsprocessinggui.sip
-%Include auto_generated/processing/qgsprocessingguiregistry.sip
-%Include auto_generated/raster/qgsrasterrendererwidget.sip
-%Include auto_generated/symbology/qgssymbolwidgetcontext.sip
 %Include auto_generated/qgisinterface.sip
+%Include auto_generated/qgsabstractdatasourcewidget.sip
 %Include auto_generated/qgsactionmenu.sip
 %Include auto_generated/qgsadvanceddigitizingdockwidget.sip
 %Include auto_generated/qgsadvanceddigitizingfloater.sip
 %Include auto_generated/qgsaggregatetoolbutton.sip
 %Include auto_generated/qgsalignmentcombobox.sip
 %Include auto_generated/qgsattributedialog.sip
+%Include auto_generated/qgsattributeeditorcontext.sip
 %Include auto_generated/qgsattributeform.sip
 %Include auto_generated/qgsattributeformeditorwidget.sip
+%Include auto_generated/qgsattributeforminterface.sip
 %Include auto_generated/qgsattributeformrelationeditorwidget.sip
 %Include auto_generated/qgsattributeformwidget.sip
 %Include auto_generated/qgsattributetypeloaddialog.sip
 %Include auto_generated/qgsblendmodecombobox.sip
+%Include auto_generated/qgsbrowserdockwidget.sip
 %Include auto_generated/qgsbrowserguimodel.sip
 %Include auto_generated/qgsbrowsertreeview.sip
 %Include auto_generated/qgsbusyindicatordialog.sip
@@ -79,6 +28,9 @@
 %Include auto_generated/qgscodeeditorcss.sip
 %End
 %If ( HAVE_QSCI_SIP )
+%Include auto_generated/qgscodeeditorexpression.sip
+%End
+%If ( HAVE_QSCI_SIP )
 %Include auto_generated/qgscodeeditorhtml.sip
 %End
 %If ( HAVE_QSCI_SIP )
@@ -87,14 +39,11 @@
 %If ( HAVE_QSCI_SIP )
 %Include auto_generated/qgscodeeditorsql.sip
 %End
-%If ( HAVE_QSCI_SIP )
-%Include auto_generated/qgscodeeditorexpression.sip
-%End
 %Include auto_generated/qgscollapsiblegroupbox.sip
 %Include auto_generated/qgscolorbrewercolorrampdialog.sip
 %Include auto_generated/qgscolorbutton.sip
-%Include auto_generated/qgscolorrampbutton.sip
 %Include auto_generated/qgscolordialog.sip
+%Include auto_generated/qgscolorrampbutton.sip
 %Include auto_generated/qgscolorschemelist.sip
 %Include auto_generated/qgscolorswatchgrid.sip
 %Include auto_generated/qgscolorwidgets.sip
@@ -104,6 +53,10 @@
 %Include auto_generated/qgscredentialdialog.sip
 %Include auto_generated/qgscurveeditorwidget.sip
 %Include auto_generated/qgscustomdrophandler.sip
+%Include auto_generated/qgsdataitemguiprovider.sip
+%Include auto_generated/qgsdataitemguiproviderregistry.sip
+%Include auto_generated/qgsdatasourceselectdialog.sip
+%Include auto_generated/qgsdetaileditemdata.sip
 %Include auto_generated/qgsdetaileditemdelegate.sip
 %Include auto_generated/qgsdetaileditemwidget.sip
 %Include auto_generated/qgsdial.sip
@@ -111,71 +64,81 @@
 %Include auto_generated/qgsdockwidget.sip
 %Include auto_generated/qgsencodingfiledialog.sip
 %Include auto_generated/qgserrordialog.sip
+%Include auto_generated/qgsexpressionbuilderdialog.sip
 %Include auto_generated/qgsexpressionbuilderwidget.sip
 %Include auto_generated/qgsexpressionhighlighter.sip
 %Include auto_generated/qgsexpressionlineedit.sip
 %Include auto_generated/qgsexpressionselectiondialog.sip
 %Include auto_generated/qgsextentgroupbox.sip
 %Include auto_generated/qgsexternalresourcewidget.sip
+%Include auto_generated/qgsfeaturelistcombobox.sip
 %Include auto_generated/qgsfeatureselectiondlg.sip
 %Include auto_generated/qgsfieldcombobox.sip
 %Include auto_generated/qgsfieldexpressionwidget.sip
-%Include auto_generated/qgsfindfilesbypatternwidget.sip
-%Include auto_generated/qgsfeaturelistcombobox.sip
 %Include auto_generated/qgsfieldvalidator.sip
 %Include auto_generated/qgsfieldvalueslineedit.sip
 %Include auto_generated/qgsfilecontentsourcelineedit.sip
+%Include auto_generated/qgsfiledownloaderdialog.sip
 %Include auto_generated/qgsfilewidget.sip
 %Include auto_generated/qgsfilterlineedit.sip
+%Include auto_generated/qgsfindfilesbypatternwidget.sip
 %Include auto_generated/qgsfloatingwidget.sip
 %Include auto_generated/qgsfocuswatcher.sip
 %Include auto_generated/qgsfontbutton.sip
 %Include auto_generated/qgsformannotation.sip
+%Include auto_generated/qgsgeometryrubberband.sip
 %Include auto_generated/qgsgradientcolorrampdialog.sip
 %Include auto_generated/qgsgradientstopeditor.sip
 %Include auto_generated/qgsgroupwmsdatadialog.sip
 %Include auto_generated/qgsgui.sip
+%Include auto_generated/qgshelp.sip
+%Include auto_generated/qgshighlight.sip
 %Include auto_generated/qgshistogramwidget.sip
 %Include auto_generated/qgsidentifymenu.sip
 %Include auto_generated/qgskeyvaluewidget.sip
-%Include auto_generated/qgslistwidget.sip
 %Include auto_generated/qgslegendfilterbutton.sip
 %Include auto_generated/qgslimitedrandomcolorrampdialog.sip
-%Include auto_generated/qgsratiolockbutton.sip
+%Include auto_generated/qgslistwidget.sip
 %Include auto_generated/qgslonglongvalidator.sip
 %Include auto_generated/qgsludialog.sip
 %Include auto_generated/qgsmanageconnectionsdialog.sip
 %Include auto_generated/qgsmapcanvas.sip
 %Include auto_generated/qgsmapcanvasannotationitem.sip
+%Include auto_generated/qgsmapcanvasitem.sip
+%Include auto_generated/qgsmapcanvassnappingutils.sip
+%Include auto_generated/qgsmapcanvastracer.sip
 %Include auto_generated/qgsmaplayeractionregistry.sip
 %Include auto_generated/qgsmaplayercombobox.sip
+%Include auto_generated/qgsmaplayerconfigwidget.sip
+%Include auto_generated/qgsmaplayerconfigwidgetfactory.sip
 %Include auto_generated/qgsmaplayerstylemanagerwidget.sip
+%Include auto_generated/qgsmapmouseevent.sip
 %Include auto_generated/qgsmapoverviewcanvas.sip
+%Include auto_generated/qgsmaptip.sip
 %Include auto_generated/qgsmaptool.sip
 %Include auto_generated/qgsmaptooladvanceddigitizing.sip
 %Include auto_generated/qgsmaptoolcapture.sip
-%Include auto_generated/qgsmaptooledit.sip
 %Include auto_generated/qgsmaptooldigitizefeature.sip
+%Include auto_generated/qgsmaptooledit.sip
 %Include auto_generated/qgsmaptoolemitpoint.sip
 %Include auto_generated/qgsmaptoolextent.sip
 %Include auto_generated/qgsmaptoolidentify.sip
 %Include auto_generated/qgsmaptoolidentifyfeature.sip
 %Include auto_generated/qgsmaptoolpan.sip
 %Include auto_generated/qgsmaptoolzoom.sip
-%Include auto_generated/qgsmaplayerconfigwidget.sip
 %Include auto_generated/qgsmenuheader.sip
 %Include auto_generated/qgsmessagebar.sip
 %Include auto_generated/qgsmessagebaritem.sip
 %Include auto_generated/qgsmessagelogviewer.sip
 %Include auto_generated/qgsmessageviewer.sip
 %Include auto_generated/qgsmetadatawidget.sip
-%Include auto_generated/qgsnewauxiliarylayerdialog.sip
 %Include auto_generated/qgsnewauxiliaryfielddialog.sip
+%Include auto_generated/qgsnewauxiliarylayerdialog.sip
+%Include auto_generated/qgsnewgeopackagelayerdialog.sip
 %Include auto_generated/qgsnewhttpconnection.sip
 %Include auto_generated/qgsnewmemorylayerdialog.sip
 %Include auto_generated/qgsnewnamedialog.sip
 %Include auto_generated/qgsnewvectorlayerdialog.sip
-%Include auto_generated/qgsnewgeopackagelayerdialog.sip
 %Include auto_generated/qgsopacitywidget.sip
 %Include auto_generated/qgsoptionsdialogbase.sip
 %Include auto_generated/qgsoptionsdialoghighlightwidget.sip
@@ -191,15 +154,20 @@
 %Include auto_generated/qgspresetcolorrampdialog.sip
 %Include auto_generated/qgsprevieweffect.sip
 %Include auto_generated/qgsprojectionselectiondialog.sip
-%Include auto_generated/qgsprojectionselectionwidget.sip
 %Include auto_generated/qgsprojectionselectiontreewidget.sip
+%Include auto_generated/qgsprojectionselectionwidget.sip
+%Include auto_generated/qgsprojectstorageguiprovider.sip
+%Include auto_generated/qgsprojectstorageguiregistry.sip
 %Include auto_generated/qgspropertyassistantwidget.sip
 %Include auto_generated/qgspropertyoverridebutton.sip
+%Include auto_generated/qgsproviderguimetadata.sip
+%Include auto_generated/qgsproviderguiregistry.sip
 %Include auto_generated/qgsproxystyle.sip
 %Include auto_generated/qgsquerybuilder.sip
 %Include auto_generated/qgsrasterformatsaveoptionswidget.sip
 %Include auto_generated/qgsrasterlayersaveasdialog.sip
 %Include auto_generated/qgsrasterpyramidsoptionswidget.sip
+%Include auto_generated/qgsratiolockbutton.sip
 %Include auto_generated/qgsrelationeditorwidget.sip
 %Include auto_generated/qgsrubberband.sip
 %Include auto_generated/qgsscalecombobox.sip
@@ -210,38 +178,144 @@
 %Include auto_generated/qgssearchquerybuilder.sip
 %Include auto_generated/qgsshortcutsmanager.sip
 %Include auto_generated/qgsslider.sip
+%Include auto_generated/qgssnapindicator.sip
 %Include auto_generated/qgssnaptogridcanvasitem.sip
+%Include auto_generated/qgssourceselectprovider.sip
+%Include auto_generated/qgssourceselectproviderregistry.sip
 %Include auto_generated/qgsstatusbar.sip
 %Include auto_generated/qgsstyleitemslistwidget.sip
 %Include auto_generated/qgssublayersdialog.sip
 %Include auto_generated/qgssubstitutionlistwidget.sip
 %Include auto_generated/qgssymbolbutton.sip
 %Include auto_generated/qgstablewidgetbase.sip
+%Include auto_generated/qgstablewidgetitem.sip
 %Include auto_generated/qgstabwidget.sip
 %Include auto_generated/qgstaskmanagerwidget.sip
 %Include auto_generated/qgstextformatwidget.sip
 %Include auto_generated/qgstextpreview.sip
 %Include auto_generated/qgstreewidgetitem.sip
 %Include auto_generated/qgsunitselectionwidget.sip
+%Include auto_generated/qgsuserinputwidget.sip
 %Include auto_generated/qgsvaliditycheckresultswidget.sip
 %Include auto_generated/qgsvariableeditorwidget.sip
+%Include auto_generated/qgsvertexmarker.sip
 %Include auto_generated/qgsvscrollarea.sip
-%Include auto_generated/qgsfiledownloaderdialog.sip
-%Include auto_generated/qgsattributeeditorcontext.sip
+%Include auto_generated/qgswindowmanagerinterface.sip
+%Include auto_generated/attributetable/qgsattributetabledelegate.sip
+%Include auto_generated/attributetable/qgsattributetablefiltermodel.sip
+%Include auto_generated/attributetable/qgsattributetablemodel.sip
+%Include auto_generated/attributetable/qgsattributetableview.sip
+%Include auto_generated/attributetable/qgsdualview.sip
+%Include auto_generated/attributetable/qgsfeaturelistmodel.sip
+%Include auto_generated/attributetable/qgsfeaturelistview.sip
+%Include auto_generated/attributetable/qgsfeaturelistviewdelegate.sip
+%Include auto_generated/attributetable/qgsfeaturemodel.sip
+%Include auto_generated/attributetable/qgsfeatureselectionmodel.sip
+%Include auto_generated/attributetable/qgsfieldconditionalformatwidget.sip
+%Include auto_generated/attributetable/qgsifeatureselectionmanager.sip
+%Include auto_generated/attributetable/qgsorganizetablecolumnsdialog.sip
+%Include auto_generated/auth/qgsauthauthoritieseditor.sip
+%Include auto_generated/auth/qgsauthcertificateinfo.sip
+%Include auto_generated/auth/qgsauthcertificatemanager.sip
+%Include auto_generated/auth/qgsauthcerttrustpolicycombobox.sip
+%Include auto_generated/auth/qgsauthconfigeditor.sip
+%Include auto_generated/auth/qgsauthconfigselect.sip
+%Include auto_generated/auth/qgsautheditorwidgets.sip
+%Include auto_generated/auth/qgsauthidentitieseditor.sip
+%Include auto_generated/auth/qgsauthimportcertdialog.sip
+%Include auto_generated/auth/qgsauthimportidentitydialog.sip
+%Include auto_generated/auth/qgsauthmethodedit.sip
+%Include auto_generated/auth/qgsauthserverseditor.sip
+%Include auto_generated/auth/qgsauthsettingswidget.sip
+%Include auto_generated/auth/qgsauthsslconfigwidget.sip
+%Include auto_generated/auth/qgsauthsslerrorsdialog.sip
+%Include auto_generated/auth/qgsauthsslimportdialog.sip
+%Include auto_generated/auth/qgsauthtrustedcasdialog.sip
 %Include auto_generated/callouts/qgscalloutwidget.sip
+%Include auto_generated/editorwidgets/core/qgseditorconfigwidget.sip
+%Include auto_generated/editorwidgets/core/qgseditorwidgetautoconf.sip
+%Include auto_generated/editorwidgets/core/qgseditorwidgetfactory.sip
+%Include auto_generated/editorwidgets/core/qgseditorwidgetregistry.sip
+%Include auto_generated/editorwidgets/core/qgseditorwidgetwrapper.sip
+%Include auto_generated/editorwidgets/core/qgssearchwidgetwrapper.sip
+%Include auto_generated/editorwidgets/core/qgswidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgscheckboxsearchwidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgsdatetimeedit.sip
+%Include auto_generated/editorwidgets/qgsdatetimesearchwidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgsdoublespinbox.sip
+%Include auto_generated/editorwidgets/qgshtmlwidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgsmultiedittoolbutton.sip
+%Include auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgsrelationreferencewidget.sip
+%Include auto_generated/editorwidgets/qgsrelationreferencewidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgssearchwidgettoolbutton.sip
+%Include auto_generated/editorwidgets/qgsspinbox.sip
+%Include auto_generated/editorwidgets/qgsvaluemapsearchwidgetwrapper.sip
+%Include auto_generated/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip
+%Include auto_generated/effects/qgseffectdrawmodecombobox.sip
+%Include auto_generated/effects/qgseffectstackpropertieswidget.sip
+%Include auto_generated/effects/qgspainteffectpropertieswidget.sip
+%Include auto_generated/effects/qgspainteffectwidget.sip
+%Include auto_generated/layertree/qgscustomlayerorderwidget.sip
+%Include auto_generated/layertree/qgslayertreeembeddedconfigwidget.sip
+%Include auto_generated/layertree/qgslayertreeembeddedwidgetregistry.sip
+%Include auto_generated/layertree/qgslayertreemapcanvasbridge.sip
+%Include auto_generated/layertree/qgslayertreeview.sip
+%Include auto_generated/layertree/qgslayertreeviewdefaultactions.sip
+%Include auto_generated/layertree/qgslayertreeviewindicator.sip
+%Include auto_generated/layout/qgslayoutcombobox.sip
+%Include auto_generated/layout/qgslayoutcustomdrophandler.sip
+%Include auto_generated/layout/qgslayoutdesignerinterface.sip
+%Include auto_generated/layout/qgslayoutitemcombobox.sip
+%Include auto_generated/layout/qgslayoutitemguiregistry.sip
+%Include auto_generated/layout/qgslayoutitemwidget.sip
+%Include auto_generated/layout/qgslayoutnewitempropertiesdialog.sip
+%Include auto_generated/layout/qgslayoutruler.sip
+%Include auto_generated/layout/qgslayoutunitscombobox.sip
+%Include auto_generated/layout/qgslayoutview.sip
+%Include auto_generated/layout/qgslayoutviewmouseevent.sip
+%Include auto_generated/layout/qgslayoutviewrubberband.sip
+%Include auto_generated/layout/qgslayoutviewtool.sip
+%Include auto_generated/layout/qgslayoutviewtooladditem.sip
+%Include auto_generated/layout/qgslayoutviewtooladdnodeitem.sip
+%Include auto_generated/layout/qgslayoutviewtooleditnodes.sip
+%Include auto_generated/layout/qgslayoutviewtoolmoveitemcontent.sip
+%Include auto_generated/layout/qgslayoutviewtoolpan.sip
+%Include auto_generated/layout/qgslayoutviewtoolselect.sip
+%Include auto_generated/layout/qgslayoutviewtooltemporarykeypan.sip
+%Include auto_generated/layout/qgslayoutviewtooltemporarykeyzoom.sip
+%Include auto_generated/layout/qgslayoutviewtooltemporarymousepan.sip
+%Include auto_generated/layout/qgslayoutviewtoolzoom.sip
+%Include auto_generated/locator/qgslocatorwidget.sip
+%Include auto_generated/processing/qgsprocessingalgorithmconfigurationwidget.sip
+%Include auto_generated/processing/qgsprocessingalgorithmdialogbase.sip
+%Include auto_generated/processing/qgsprocessinggui.sip
+%Include auto_generated/processing/qgsprocessingguiregistry.sip
+%Include auto_generated/processing/qgsprocessingmaplayercombobox.sip
+%Include auto_generated/processing/qgsprocessingmodelerparameterwidget.sip
+%Include auto_generated/processing/qgsprocessingmultipleselectiondialog.sip
+%Include auto_generated/processing/qgsprocessingparameterdefinitionwidget.sip
+%Include auto_generated/processing/qgsprocessingrecentalgorithmlog.sip
+%Include auto_generated/processing/qgsprocessingtoolboxmodel.sip
+%Include auto_generated/processing/qgsprocessingtoolboxtreeview.sip
+%Include auto_generated/processing/qgsprocessingwidgetwrapper.sip
 %Include auto_generated/raster/qgscolorrampshaderwidget.sip
+%Include auto_generated/raster/qgshillshaderendererwidget.sip
 %Include auto_generated/raster/qgsmultibandcolorrendererwidget.sip
 %Include auto_generated/raster/qgspalettedrendererwidget.sip
 %Include auto_generated/raster/qgsrasterbandcombobox.sip
 %Include auto_generated/raster/qgsrasterhistogramwidget.sip
 %Include auto_generated/raster/qgsrasterminmaxwidget.sip
+%Include auto_generated/raster/qgsrasterrendererwidget.sip
+%Include auto_generated/raster/qgsrastertransparencywidget.sip
+%Include auto_generated/raster/qgsrendererrasterpropertieswidget.sip
 %Include auto_generated/raster/qgssinglebandgrayrendererwidget.sip
 %Include auto_generated/raster/qgssinglebandpseudocolorrendererwidget.sip
-%Include auto_generated/raster/qgsrendererrasterpropertieswidget.sip
-%Include auto_generated/raster/qgsrastertransparencywidget.sip
-%Include auto_generated/raster/qgshillshaderendererwidget.sip
-%Include auto_generated/symbology/qgs25drendererwidget.sip
 %Include auto_generated/symbology/characterwidget.sip
+%Include auto_generated/symbology/qgs25drendererwidget.sip
 %Include auto_generated/symbology/qgsarrowsymbollayerwidget.sip
 %Include auto_generated/symbology/qgsbrushstylecombobox.sip
 %Include auto_generated/symbology/qgscategorizedsymbolrendererwidget.sip
@@ -270,83 +344,9 @@
 %Include auto_generated/symbology/qgssvgselectorwidget.sip
 %Include auto_generated/symbology/qgssymbollayerwidget.sip
 %Include auto_generated/symbology/qgssymbollevelsdialog.sip
-%Include auto_generated/symbology/qgssymbolslistwidget.sip
 %Include auto_generated/symbology/qgssymbolselectordialog.sip
+%Include auto_generated/symbology/qgssymbolslistwidget.sip
+%Include auto_generated/symbology/qgssymbolwidgetcontext.sip
 %Include auto_generated/symbology/qgsvectorfieldsymbollayerwidget.sip
-%Include auto_generated/attributetable/qgsattributetabledelegate.sip
-%Include auto_generated/attributetable/qgsattributetablefiltermodel.sip
-%Include auto_generated/attributetable/qgsattributetablemodel.sip
-%Include auto_generated/attributetable/qgsattributetableview.sip
-%Include auto_generated/attributetable/qgsdualview.sip
-%Include auto_generated/attributetable/qgsfeaturelistmodel.sip
-%Include auto_generated/attributetable/qgsfeaturelistview.sip
-%Include auto_generated/attributetable/qgsfeaturelistviewdelegate.sip
-%Include auto_generated/attributetable/qgsfeatureselectionmodel.sip
-%Include auto_generated/attributetable/qgsfieldconditionalformatwidget.sip
-%Include auto_generated/attributetable/qgsifeatureselectionmanager.sip
-%Include auto_generated/attributetable/qgsorganizetablecolumnsdialog.sip
-%Include auto_generated/effects/qgseffectdrawmodecombobox.sip
-%Include auto_generated/effects/qgseffectstackpropertieswidget.sip
-%Include auto_generated/effects/qgspainteffectpropertieswidget.sip
-%Include auto_generated/effects/qgspainteffectwidget.sip
-%Include auto_generated/editorwidgets/core/qgseditorconfigwidget.sip
-%Include auto_generated/editorwidgets/core/qgseditorwidgetregistry.sip
-%Include auto_generated/editorwidgets/core/qgseditorwidgetwrapper.sip
-%Include auto_generated/editorwidgets/core/qgssearchwidgetwrapper.sip
-%Include auto_generated/editorwidgets/core/qgswidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgscheckboxsearchwidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgsdatetimeedit.sip
-%Include auto_generated/editorwidgets/qgsdatetimesearchwidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgsdoublespinbox.sip
-%Include auto_generated/editorwidgets/qgshtmlwidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgsmultiedittoolbutton.sip
-%Include auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgsrelationreferencewidget.sip
-%Include auto_generated/editorwidgets/qgsrelationreferencewidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgsrelationaggregatesearchwidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgssearchwidgettoolbutton.sip
-%Include auto_generated/editorwidgets/qgsspinbox.sip
-%Include auto_generated/editorwidgets/qgsvaluemapsearchwidgetwrapper.sip
-%Include auto_generated/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip
-%Include auto_generated/layertree/qgscustomlayerorderwidget.sip
-%Include auto_generated/layertree/qgslayertreemapcanvasbridge.sip
-%Include auto_generated/layertree/qgslayertreeview.sip
-%Include auto_generated/layertree/qgslayertreeviewdefaultactions.sip
-%Include auto_generated/layertree/qgslayertreeviewindicator.sip
-%Include auto_generated/layout/qgslayoutcombobox.sip
-%Include auto_generated/layout/qgslayoutcustomdrophandler.sip
-%Include auto_generated/layout/qgslayoutdesignerinterface.sip
-%Include auto_generated/layout/qgslayoutitemcombobox.sip
-%Include auto_generated/layout/qgslayoutitemguiregistry.sip
-%Include auto_generated/layout/qgslayoutitemwidget.sip
-%Include auto_generated/layout/qgslayoutnewitempropertiesdialog.sip
-%Include auto_generated/layout/qgslayoutruler.sip
-%Include auto_generated/layout/qgslayoutunitscombobox.sip
-%Include auto_generated/layout/qgslayoutview.sip
-%Include auto_generated/layout/qgslayoutviewrubberband.sip
-%Include auto_generated/layout/qgslayoutviewtool.sip
-%Include auto_generated/layout/qgslayoutviewtooladditem.sip
-%Include auto_generated/layout/qgslayoutviewtooladdnodeitem.sip
-%Include auto_generated/layout/qgslayoutviewtooleditnodes.sip
-%Include auto_generated/layout/qgslayoutviewtoolmoveitemcontent.sip
-%Include auto_generated/layout/qgslayoutviewtoolpan.sip
-%Include auto_generated/layout/qgslayoutviewtoolselect.sip
-%Include auto_generated/layout/qgslayoutviewtooltemporarykeypan.sip
-%Include auto_generated/layout/qgslayoutviewtooltemporarykeyzoom.sip
-%Include auto_generated/layout/qgslayoutviewtooltemporarymousepan.sip
-%Include auto_generated/layout/qgslayoutviewtoolzoom.sip
-%Include auto_generated/locator/qgslocatorwidget.sip
-%Include auto_generated/processing/qgsprocessingalgorithmconfigurationwidget.sip
-%Include auto_generated/processing/qgsprocessingalgorithmdialogbase.sip
-%Include auto_generated/processing/qgsprocessingmaplayercombobox.sip
-%Include auto_generated/processing/qgsprocessingmodelerparameterwidget.sip
-%Include auto_generated/processing/qgsprocessingmultipleselectiondialog.sip
-%Include auto_generated/processing/qgsprocessingparameterdefinitionwidget.sip
-%Include auto_generated/processing/qgsprocessingrecentalgorithmlog.sip
-%Include auto_generated/processing/qgsprocessingtoolboxmodel.sip
-%Include auto_generated/processing/qgsprocessingtoolboxtreeview.sip
-%Include auto_generated/processing/qgsprocessingwidgetwrapper.sip
 %Include auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip
 %Include auto_generated/qgsadvanceddigitizingcanvasitem.sip
diff --git a/python/server/server_auto.sip b/python/server/server_auto.sip
index cdf276de62d..1fc69017a41 100644
--- a/python/server/server_auto.sip
+++ b/python/server/server_auto.sip
@@ -1,15 +1,15 @@
 // Include auto-generated SIP files
-%Include auto_generated/qgsservicemodule.sip
-%Include auto_generated/qgsserverapi.sip
-%Include auto_generated/qgsserverogcapi.sip
-%Include auto_generated/qgsserverogcapihandler.sip
-%Include auto_generated/qgsserverapicontext.sip
-%Include auto_generated/qgsserverquerystringparameter.sip
 %Include auto_generated/qgscapabilitiescache.sip
 %Include auto_generated/qgsconfigcache.sip
+%Include auto_generated/qgsserverapi.sip
+%Include auto_generated/qgsserverapicontext.sip
 %Include auto_generated/qgsserverlogger.sip
-%Include auto_generated/qgsserversettings.sip
+%Include auto_generated/qgsserverogcapi.sip
+%Include auto_generated/qgsserverogcapihandler.sip
 %Include auto_generated/qgsserverparameters.sip
+%Include auto_generated/qgsserverquerystringparameter.sip
+%Include auto_generated/qgsserversettings.sip
+%Include auto_generated/qgsservicemodule.sip
 %Include auto_generated/qgsbufferserverrequest.sip
 %Include auto_generated/qgsbufferserverresponse.sip
 %Include auto_generated/qgsfcgiserverrequest.sip
diff --git a/src/analysis/CMakeLists.txt b/src/analysis/CMakeLists.txt
index e03c4c78337..08efd9b2935 100644
--- a/src/analysis/CMakeLists.txt
+++ b/src/analysis/CMakeLists.txt
@@ -202,6 +202,102 @@ SET(QGIS_ANALYSIS_SRCS
   vector/geometry_checker/qgsvectorlayerfeaturepool.cpp
 )
 
+SET(QGIS_ANALYSIS_HDRS
+  qgsanalysis.h
+
+  interpolation/Bezier3D.h
+  interpolation/CloughTocherInterpolator.h
+  interpolation/DualEdgeTriangulation.h
+  interpolation/HalfEdge.h
+  interpolation/LinTriangleInterpolator.h
+  interpolation/MathUtils.h
+  interpolation/NormVecDecorator.h
+  interpolation/ParametricLine.h
+  interpolation/TriDecorator.h
+  interpolation/TriangleInterpolator.h
+  interpolation/Triangulation.h
+  interpolation/Vector3D.h
+  interpolation/qgsgridfilewriter.h
+  interpolation/qgsidwinterpolator.h
+  interpolation/qgsinterpolator.h
+  interpolation/qgstininterpolator.h
+
+  mesh/qgsmeshcalcnode.h
+  mesh/qgsmeshcalculator.h
+  mesh/qgsmeshcalcutils.h
+  mesh/qgsmeshcontours.h
+
+  network/qgsgraph.h
+  network/qgsgraphanalyzer.h
+  network/qgsgraphbuilder.h
+  network/qgsgraphbuilderinterface.h
+  network/qgsgraphdirector.h
+  network/qgsnetworkdistancestrategy.h
+  network/qgsnetworkspeedstrategy.h
+  network/qgsnetworkstrategy.h
+  network/qgsvectorlayerdirector.h
+
+  processing/qgsalgorithmfiledownloader.h
+  processing/qgsalgorithmimportphotos.h
+  processing/qgsnativealgorithms.h
+  processing/qgsprojectstylealgorithms.h
+  processing/qgsreclassifyutils.h
+
+  raster/qgsalignraster.h
+  raster/qgsaspectfilter.h
+  raster/qgsderivativefilter.h
+  raster/qgsexiftools.h
+  raster/qgshillshadefilter.h
+  raster/qgskde.h
+  raster/qgsninecellfilter.h
+  raster/qgsrastercalcnode.h
+  raster/qgsrastercalculator.h
+  raster/qgsrastermatrix.h
+  raster/qgsrelief.h
+  raster/qgsruggednessfilter.h
+  raster/qgsslopefilter.h
+  raster/qgstotalcurvaturefilter.h
+
+  vector/geometry_checker/qgsfeaturepool.h
+  vector/geometry_checker/qgsgeometryanglecheck.h
+  vector/geometry_checker/qgsgeometryareacheck.h
+  vector/geometry_checker/qgsgeometrycheck.h
+  vector/geometry_checker/qgsgeometrycheckcontext.h
+  vector/geometry_checker/qgsgeometrychecker.h
+  vector/geometry_checker/qgsgeometrycheckerror.h
+  vector/geometry_checker/qgsgeometrycheckerutils.h
+  vector/geometry_checker/qgsgeometrycheckfactory.h
+  vector/geometry_checker/qgsgeometrycheckregistry.h
+  vector/geometry_checker/qgsgeometrycontainedcheck.h
+  vector/geometry_checker/qgsgeometrydanglecheck.h
+  vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h
+  vector/geometry_checker/qgsgeometryduplicatecheck.h
+  vector/geometry_checker/qgsgeometryduplicatenodescheck.h
+  vector/geometry_checker/qgsgeometryfollowboundariescheck.h
+  vector/geometry_checker/qgsgeometrygapcheck.h
+  vector/geometry_checker/qgsgeometryholecheck.h
+  vector/geometry_checker/qgsgeometryisvalidcheck.h
+  vector/geometry_checker/qgsgeometrylineintersectioncheck.h
+  vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.h
+  vector/geometry_checker/qgsgeometrymissingvertexcheck.h
+  vector/geometry_checker/qgsgeometrymultipartcheck.h
+  vector/geometry_checker/qgsgeometryoverlapcheck.h
+  vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.h
+  vector/geometry_checker/qgsgeometrypointinpolygoncheck.h
+  vector/geometry_checker/qgsgeometrysegmentlengthcheck.h
+  vector/geometry_checker/qgsgeometryselfcontactcheck.h
+  vector/geometry_checker/qgsgeometryselfintersectioncheck.h
+  vector/geometry_checker/qgsgeometrysliverpolygoncheck.h
+  vector/geometry_checker/qgsgeometrytypecheck.h
+  vector/geometry_checker/qgssinglegeometrycheck.h
+  vector/geometry_checker/qgsvectordataproviderfeaturepool.h
+  vector/geometry_checker/qgsvectorlayerfeaturepool.h
+
+  vector/qgsgeometrysnapper.h
+  vector/qgsgeometrysnappersinglesource.h
+  vector/qgszonalstatistics.h
+)
+
 FIND_PACKAGE(EXIV2 REQUIRED)
 
 INCLUDE_DIRECTORIES(SYSTEM ${SPATIALITE_INCLUDE_DIR})
@@ -244,98 +340,6 @@ ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
 # install headers
 
-SET(QGIS_ANALYSIS_HDRS
-  qgsanalysis.h
-
-  processing/qgsalgorithmimportphotos.h
-  processing/qgsreclassifyutils.h
-
-  raster/qgsalignraster.h
-  raster/qgsaspectfilter.h
-  raster/qgsderivativefilter.h
-  raster/qgsexiftools.h
-  raster/qgshillshadefilter.h
-  raster/qgskde.h
-  raster/qgsninecellfilter.h
-  raster/qgsrastercalculator.h
-  raster/qgsrelief.h
-  raster/qgsruggednessfilter.h
-  raster/qgsslopefilter.h
-  raster/qgsrastermatrix.h
-  raster/qgsrastercalcnode.h
-  raster/qgstotalcurvaturefilter.h
-	
-  mesh/qgsmeshcalcnode.h
-  mesh/qgsmeshcalculator.h
-  mesh/qgsmeshcalcutils.h
-  mesh/qgsmeshcontours.h
-
-  vector/qgsgeometrysnapper.h
-  vector/qgsgeometrysnappersinglesource.h
-  vector/qgszonalstatistics.h
-  vector/geometry_checker/qgsgeometrycheckerutils.h
-  vector/geometry_checker/qgsfeaturepool.h
-  vector/geometry_checker/qgsvectordataproviderfeaturepool.h
-
-  interpolation/qgsinterpolator.h
-  interpolation/qgsgridfilewriter.h
-  interpolation/qgsidwinterpolator.h
-  interpolation/qgstininterpolator.h
-  interpolation/Bezier3D.h
-  interpolation/ParametricLine.h
-  interpolation/CloughTocherInterpolator.h
-  interpolation/TriangleInterpolator.h
-  interpolation/Vector3D.h
-  interpolation/DualEdgeTriangulation.h
-  interpolation/MathUtils.h
-  interpolation/TriDecorator.h
-  interpolation/Triangulation.h
-  interpolation/HalfEdge.h
-  interpolation/LinTriangleInterpolator.h
-  interpolation/NormVecDecorator.h
-
-  network/qgsgraph.h
-  network/qgsgraphbuilderinterface.h
-  network/qgsgraphbuilder.h
-  network/qgsgraphdirector.h
-  network/qgsnetworkstrategy.h
-  network/qgsnetworkspeedstrategy.h
-  network/qgsnetworkdistancestrategy.h
-  network/qgsgraphanalyzer.h
-  network/qgsvectorlayerdirector.h
-
-  processing/qgsprojectstylealgorithms.h
-
-  vector/geometry_checker/qgsgeometryanglecheck.h
-  vector/geometry_checker/qgsgeometryareacheck.h
-  vector/geometry_checker/qgsgeometrychecker.h
-  vector/geometry_checker/qgsgeometrycheckerror.h
-  vector/geometry_checker/qgsgeometrycheckcontext.h
-  vector/geometry_checker/qgssinglegeometrycheck.h
-  vector/geometry_checker/qgsgeometrycontainedcheck.h
-  vector/geometry_checker/qgsgeometrydanglecheck.h
-  vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.h
-  vector/geometry_checker/qgsgeometryduplicatecheck.h
-  vector/geometry_checker/qgsgeometryduplicatenodescheck.h
-  vector/geometry_checker/qgsgeometryfollowboundariescheck.h
-  vector/geometry_checker/qgsgeometryholecheck.h
-  vector/geometry_checker/qgsgeometrylineintersectioncheck.h
-  vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.h
-  vector/geometry_checker/qgsgeometrymultipartcheck.h
-  vector/geometry_checker/qgsgeometryoverlapcheck.h
-  vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.h
-  vector/geometry_checker/qgsgeometrypointinpolygoncheck.h
-  vector/geometry_checker/qgsgeometrysegmentlengthcheck.h
-  vector/geometry_checker/qgsgeometryselfcontactcheck.h
-  vector/geometry_checker/qgsgeometryselfintersectioncheck.h
-  vector/geometry_checker/qgsgeometrysliverpolygoncheck.h
-  vector/geometry_checker/qgsgeometrytypecheck.h
-  vector/geometry_checker/qgssinglegeometrycheck.h
-  vector/geometry_checker/qgsgeometryisvalidcheck.h
-  vector/geometry_checker/qgsgeometrycheckregistry.h
-  vector/geometry_checker/qgsgeometrycheckfactory.h
-)
-
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/src/core/
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 52dfb138a1a..718b0c4ec11 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -643,36 +643,35 @@ ELSE(NOT MSVC)
     PROPERTIES COMPILE_FLAGS -wd4702)
 ENDIF(NOT MSVC)
 
-# install headers
-# install qgsconfig.h and plugin.h here so they can get into
-# the OS X framework target
-
 SET(QGIS_CORE_HDRS
   ${CMAKE_SOURCE_DIR}/external/nlohmann/json_fwd.hpp
   ${CMAKE_BINARY_DIR}/qgsconfig.h
   ../plugins/qgisplugin.h
 
-  expression/qgsexpression.h
-  expression/qgsexpressioncontextutils.h
-  expression/qgsexpressionnode.h
-  expression/qgsexpressionnodeimpl.h
-  expression/qgsexpressionfunction.h
-
-  qgstessellator.h
-
+  qgis.h
   qgis_sip.h
+  qgsabstractcontentcache.h
+  qgsabstractdatabaseproviderconnection.h
   qgsabstractgeopdfexporter.h
   qgsabstractproviderconnection.h
-  qgsabstractdatabaseproviderconnection.h
   qgsaction.h
-  qgsactionscope.h
   qgsactionmanager.h
+  qgsactionscope.h
+  qgsactionscoperegistry.h
   qgsaggregatecalculator.h
-  qgspostgresstringutils.h
+  qgsanimatedicon.h
+  qgsapplication.h
+  qgsarchive.h
+  qgsattributeeditorelement.h
   qgsattributes.h
   qgsattributetableconfig.h
-  qgsattributeeditorelement.h
+  qgsauxiliarystorage.h
   qgsbearingutils.h
+  qgsblockingnetworkrequest.h
+  qgsbookmarkmanager.h
+  qgsbookmarkmodel.h
+  qgsbrowsermodel.h
+  qgsbrowserproxymodel.h
   qgscachedfeatureiterator.h
   qgscacheindex.h
   qgscacheindexfeatureid.h
@@ -681,17 +680,25 @@ SET(QGIS_CORE_HDRS
   qgscolorramp.h
   qgscolorscheme.h
   qgscolorschemeregistry.h
+  qgsconditionalstyle.h
   qgsconnectionpool.h
   qgscoordinateformatter.h
+  qgscoordinatereferencesystem.h
   qgscoordinatetransform.h
   qgscoordinatetransformcontext.h
+  qgscoordinateutils.h
+  qgscredentials.h
   qgsdartmeasurement.h
   qgsdatadefinedsizelegend.h
+  qgsdataitem.h
   qgsdataitemprovider.h
   qgsdataitemproviderregistry.h
+  qgsdataprovider.h
+  qgsdatasourceuri.h
   qgsdatetimestatisticalsummary.h
   qgsdatumtransform.h
   qgsdbfilterproxymodel.h
+  qgsdefaultvalue.h
   qgsdiagramrenderer.h
   qgsdistancearea.h
   qgseditformconfig.h
@@ -703,6 +710,8 @@ SET(QGIS_CORE_HDRS
   qgsexpressioncontextgenerator.h
   qgsexpressioncontextscopegenerator.h
   qgsexpressionfieldbuffer.h
+  qgsfeature.h
+  qgsfeaturefiltermodel.h
   qgsfeaturefilterprovider.h
   qgsfeatureid.h
   qgsfeatureiterator.h
@@ -711,43 +720,80 @@ SET(QGIS_CORE_HDRS
   qgsfeaturesource.h
   qgsfeaturestore.h
   qgsfeedback.h
+  qgsfield.h
+  qgsfieldconstraints.h
   qgsfieldformatter.h
+  qgsfieldformatterregistry.h
+  qgsfieldmodel.h
+  qgsfieldproxymodel.h
   qgsfields.h
+  qgsfiledownloader.h
   qgsfileutils.h
   qgsfontutils.h
-  qgsgeometrysimplifier.h
   qgsgdalutils.h
+  qgsgeometryoptions.h
+  qgsgeometrysimplifier.h
+  qgsgeometryvalidator.h
+  qgsgml.h
+  qgsgmlschema.h
   qgshistogram.h
   qgshstoreutils.h
   qgshtmlutils.h
+  qgsimagecache.h
   qgsindexedfeature.h
   qgsinterval.h
   qgsjsonutils.h
-  qgslayerdefinition.h
   qgslabelfeature.h
   qgslabelingengine.h
   qgslabelingenginesettings.h
   qgslabelsearchtree.h
+  qgslayerdefinition.h
   qgslegendrenderer.h
   qgslegendsettings.h
   qgslegendstyle.h
+  qgslocalec.h
   qgslogger.h
   qgsmapdecoration.h
-  qgsmaplayerref.h
   qgsmaphittest.h
+  qgsmaplayer.h
   qgsmaplayerdependency.h
+  qgsmaplayerlegend.h
+  qgsmaplayermodel.h
+  qgsmaplayerproxymodel.h
+  qgsmaplayerref.h
   qgsmaplayerrenderer.h
+  qgsmaplayerstore.h
   qgsmaplayerstyle.h
+  qgsmaplayerstylemanager.h
+  qgsmaprenderercache.h
+  qgsmaprenderercustompainterjob.h
+  qgsmaprendererjob.h
+  qgsmaprendererparalleljob.h
+  qgsmaprenderersequentialjob.h
+  qgsmaprendererstagedrenderjob.h
+  qgsmaprenderertask.h
   qgsmapsettings.h
   qgsmapsettingsutils.h
+  qgsmapthemecollection.h
   qgsmaptopixel.h
   qgsmaptopixelgeometrysimplifier.h
   qgsmapunitscale.h
   qgsmargins.h
+  qgsmessagelog.h
+  qgsmessageoutput.h
   qgsmimedatautils.h
   qgsmultirenderchecker.h
+  qgsnetworkaccessmanager.h
+  qgsnetworkcontentfetcher.h
+  qgsnetworkcontentfetcherregistry.h
+  qgsnetworkcontentfetchertask.h
+  qgsnetworkdiskcache.h
   qgsnetworkreply.h
+  qgsnetworkreplyparser.h
+  qgsnewsfeedmodel.h
+  qgsnewsfeedparser.h
   qgsobjectcustomproperties.h
+  qgsofflineediting.h
   qgsogcutils.h
   qgsogrutils.h
   qgsoptional.h
@@ -757,8 +803,13 @@ SET(QGIS_CORE_HDRS
   qgspainting.h
   qgspallabeling.h
   qgspathresolver.h
+  qgspluginlayer.h
   qgspluginlayerregistry.h
   qgspointlocator.h
+  qgspointlocatorinittask.h
+  qgspointxy.h
+  qgspostgresstringutils.h
+  qgsproject.h
   qgsprojectbadlayerhandler.h
   qgsprojectfiletransform.h
   qgsprojectproperty.h
@@ -766,74 +817,101 @@ SET(QGIS_CORE_HDRS
   qgsprojectstorageregistry.h
   qgsprojecttranslator.h
   qgsprojectversion.h
+  qgsprojectviewsettings.h
   qgsprojutils.h
   qgsproperty.h
   qgspropertycollection.h
   qgspropertytransformer.h
   qgsprovidermetadata.h
   qgsproviderregistry.h
+  qgsproxyprogresstask.h
   qgspythonrunner.h
   qgsrange.h
   qgsreadwritecontext.h
   qgsreadwritelocker.h
+  qgsrelation.h
+  qgsrelationmanager.h
   qgsrenderchecker.h
   qgsrendercontext.h
   qgsrenderedfeaturehandlerinterface.h
   qgsrulebasedlabeling.h
+  qgsrunprocess.h
   qgsruntimeprofiler.h
   qgsscalecalculator.h
   qgsscaleutils.h
+  qgssettings.h
   qgssimplifymethod.h
+  qgssnappingconfig.h
   qgssnappingutils.h
   qgsspatialindex.h
   qgsspatialindexkdbush.h
   qgsspatialindexkdbushdata.h
   qgsspatialiteutils.h
-  qgssqlstatement.h
-  qgssqliteutils.h
   qgssqlexpressioncompiler.h
+  qgssqliteutils.h
   qgssqlstatement.h
   qgsstatisticalsummary.h
+  qgsstoredexpressionmanager.h
   qgsstringstatisticalsummary.h
   qgsstringutils.h
+  qgstaskmanager.h
+  qgstessellator.h
+  qgstestutils.h
   qgstextlabelfeature.h
   qgstextrenderer.h
   qgsthreadingutils.h
   qgstilecache.h
+  qgstolerance.h
   qgstracer.h
+  qgstrackedvectorlayertools.h
+  qgstransaction.h
+  qgstransactiongroup.h
   qgstranslationcontext.h
-  qobjectuniqueptr.h
-  qgswebpage.h
-  qgswebview.h
-  qgssettings.h
-
-
+  qgsunittypes.h
+  qgsuserprofilemanager.h
+  qgsvector.h
+  qgsvector3d.h
   qgsvectordataprovider.h
-  qgsvectorlayercache.h
   qgsvectorfilewriter.h
+  qgsvectorfilewritertask.h
+  qgsvectorlayer.h
+  qgsvectorlayercache.h
   qgsvectorlayerdiagramprovider.h
+  qgsvectorlayereditbuffer.h
+  qgsvectorlayereditpassthrough.h
   qgsvectorlayereditutils.h
-  qgsvectorlayerfeatureiterator.h
   qgsvectorlayerexporter.h
+  qgsvectorlayerfeaturecounter.h
+  qgsvectorlayerfeatureiterator.h
+  qgsvectorlayerjoinbuffer.h
   qgsvectorlayerjoininfo.h
-  qgsvectorlayerlabelprovider.h
   qgsvectorlayerlabeling.h
+  qgsvectorlayerlabelprovider.h
+  qgsvectorlayerrenderer.h
+  qgsvectorlayerserverproperties.h
+  qgsvectorlayertools.h
   qgsvectorlayerundocommand.h
   qgsvectorlayerundopassthroughcommand.h
   qgsvectorlayerutils.h
-  qgsvectorlayerrenderer.h
+  qgsvectorsimplifymethod.h
   qgsvirtuallayerdefinition.h
   qgsvirtuallayerdefinitionutils.h
-  qgsmapthemecollection.h
+  qgsvirtuallayertask.h
+  qgswebpage.h
+  qgswebview.h
   qgsxmlutils.h
-  qgsarchive.h
-  qgstestutils.h
   qgsziputils.h
-  qgsvector.h
-  qgsvector3d.h
-  qgslocalec.h
+  qobjectuniqueptr.h
 
+  3d/qgs3drendererregistry.h
+  3d/qgsabstract3drenderer.h
+
+  annotations/qgsannotation.h
+  annotations/qgsannotationmanager.h
   annotations/qgsannotationregistry.h
+  annotations/qgshtmlannotation.h
+  annotations/qgssvgannotation.h
+  annotations/qgstextannotation.h
 
   auth/qgsauthcertutils.h
   auth/qgsauthconfig.h
@@ -846,177 +924,61 @@ SET(QGIS_CORE_HDRS
   callouts/qgscallout.h
   callouts/qgscalloutsregistry.h
 
-  classification/qgsclassificationmethodregistry.h
-  classification/qgsclassificationmethod.h
   classification/qgsclassificationcustom.h
   classification/qgsclassificationequalinterval.h
+  classification/qgsclassificationjenks.h
+  classification/qgsclassificationlogarithmic.h
+  classification/qgsclassificationmethod.h
+  classification/qgsclassificationmethodregistry.h
   classification/qgsclassificationprettybreaks.h
   classification/qgsclassificationquantile.h
-  classification/qgsclassificationjenks.h
   classification/qgsclassificationstandarddeviation.h
-  classification/qgsclassificationlogarithmic.h
 
   diagram/qgsdiagram.h
+  diagram/qgshistogramdiagram.h
   diagram/qgspiediagram.h
   diagram/qgstextdiagram.h
-  diagram/qgshistogramdiagram.h
 
   dxf/qgsdxfexport.h
 
+  effects/qgsblureffect.h
+  effects/qgscoloreffect.h
+  effects/qgseffectstack.h
+  effects/qgsgloweffect.h
   effects/qgsimageoperation.h
   effects/qgspainteffect.h
-  effects/qgseffectstack.h
-  effects/qgsblureffect.h
-  effects/qgsshadoweffect.h
-  effects/qgsgloweffect.h
   effects/qgspainteffectregistry.h
+  effects/qgsshadoweffect.h
   effects/qgstransformeffect.h
-  effects/qgscoloreffect.h
 
-  layout/qgsabstractlayoutiterator.h
-  layout/qgsabstractreportsection.h
-  layout/qgsmasterlayoutinterface.h
-  layout/qgslayoutaligner.h
-  layout/qgslayoutexporter.h
-  layout/qgslayoutgeopdfexporter.h
-  layout/qgslayoutgridsettings.h
-  layout/qgslayoutitemundocommand.h
-  layout/qgslayoutmeasurement.h
-  layout/qgslayoutmeasurementconverter.h
-  layout/qgslayoutmultiframeundocommand.h
-  layout/qgspagesizeregistry.h
-  layout/qgslayoutpoint.h
-  layout/qgslayoutserializableobject.h
-  layout/qgslayoutsize.h
-  layout/qgslayoutsnapper.h
-  layout/qgslayoutundocommand.h
-  layout/qgslayoututils.h
-  layout/qgsreportsectionfieldgroup.h
-  layout/qgsreportsectionlayout.h
-  layout/qgscompositionconverter.h
+  expression/qgsexpression.h
+  expression/qgsexpressioncontextutils.h
+  expression/qgsexpressionfunction.h
+  expression/qgsexpressionnode.h
+  expression/qgsexpressionnodeimpl.h
 
-  metadata/qgsabstractmetadatabase.h
-  metadata/qgslayermetadata.h
-  metadata/qgslayermetadatavalidator.h
-  metadata/qgslayermetadataformatter.h
-  metadata/qgsprojectmetadata.h
+  fieldformatter/qgscheckboxfieldformatter.h
+  fieldformatter/qgsdatetimefieldformatter.h
+  fieldformatter/qgsfallbackfieldformatter.h
+  fieldformatter/qgskeyvaluefieldformatter.h
+  fieldformatter/qgslistfieldformatter.h
+  fieldformatter/qgsrangefieldformatter.h
+  fieldformatter/qgsrelationreferencefieldformatter.h
+  fieldformatter/qgsvaluemapfieldformatter.h
+  fieldformatter/qgsvaluerelationfieldformatter.h
 
-  processing/qgsprocessing.h
-  processing/qgsprocessingalgorithm.h
-  processing/qgsprocessingcontext.h
-  processing/qgsprocessingoutputs.h
-  processing/qgsprocessingparameters.h
-  processing/qgsprocessingparametertype.h
-  processing/qgsprocessingparametertypeimpl.h
-  processing/qgsprocessingutils.h
-  processing/models/qgsprocessingmodelalgorithm.h
-  processing/models/qgsprocessingmodelchildalgorithm.h
-  processing/models/qgsprocessingmodelchildparametersource.h
-  processing/models/qgsprocessingmodelcomponent.h
-  processing/models/qgsprocessingmodeloutput.h
-  processing/models/qgsprocessingmodelparameter.h
-
-  providers/memory/qgsmemoryfeatureiterator.h
-  providers/memory/qgsmemoryproviderutils.h
-
-  providers/ogr/qgsgeopackageprojectstorage.h
-  providers/ogr/qgsgeopackageproviderconnection.h
-  providers/ogr/qgsogrprovider.h
-
-  raster/qgsbilinearrasterresampler.h
-  raster/qgsbrightnesscontrastfilter.h
-  raster/qgscliptominmaxenhancement.h
-  raster/qgscolorrampshader.h
-  raster/qgscontrastenhancement.h
-  raster/qgscontrastenhancementfunction.h
-  raster/qgscubicrasterresampler.h
-  raster/qgshuesaturationfilter.h
-  raster/qgslinearminmaxenhancement.h
-  raster/qgslinearminmaxenhancementwithclip.h
-  raster/qgsmultibandcolorrenderer.h
-  raster/qgspalettedrasterrenderer.h
-  raster/qgsraster.h
-  raster/qgsrasterbandstats.h
-  raster/qgsrasterblock.h
-  raster/qgsrasterchecker.h
-  raster/qgsrasterdrawer.h
-  raster/qgsrasterfilewriter.h
-  raster/qgsrasterhistogram.h
-  raster/qgsrasteridentifyresult.h
-  raster/qgsrasteriterator.h
-  raster/qgsrasterminmaxorigin.h
-  raster/qgsrasternuller.h
-  raster/qgsrasterpipe.h
-  raster/qgsrasterpyramid.h
-  raster/qgsrasterrange.h
-  raster/qgsrasterrenderer.h
-  raster/qgsrasterresamplefilter.h
-  raster/qgsrasterresampler.h
-  raster/qgsrastershader.h
-  raster/qgsrastershaderfunction.h
-  raster/qgsrastertransparency.h
-  raster/qgsrasterviewport.h
-  raster/qgssinglebandcolordatarenderer.h
-  raster/qgssinglebandgrayrenderer.h
-  raster/qgssinglebandpseudocolorrenderer.h
-  raster/qgshillshaderenderer.h
-
-  mesh/qgsmeshlayerinterpolator.h
-  mesh/qgsmeshlayerrenderer.h
-  mesh/qgsmeshlayerutils.h
-  mesh/qgsmeshrenderersettings.h
-  mesh/qgsmeshspatialindex.h
-  mesh/qgsmeshvectorrenderer.h
-  mesh/qgstriangularmesh.h
-  mesh/qgsmeshtimesettings.h
-
-  scalebar/qgsdoubleboxscalebarrenderer.h
-  scalebar/qgsnumericscalebarrenderer.h
-  scalebar/qgsscalebarsettings.h
-  scalebar/qgsscalebarrenderer.h
-  scalebar/qgssingleboxscalebarrenderer.h
-  scalebar/qgsticksscalebarrenderer.h
-
-  symbology/qgs25drenderer.h
-  symbology/qgsarrowsymbollayer.h
-  symbology/qgscategorizedsymbolrenderer.h
-  symbology/qgscolorbrewerpalette.h
-  symbology/qgsellipsesymbollayer.h
-  symbology/qgsfillsymbollayer.h
-  symbology/qgsgraduatedsymbolrenderer.h
-  symbology/qgslegendsymbolitem.h
-  symbology/qgslinesymbollayer.h
-  symbology/qgsmarkersymbollayer.h
-  symbology/qgspointclusterrenderer.h
-  symbology/qgspointdisplacementrenderer.h
-  symbology/qgspointdistancerenderer.h
-  symbology/qgsrenderer.h
-  symbology/qgsrendererrange.h
-  symbology/qgsrendererregistry.h
-  symbology/qgsrulebasedrenderer.h
-  symbology/qgssinglesymbolrenderer.h
-  symbology/qgsheatmaprenderer.h
-  symbology/qgsinvertedpolygonrenderer.h
-  symbology/qgsnullsymbolrenderer.h
-  symbology/qgsstyleentityvisitor.h
-  symbology/qgssymbollayer.h
-  symbology/qgssymbollayerregistry.h
-  symbology/qgssymbollayerutils.h
-  symbology/qgssymbol.h
-  symbology/qgsvectorfieldsymbollayer.h
-  symbology/qgsgeometrygeneratorsymbollayer.h
-
-  layertree/qgslayertreeutils.h
-
-  locator/qgslocatorcontext.h
+  geocms/geonode/qgsgeonodeconnection.h
+  geocms/geonode/qgsgeonoderequest.h
 
+  geometry/qgsabstractgeometry.h
   geometry/qgsbox3d.h
-  geometry/qgscircularstring.h
   geometry/qgscircle.h
+  geometry/qgscircularstring.h
   geometry/qgscompoundcurve.h
-  geometry/qgscurvepolygon.h
   geometry/qgscurve.h
+  geometry/qgscurvepolygon.h
   geometry/qgsellipse.h
+  geometry/qgsgeometry.h
   geometry/qgsgeometrycollection.h
   geometry/qgsgeometryeditutils.h
   geometry/qgsgeometryengine.h
@@ -1031,38 +993,271 @@ SET(QGIS_CORE_HDRS
   geometry/qgsmultipoint.h
   geometry/qgsmultipolygon.h
   geometry/qgsmultisurface.h
+  geometry/qgspoint.h
   geometry/qgspolygon.h
   geometry/qgsquadrilateral.h
   geometry/qgsrectangle.h
   geometry/qgsreferencedgeometry.h
   geometry/qgsregularpolygon.h
-  geometry/qgstriangle.h
   geometry/qgssurface.h
+  geometry/qgstriangle.h
   geometry/qgswkbptr.h
+  geometry/qgswkbtypes.h
 
-  3d/qgs3drendererregistry.h
-  3d/qgsabstract3drenderer.h
+  gps/qgsgpsconnection.h
+  gps/qgsgpsdconnection.h
+  gps/qgsgpsdetector.h
+  gps/qgsnmeaconnection.h
 
-  fieldformatter/qgscheckboxfieldformatter.h
-  fieldformatter/qgsrangefieldformatter.h
-  fieldformatter/qgsdatetimefieldformatter.h
-  fieldformatter/qgsfallbackfieldformatter.h
-  fieldformatter/qgskeyvaluefieldformatter.h
-  fieldformatter/qgslistfieldformatter.h
-  fieldformatter/qgsrelationreferencefieldformatter.h
-  fieldformatter/qgsvaluemapfieldformatter.h
-  fieldformatter/qgsvaluerelationfieldformatter.h
+  layertree/qgslayertree.h
+  layertree/qgslayertreegroup.h
+  layertree/qgslayertreelayer.h
+  layertree/qgslayertreemodel.h
+  layertree/qgslayertreemodellegendnode.h
+  layertree/qgslayertreenode.h
+  layertree/qgslayertreeregistrybridge.h
+  layertree/qgslayertreeutils.h
+  layout/qgsabstractlayoutiterator.h
+  layout/qgsabstractreportsection.h
+  layout/qgscompositionconverter.h
+  layout/qgslayout.h
+  layout/qgslayoutaligner.h
+  layout/qgslayoutatlas.h
+  layout/qgslayouteffect.h
+  layout/qgslayoutexporter.h
+  layout/qgslayoutframe.h
+  layout/qgslayoutgeopdfexporter.h
+  layout/qgslayoutgridsettings.h
+  layout/qgslayoutguidecollection.h
+  layout/qgslayoutitem.h
+  layout/qgslayoutitemattributetable.h
+  layout/qgslayoutitemgroup.h
+  layout/qgslayoutitemgroupundocommand.h
+  layout/qgslayoutitemhtml.h
+  layout/qgslayoutitemlabel.h
+  layout/qgslayoutitemlegend.h
+  layout/qgslayoutitemmap.h
+  layout/qgslayoutitemmapgrid.h
+  layout/qgslayoutitemmapitem.h
+  layout/qgslayoutitemmapoverview.h
+  layout/qgslayoutitemnodeitem.h
+  layout/qgslayoutitempage.h
+  layout/qgslayoutitempicture.h
+  layout/qgslayoutitempolygon.h
+  layout/qgslayoutitempolyline.h
+  layout/qgslayoutitemregistry.h
+  layout/qgslayoutitemscalebar.h
+  layout/qgslayoutitemshape.h
+  layout/qgslayoutitemtexttable.h
+  layout/qgslayoutitemundocommand.h
+  layout/qgslayoutmanager.h
+  layout/qgslayoutmeasurement.h
+  layout/qgslayoutmeasurementconverter.h
+  layout/qgslayoutmodel.h
+  layout/qgslayoutmultiframe.h
+  layout/qgslayoutmultiframeundocommand.h
+  layout/qgslayoutobject.h
+  layout/qgslayoutpagecollection.h
+  layout/qgslayoutpoint.h
+  layout/qgslayoutrendercontext.h
+  layout/qgslayoutreportcontext.h
+  layout/qgslayoutserializableobject.h
+  layout/qgslayoutsize.h
+  layout/qgslayoutsnapper.h
+  layout/qgslayouttable.h
+  layout/qgslayouttablecolumn.h
+  layout/qgslayoutundocommand.h
+  layout/qgslayoutundostack.h
+  layout/qgslayoututils.h
+  layout/qgsmasterlayoutinterface.h
+  layout/qgspagesizeregistry.h
+  layout/qgsprintlayout.h
+  layout/qgsreport.h
+  layout/qgsreportsectionfieldgroup.h
+  layout/qgsreportsectionlayout.h
 
-  geocms/geonode/qgsgeonodeconnection.h
+  locator/qgslocator.h
+  locator/qgslocatorcontext.h
+  locator/qgslocatorfilter.h
+  locator/qgslocatormodel.h
+  locator/qgslocatormodelbridge.h
 
+  mesh/qgsmeshdataprovider.h
+  mesh/qgsmeshlayer.h
+  mesh/qgsmeshlayerinterpolator.h
+  mesh/qgsmeshlayerrenderer.h
+  mesh/qgsmeshlayerutils.h
+  mesh/qgsmeshrenderersettings.h
+  mesh/qgsmeshspatialindex.h
+  mesh/qgsmeshtimesettings.h
+  mesh/qgsmeshvectorrenderer.h
+  mesh/qgstriangularmesh.h
+
+  metadata/qgsabstractmetadatabase.h
   metadata/qgslayermetadata.h
+  metadata/qgslayermetadataformatter.h
   metadata/qgslayermetadatavalidator.h
+  metadata/qgsprojectmetadata.h
+
+  processing/models/qgsprocessingmodelalgorithm.h
+  processing/models/qgsprocessingmodelchildalgorithm.h
+  processing/models/qgsprocessingmodelchildparametersource.h
+  processing/models/qgsprocessingmodelcomponent.h
+  processing/models/qgsprocessingmodeloutput.h
+  processing/models/qgsprocessingmodelparameter.h
+  processing/qgsprocessing.h
+  processing/qgsprocessingalgorithm.h
+  processing/qgsprocessingalgrunnertask.h
+  processing/qgsprocessingcontext.h
+  processing/qgsprocessingfeedback.h
+  processing/qgsprocessingoutputs.h
+  processing/qgsprocessingparameters.h
+  processing/qgsprocessingparametertype.h
+  processing/qgsprocessingparametertypeimpl.h
+  processing/qgsprocessingprovider.h
+  processing/qgsprocessingregistry.h
+  processing/qgsprocessingutils.h
+
+  providers/gdal/qgsgdaldataitems.h
+  providers/gdal/qgsgdalprovider.h
+  providers/memory/qgsmemoryfeatureiterator.h
+  providers/memory/qgsmemoryprovider.h
+  providers/memory/qgsmemoryproviderutils.h
+  providers/meshmemory/qgsmeshmemorydataprovider.h
+  providers/ogr/qgsgeopackagedataitems.h
+  providers/ogr/qgsgeopackageprojectstorage.h
+  providers/ogr/qgsgeopackageproviderconnection.h
+  providers/ogr/qgsgeopackagerasterwritertask.h
+  providers/ogr/qgsogrconnpool.h
+  providers/ogr/qgsogrdataitems.h
+  providers/ogr/qgsogrdbconnection.h
+  providers/ogr/qgsogrprovider.h
+  providers/ogr/qgsogrtransaction.h
+
+  raster/qgsbilinearrasterresampler.h
+  raster/qgsbrightnesscontrastfilter.h
+  raster/qgscliptominmaxenhancement.h
+  raster/qgscolorrampshader.h
+  raster/qgscontrastenhancement.h
+  raster/qgscontrastenhancementfunction.h
+  raster/qgscubicrasterresampler.h
+  raster/qgshillshaderenderer.h
+  raster/qgshuesaturationfilter.h
+  raster/qgslinearminmaxenhancement.h
+  raster/qgslinearminmaxenhancementwithclip.h
+  raster/qgsmultibandcolorrenderer.h
+  raster/qgspalettedrasterrenderer.h
+  raster/qgsraster.h
+  raster/qgsrasterbandstats.h
+  raster/qgsrasterblock.h
+  raster/qgsrasterchecker.h
+  raster/qgsrasterdataprovider.h
+  raster/qgsrasterdrawer.h
+  raster/qgsrasterfilewriter.h
+  raster/qgsrasterfilewritertask.h
+  raster/qgsrasterhistogram.h
+  raster/qgsrasteridentifyresult.h
+  raster/qgsrasterinterface.h
+  raster/qgsrasteriterator.h
+  raster/qgsrasterlayer.h
+  raster/qgsrasterlayerrenderer.h
+  raster/qgsrasterminmaxorigin.h
+  raster/qgsrasternuller.h
+  raster/qgsrasterpipe.h
+  raster/qgsrasterprojector.h
+  raster/qgsrasterpyramid.h
+  raster/qgsrasterrange.h
+  raster/qgsrasterrenderer.h
+  raster/qgsrasterresamplefilter.h
+  raster/qgsrasterresampler.h
+  raster/qgsrastershader.h
+  raster/qgsrastershaderfunction.h
+  raster/qgsrastertransparency.h
+  raster/qgsrasterviewport.h
+  raster/qgssinglebandcolordatarenderer.h
+  raster/qgssinglebandgrayrenderer.h
+  raster/qgssinglebandpseudocolorrenderer.h
+
+  scalebar/qgsdoubleboxscalebarrenderer.h
+  scalebar/qgsnumericscalebarrenderer.h
+  scalebar/qgsscalebarrenderer.h
+  scalebar/qgsscalebarsettings.h
+  scalebar/qgssingleboxscalebarrenderer.h
+  scalebar/qgsticksscalebarrenderer.h
+
+  symbology/qgs25drenderer.h
+  symbology/qgsarrowsymbollayer.h
+  symbology/qgscategorizedsymbolrenderer.h
+  symbology/qgscolorbrewerpalette.h
+  symbology/qgscptcityarchive.h
+  symbology/qgsellipsesymbollayer.h
+  symbology/qgsfillsymbollayer.h
+  symbology/qgsgeometrygeneratorsymbollayer.h
+  symbology/qgsgraduatedsymbolrenderer.h
+  symbology/qgsheatmaprenderer.h
+  symbology/qgsinvertedpolygonrenderer.h
+  symbology/qgslegendsymbolitem.h
+  symbology/qgslinesymbollayer.h
+  symbology/qgsmarkersymbollayer.h
+  symbology/qgsnullsymbolrenderer.h
+  symbology/qgspointclusterrenderer.h
+  symbology/qgspointdisplacementrenderer.h
+  symbology/qgspointdistancerenderer.h
+  symbology/qgsrenderer.h
+  symbology/qgsrendererrange.h
+  symbology/qgsrendererregistry.h
+  symbology/qgsrulebasedrenderer.h
+  symbology/qgssinglesymbolrenderer.h
+  symbology/qgsstyle.h
+  symbology/qgsstyleentityvisitor.h
+  symbology/qgsstylemodel.h
+  symbology/qgssvgcache.h
+  symbology/qgssymbol.h
+  symbology/qgssymbollayer.h
+  symbology/qgssymbollayerregistry.h
+  symbology/qgssymbollayerutils.h
+  symbology/qgsvectorfieldsymbollayer.h
 
   validity/qgsabstractvaliditycheck.h
   validity/qgsvaliditycheckcontext.h
   validity/qgsvaliditycheckregistry.h
 )
 
+IF (NOT WITH_QTWEBKIT)
+  SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
+    qgswebframe.h
+  )
+ENDIF(NOT WITH_QTWEBKIT)
+
+IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
+  SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
+    gps/qgsqtlocationconnection.h
+  )
+ENDIF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
+
+
+IF (HAVE_OPENCL)
+    SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
+        qgsopenclutils.h
+    )
+ENDIF (HAVE_OPENCL)
+
+QT5_WRAP_CPP(QGIS_CORE_SRCS ${QGIS_CORE_HDRS})
+
+
+IF(NOT MSVC)
+  IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo))
+    SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1")
+  ENDIF ()
+ENDIF(NOT MSVC)
+
+# install headers
+# install qgsconfig.h and plugin.h here so they can get into
+# the OS X framework target
+
+SET(QGIS_CORE_HDRS
+)
+
 IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
   SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
     gps/qgsqtlocationconnection.h
@@ -1175,7 +1370,6 @@ IF(HAVE_OPENCL)
   TARGET_LINK_LIBRARIES(qgis_core ${OpenCL_LIBRARY})
 ENDIF(HAVE_OPENCL)
 
-SET_TARGET_PROPERTIES(qgis_core PROPERTIES AUTOMOC TRUE)
 
 IF(NOT APPLE)
   INSTALL(FILES ${QGIS_CORE_HDRS} DESTINATION ${QGIS_INCLUDE_DIR})
diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h
index 5b77dc54b55..86e929281a0 100644
--- a/src/core/dxf/qgsdxfexport.h
+++ b/src/core/dxf/qgsdxfexport.h
@@ -43,7 +43,7 @@ class QgsCompoundCurve;
 #define DXF_HANDMAX 9999999
 #define DXF_HANDPLOTSTYLE 0xf
 
-namespace pal SIP_SKIP
+namespace pal // SIP_SKIP
 {
   class LabelPosition;
 }
diff --git a/src/core/raster/qgsrasterminmaxorigin.h b/src/core/raster/qgsrasterminmaxorigin.h
index 2a5ec9394e8..6ede6f11cf5 100644
--- a/src/core/raster/qgsrasterminmaxorigin.h
+++ b/src/core/raster/qgsrasterminmaxorigin.h
@@ -47,7 +47,11 @@ class CORE_EXPORT QgsRasterMinMaxOrigin
     //! \brief This enumerator describes the limits used to compute min/max values
     enum Limits
     {
+#ifdef SIP_RUN
       None SIP_PYNAME( None_ ), //!< User defined.
+#else
+      None, //!< User defined.
+#endif
       MinMax, //!< Real min-max values
       StdDev, //!< Range is [ mean - stdDevFactor() * stddev, mean + stdDevFactor() * stddev ]
       CumulativeCut //!< Range is [ min + cumulativeCutLower() * (max - min), min + cumulativeCutUpper() * (max - min) ]
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index c9add682925..717ce7e45e3 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -318,7 +318,6 @@ SET(QGIS_GUI_SRCS
   qgslistwidget.cpp
   qgslegendfilterbutton.cpp
   qgslimitedrandomcolorrampdialog.cpp
-  qgslonglongvalidator.h
   qgsratiolockbutton.cpp
   qgsludialog.cpp
   qgsmanageconnectionsdialog.cpp
@@ -425,58 +424,221 @@ SET(QGIS_GUI_SRCS
   qgssourceselectproviderregistry.cpp
 )
 
-FIND_PACKAGE(Qt5Qml REQUIRED)
-FIND_PACKAGE(Qt5QuickWidgets REQUIRED)
-
-IF(Qt5Qml_FOUND)
-  ADD_DEFINITIONS(-DWITH_QML)
-ENDIF(Qt5Qml_FOUND)
-
-# for installing headers
-
 SET(QGIS_GUI_HDRS
+  qgisinterface.h
+
+  qgsabstractdatasourcewidget.h
+  qgsactionmenu.h
+  qgsadvanceddigitizingdockwidget.h
+  qgsadvanceddigitizingfloater.h
+  qgsaggregatetoolbutton.h
+  qgsalignmentcombobox.h
+  qgsattributedialog.h
+  qgsattributeeditorcontext.h
+  qgsattributeform.h
+  qgsattributeformeditorwidget.h
   qgsattributeforminterface.h
   qgsattributeformlegacyinterface.h
+  qgsattributeformrelationeditorwidget.h
+  qgsattributeformwidget.h
+  qgsattributetypeloaddialog.h
+  qgsblendmodecombobox.h
+  qgsbrowserdockwidget.h
+  qgsbrowserguimodel.h
+  qgsbrowsertreeview.h
+  qgsbusyindicatordialog.h
+  qgscharacterselectordialog.h
+  qgscheckablecombobox.h
+  qgscodeeditor.h
+  qgscodeeditorcss.h
+  qgscodeeditorexpression.h
+  qgscodeeditorhtml.h
+  qgscodeeditorpython.h
+  qgscodeeditorsql.h
+  qgscollapsiblegroupbox.h
+  qgscolorbrewercolorrampdialog.h
+  qgscolorbutton.h
+  qgscolordialog.h
+  qgscolorrampbutton.h
+  qgscolorschemelist.h
+  qgscolorswatchgrid.h
+  qgscolorwidgets.h
+  qgscompoundcolorwidget.h
+  qgsconfigureshortcutsdialog.h
+  qgscoordinateboundspreviewmapwidget.h
+  qgscredentialdialog.h
+  qgscurveeditorwidget.h
+  qgscustomdrophandler.h
   qgsdataitemguiprovider.h
   qgsdataitemguiproviderregistry.h
+  qgsdatasourcemanagerdialog.h
+  qgsdatasourceselectdialog.h
+  qgsdatumtransformdialog.h
   qgsdetaileditemdata.h
+  qgsdetaileditemdelegate.h
+  qgsdetaileditemwidget.h
+  qgsdial.h
+  qgsdialog.h
+  qgsdockwidget.h
+  qgsencodingfiledialog.h
+  qgserrordialog.h
   qgsexpressionbuilderdialog.h
+  qgsexpressionbuilderwidget.h
+  qgsexpressionhighlighter.h
+  qgsexpressionlineedit.h
+  qgsexpressionselectiondialog.h
+  qgsextentgroupbox.h
+  qgsexternalresourcewidget.h
+  qgsfeaturelistcombobox.h
+  qgsfeatureselectiondlg.h
+  qgsfieldcombobox.h
+  qgsfieldexpressionwidget.h
+  qgsfieldvalidator.h
+  qgsfieldvalueslineedit.h
+  qgsfilecontentsourcelineedit.h
+  qgsfiledownloaderdialog.h
+  qgsfilewidget.h
+  qgsfilterlineedit.h
+  qgsfindfilesbypatternwidget.h
+  qgsfloatingwidget.h
+  qgsfocuswatcher.h
+  qgsfontbutton.h
+  qgsformannotation.h
   qgsgeometryrubberband.h
+  qgsgradientcolorrampdialog.h
+  qgsgradientstopeditor.h
+  qgsgroupwmsdatadialog.h
+  qgsgui.h
   qgsguiutils.h
-  qgsproviderguimetadata.h
-  qgsproviderguiregistry.h
-  qgsprojectstorageguiregistry.h
   qgshelp.h
   qgshighlight.h
+  qgshistogramwidget.h
+  qgsidentifymenu.h
+  qgskeyvaluewidget.h
+  qgslabelinggui.h
+  qgslegendfilterbutton.h
+  qgslimitedrandomcolorrampdialog.h
+  qgslistwidget.h
+  qgslonglongvalidator.h
+  qgsludialog.h
+  qgsmanageconnectionsdialog.h
+  qgsmapcanvas.h
+  qgsmapcanvasannotationitem.h
   qgsmapcanvasitem.h
   qgsmapcanvasmap.h
   qgsmapcanvassnappingutils.h
   qgsmapcanvastracer.h
+  qgsmaplayeractionregistry.h
+  qgsmaplayercombobox.h
+  qgsmaplayerconfigwidget.h
   qgsmaplayerconfigwidgetfactory.h
+  qgsmaplayerstylemanagerwidget.h
   qgsmapmouseevent.h
+  qgsmapoverviewcanvas.h
   qgsmaptip.h
+  qgsmaptool.h
+  qgsmaptooladvanceddigitizing.h
+  qgsmaptoolcapture.h
+  qgsmaptooldigitizefeature.h
+  qgsmaptooledit.h
+  qgsmaptoolemitpoint.h
+  qgsmaptoolextent.h
+  qgsmaptoolidentify.h
+  qgsmaptoolidentifyfeature.h
+  qgsmaptoolpan.h
+  qgsmaptoolzoom.h
+  qgsmenuheader.h
+  qgsmessagebar.h
+  qgsmessagebaritem.h
+  qgsmessagelogviewer.h
+  qgsmessageviewer.h
+  qgsmetadatawidget.h
+  qgsnewauxiliaryfielddialog.h
+  qgsnewauxiliarylayerdialog.h
+  qgsnewgeopackagelayerdialog.h
+  qgsnewhttpconnection.h
+  qgsnewmemorylayerdialog.h
+  qgsnewnamedialog.h
+  qgsnewvectorlayerdialog.h
+  qgsopacitywidget.h
   qgsoptionsdialogbase.h
+  qgsoptionsdialoghighlightwidget.h
+  qgsoptionsdialoghighlightwidgetsimpl.h
   qgsoptionswidgetfactory.h
+  qgsorderbydialog.h
+  qgsowssourceselect.h
+  qgspanelwidget.h
+  qgspanelwidgetstack.h
+  qgspasswordlineedit.h
+  qgspixmaplabel.h
+  qgspluginmanagerinterface.h
+  qgspresetcolorrampdialog.h
+  qgsprevieweffect.h
+  qgsprojectionselectiondialog.h
+  qgsprojectionselectiontreewidget.h
+  qgsprojectionselectionwidget.h
+  qgsprojectstorageguiprovider.h
+  qgsprojectstorageguiregistry.h
+  qgspropertyassistantwidget.h
+  qgspropertyoverridebutton.h
+  qgsproviderguimetadata.h
+  qgsproviderguiregistry.h
+  qgsproxystyle.h
+  qgsquerybuilder.h
+  qgsrasterformatsaveoptionswidget.h
+  qgsrasterlayersaveasdialog.h
+  qgsrasterpyramidsoptionswidget.h
+  qgsratiolockbutton.h
+  qgsrelationeditorwidget.h
+  qgsrubberband.h
+  qgsscalecombobox.h
+  qgsscalerangewidget.h
+  qgsscalevisibilitydialog.h
+  qgsscalewidget.h
+  qgsscrollarea.h
+  qgssearchquerybuilder.h
+  qgsshortcutsmanager.h
+  qgsslider.h
   qgssnapindicator.h
-  qgssqlcomposerdialog.h
-  qgstablewidgetitem.h
-  qgsuserinputwidget.h
-  qgsbrowserdockwidget.h
-  qgsvertexmarker.h
-  qgsdatasourcemanagerdialog.h
-  qgsdatasourceselectdialog.h
-  qgsabstractdatasourcewidget.h
+  qgssnaptogridcanvasitem.h
   qgssourceselectprovider.h
   qgssourceselectproviderregistry.h
+  qgssqlcomposerdialog.h
+  qgsstatusbar.h
+  qgsstyleitemslistwidget.h
+  qgssublayersdialog.h
+  qgssubstitutionlistwidget.h
+  qgssymbolbutton.h
+  qgstablewidgetbase.h
+  qgstablewidgetitem.h
+  qgstabwidget.h
+  qgstaskmanagerwidget.h
+  qgstextformatwidget.h
+  qgstextpreview.h
+  qgstreewidgetitem.h
+  qgsunitselectionwidget.h
+  qgsuserinputwidget.h
+  qgsvaliditycheckresultswidget.h
+  qgsvariableeditorwidget.h
+  qgsvertexmarker.h
+  qgsvscrollarea.h
   qgswindowmanagerinterface.h
-  qgsprojectstorageguiprovider.h
-
-  ogr/qgsogrhelperfunctions.h
-  ogr/qgsnewogrconnection.h
-  ogr/qgsvectorlayersaveasdialog.h
 
+  attributetable/qgsattributetabledelegate.h
+  attributetable/qgsattributetablefiltermodel.h
+  attributetable/qgsattributetablemodel.h
+  attributetable/qgsattributetableview.h
+  attributetable/qgsdualview.h
+  attributetable/qgsfeaturelistmodel.h
+  attributetable/qgsfeaturelistview.h
+  attributetable/qgsfeaturelistviewdelegate.h
   attributetable/qgsfeaturemodel.h
+  attributetable/qgsfeatureselectionmodel.h
+  attributetable/qgsfieldconditionalformatwidget.h
+  attributetable/qgsgenericfeatureselectionmanager.h
   attributetable/qgsifeatureselectionmanager.h
+  attributetable/qgsorganizetablecolumnsdialog.h
+  attributetable/qgsvectorlayerselectionmanager.h
 
   auth/qgsauthauthoritieseditor.h
   auth/qgsauthcertificateinfo.h
@@ -486,7 +648,6 @@ SET(QGIS_GUI_HDRS
   auth/qgsauthconfigeditor.h
   auth/qgsauthconfigidedit.h
   auth/qgsauthconfigselect.h
-  auth/qgsauthsettingswidget.h
   auth/qgsautheditorwidgets.h
   auth/qgsauthguiutils.h
   auth/qgsauthidentitieseditor.h
@@ -495,49 +656,216 @@ SET(QGIS_GUI_HDRS
   auth/qgsauthmasterpassresetdialog.h
   auth/qgsauthmethodedit.h
   auth/qgsauthserverseditor.h
+  auth/qgsauthsettingswidget.h
   auth/qgsauthsslconfigwidget.h
   auth/qgsauthsslerrorsdialog.h
   auth/qgsauthsslimportdialog.h
   auth/qgsauthtrustedcasdialog.h
 
-  editorwidgets/core/qgseditorwidgetfactory.h
-  editorwidgets/core/qgseditorwidgetautoconf.h
+  callouts/qgscalloutwidget.h
 
+  editorwidgets/core/qgseditorconfigwidget.h
+  editorwidgets/core/qgseditorwidgetautoconf.h
+  editorwidgets/core/qgseditorwidgetfactory.h
+  editorwidgets/core/qgseditorwidgetregistry.h
+  editorwidgets/core/qgseditorwidgetwrapper.h
+  editorwidgets/core/qgssearchwidgetwrapper.h
+  editorwidgets/core/qgswidgetwrapper.h
   editorwidgets/qgsbinarywidgetfactory.h
+  editorwidgets/qgsbinarywidgetwrapper.h
+  editorwidgets/qgscheckboxconfigdlg.h
+  editorwidgets/qgscheckboxsearchwidgetwrapper.h
   editorwidgets/qgscheckboxwidgetfactory.h
+  editorwidgets/qgscheckboxwidgetwrapper.h
+  editorwidgets/qgsclassificationwidgetwrapper.h
   editorwidgets/qgsclassificationwidgetwrapperfactory.h
   editorwidgets/qgscolorwidgetfactory.h
+  editorwidgets/qgscolorwidgetwrapper.h
+  editorwidgets/qgsdatetimeedit.h
+  editorwidgets/qgsdatetimeeditconfig.h
   editorwidgets/qgsdatetimeeditfactory.h
+  editorwidgets/qgsdatetimeeditwrapper.h
+  editorwidgets/qgsdatetimesearchwidgetwrapper.h
+  editorwidgets/qgsdefaultsearchwidgetwrapper.h
+  editorwidgets/qgsdoublespinbox.h
+  editorwidgets/qgsdummyconfigdlg.h
   editorwidgets/qgsenumerationwidgetfactory.h
+  editorwidgets/qgsenumerationwidgetwrapper.h
+  editorwidgets/qgsexternalresourceconfigdlg.h
   editorwidgets/qgsexternalresourcewidgetfactory.h
+  editorwidgets/qgsexternalresourcewidgetwrapper.h
   editorwidgets/qgshiddenwidgetfactory.h
+  editorwidgets/qgshiddenwidgetwrapper.h
+  editorwidgets/qgshtmlwidgetwrapper.h
   editorwidgets/qgskeyvaluewidgetfactory.h
+  editorwidgets/qgskeyvaluewidgetwrapper.h
   editorwidgets/qgslistwidgetfactory.h
+  editorwidgets/qgslistwidgetwrapper.h
+  editorwidgets/qgsmultiedittoolbutton.h
+  editorwidgets/qgsrangeconfigdlg.h
   editorwidgets/qgsrangewidgetfactory.h
+  editorwidgets/qgsrangewidgetwrapper.h
+  editorwidgets/qgsrelationaggregatesearchwidgetwrapper.h
+  editorwidgets/qgsrelationreferenceconfigdlg.h
   editorwidgets/qgsrelationreferencefactory.h
+  editorwidgets/qgsrelationreferencesearchwidgetwrapper.h
+  editorwidgets/qgsrelationreferencewidget.h
+  editorwidgets/qgsrelationreferencewidgetwrapper.h
+  editorwidgets/qgsrelationwidgetwrapper.h
+  editorwidgets/qgssearchwidgettoolbutton.h
+  editorwidgets/qgsspinbox.h
+  editorwidgets/qgstexteditconfigdlg.h
+  editorwidgets/qgstexteditsearchwidgetwrapper.h
   editorwidgets/qgstexteditwidgetfactory.h
+  editorwidgets/qgstexteditwrapper.h
+  editorwidgets/qgsuniquevaluesconfigdlg.h
   editorwidgets/qgsuniquevaluewidgetfactory.h
+  editorwidgets/qgsuniquevaluewidgetwrapper.h
   editorwidgets/qgsuuidwidgetfactory.h
+  editorwidgets/qgsuuidwidgetwrapper.h
+  editorwidgets/qgsvaluemapconfigdlg.h
+  editorwidgets/qgsvaluemapsearchwidgetwrapper.h
   editorwidgets/qgsvaluemapwidgetfactory.h
+  editorwidgets/qgsvaluemapwidgetwrapper.h
+  editorwidgets/qgsvaluerelationconfigdlg.h
+  editorwidgets/qgsvaluerelationsearchwidgetwrapper.h
   editorwidgets/qgsvaluerelationwidgetfactory.h
+  editorwidgets/qgsvaluerelationwidgetwrapper.h
 
+  effects/qgseffectdrawmodecombobox.h
+  effects/qgseffectstackpropertieswidget.h
+  effects/qgspainteffectpropertieswidget.h
+  effects/qgspainteffectwidget.h
+
+  layertree/qgscustomlayerorderwidget.h
   layertree/qgslayertreeembeddedconfigwidget.h
   layertree/qgslayertreeembeddedwidgetregistry.h
+  layertree/qgslayertreeembeddedwidgetsimpl.h
+  layertree/qgslayertreemapcanvasbridge.h
+  layertree/qgslayertreeview.h
+  layertree/qgslayertreeviewdefaultactions.h
+  layertree/qgslayertreeviewindicator.h
+  layertree/qgslayertreeviewitemdelegate.h
 
-  layout/qgslayoutreportsectionlabel.h
-  layout/qgslayoutviewmouseevent.h
+  layout/qgslayoutcombobox.h
+  layout/qgslayoutcustomdrophandler.h
   layout/qgslayoutdesignerinterface.h
+  layout/qgslayoutitemcombobox.h
+  layout/qgslayoutitemguiregistry.h
+  layout/qgslayoutitemwidget.h
+  layout/qgslayoutmousehandles.h
+  layout/qgslayoutnewitempropertiesdialog.h
+  layout/qgslayoutreportsectionlabel.h
+  layout/qgslayoutruler.h
+  layout/qgslayoutunitscombobox.h
+  layout/qgslayoutview.h
+  layout/qgslayoutviewmouseevent.h
+  layout/qgslayoutviewrubberband.h
+  layout/qgslayoutviewtool.h
+  layout/qgslayoutviewtooladditem.h
+  layout/qgslayoutviewtooladdnodeitem.h
+  layout/qgslayoutviewtooleditnodes.h
+  layout/qgslayoutviewtoolmoveitemcontent.h
+  layout/qgslayoutviewtoolpan.h
+  layout/qgslayoutviewtoolselect.h
+  layout/qgslayoutviewtooltemporarykeypan.h
+  layout/qgslayoutviewtooltemporarykeyzoom.h
+  layout/qgslayoutviewtooltemporarymousepan.h
+  layout/qgslayoutviewtoolzoom.h
 
+  locator/qgslocatorwidget.h
+
+  ogr/qgsnewogrconnection.h
+  ogr/qgsogrhelperfunctions.h
+  ogr/qgsvectorlayersaveasdialog.h
+
+  processing/qgsprocessingalgorithmconfigurationwidget.h
+  processing/qgsprocessingalgorithmdialogbase.h
+  processing/qgsprocessingconfigurationwidgets.h
   processing/qgsprocessinggui.h
   processing/qgsprocessingguiregistry.h
+  processing/qgsprocessingmaplayercombobox.h
+  processing/qgsprocessingmatrixparameterdialog.h
+  processing/qgsprocessingmodelerparameterwidget.h
+  processing/qgsprocessingmultipleselectiondialog.h
+  processing/qgsprocessingparameterdefinitionwidget.h
+  processing/qgsprocessingrecentalgorithmlog.h
+  processing/qgsprocessingtoolboxmodel.h
+  processing/qgsprocessingtoolboxtreeview.h
+  processing/qgsprocessingwidgetwrapper.h
+  processing/qgsprocessingwidgetwrapperimpl.h
 
+  providers/gdal/qgsgdalguiprovider.h
+  providers/gdal/qgsgdalsourceselect.h
+  providers/ogr/qgsgeopackageitemguiprovider.h
+  providers/ogr/qgsgeopackageprojectstoragedialog.h
   providers/ogr/qgsgeopackageprojectstorageguiprovider.h
+  providers/ogr/qgsogrdbsourceselect.h
+  providers/ogr/qgsogrdbtablemodel.h
   providers/ogr/qgsogrguiprovider.h
+  providers/ogr/qgsogritemguiprovider.h
+  providers/ogr/qgsogrsourceselect.h
 
+  raster/qgscolorrampshaderwidget.h
+  raster/qgshillshaderendererwidget.h
+  raster/qgsmultibandcolorrendererwidget.h
+  raster/qgspalettedrendererwidget.h
+  raster/qgsrasterbandcombobox.h
+  raster/qgsrasterhistogramwidget.h
+  raster/qgsrasterminmaxwidget.h
   raster/qgsrasterrendererwidget.h
+  raster/qgsrastertransparencywidget.h
+  raster/qgsrendererrasterpropertieswidget.h
+  raster/qgssinglebandgrayrendererwidget.h
+  raster/qgssinglebandpseudocolorrendererwidget.h
 
+  symbology/characterwidget.h
+  symbology/qgs25drendererwidget.h
+  symbology/qgsarrowsymbollayerwidget.h
+  symbology/qgsbrushstylecombobox.h
+  symbology/qgscategorizedsymbolrendererwidget.h
+  symbology/qgscptcitycolorrampdialog.h
+  symbology/qgsdashspacedialog.h
+  symbology/qgsdatadefinedsizelegendwidget.h
+  symbology/qgsellipsesymbollayerwidget.h
+  symbology/qgsgraduatedhistogramwidget.h
+  symbology/qgsgraduatedsymbolrendererwidget.h
+  symbology/qgsheatmaprendererwidget.h
+  symbology/qgsinvertedpolygonrendererwidget.h
+  symbology/qgslayerpropertieswidget.h
+  symbology/qgsnullsymbolrendererwidget.h
+  symbology/qgspenstylecombobox.h
+  symbology/qgspointclusterrendererwidget.h
+  symbology/qgspointdisplacementrendererwidget.h
+  symbology/qgsrendererpropertiesdialog.h
+  symbology/qgsrendererwidget.h
+  symbology/qgsrulebasedrendererwidget.h
+  symbology/qgssinglesymbolrendererwidget.h
+  symbology/qgssmartgroupeditordialog.h
+  symbology/qgsstyleexportimportdialog.h
+  symbology/qgsstylegroupselectiondialog.h
+  symbology/qgsstylemanagerdialog.h
+  symbology/qgsstylesavedialog.h
+  symbology/qgssvgselectorwidget.h
+  symbology/qgssymbollayerwidget.h
+  symbology/qgssymbollevelsdialog.h
+  symbology/qgssymbolselectordialog.h
+  symbology/qgssymbolslistwidget.h
   symbology/qgssymbolwidgetcontext.h
+  symbology/qgsvectorfieldsymbollayerwidget.h
 )
+FIND_PACKAGE(Qt5Qml REQUIRED)
+FIND_PACKAGE(Qt5QuickWidgets REQUIRED)
+
+IF(Qt5Qml_FOUND)
+ADD_DEFINITIONS(-DWITH_QML)
+SET(QGIS_GUI_HDRS
+  ${QGIS_GUI_HDRS}
+  editorwidgets/qgsqmlwidgetwrapper.h
+)
+ENDIF(Qt5Qml_FOUND)
+
+# for installing headers
 
 IF(Qt5Qml_FOUND)
 
@@ -682,8 +1010,6 @@ GENERATE_EXPORT_HEADER(
 
 SET(QGIS_GUI_HDRS ${QGIS_GUI_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_gui.h)
 
-SET_TARGET_PROPERTIES(qgis_gui PROPERTIES AUTOMOC TRUE)
-
 IF(NOT APPLE)
   IF (WIN32 )
     INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/native/win)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 4c7fd8e0746..96b95cb6007 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -51,19 +51,24 @@ SET(QGIS_SERVER_SRCS
 )
 
 SET (QGIS_SERVER_HDRS
-  qgsservicemodule.h
+  qgscapabilitiescache.h
+  qgsconfigcache.h
   qgsmapserviceexception.h
   qgsserverapi.h
+  qgsserverapicontext.h
+  qgsserverlogger.h
   qgsserverogcapi.h
   qgsserverogcapihandler.h
-  qgsserverapicontext.h
+  qgsserverparameters.h
   qgsserverquerystringparameter.h
+  qgsserversettings.h
+  qgsservicemodule.h
 )
 
+
 #############################################################
 # qgis_server library
 
-
 IF (WITH_SERVER_PLUGINS)
   SET(QGIS_SERVER_SRCS ${QGIS_SERVER_SRCS}
     qgsserverplugins.cpp