diff --git a/scripts/sipify.py b/scripts/sipify.py
index af04bb2e180..a336cf14567 100755
--- a/scripts/sipify.py
+++ b/scripts/sipify.py
@@ -1479,7 +1479,7 @@ while CONTEXT.line_idx < CONTEXT.line_count:
         dbg_info("found SIP_WHEN_FEATURE")
         CONTEXT.if_feature_condition = match.group(1)
 
-    match = re.search(r"SIP_TYPEHEADER_INCLUDE\(\s*(.*?)\s*\)", CONTEXT.current_line)
+    match = re.search(r'SIP_TYPEHEADER_INCLUDE\(\s*"(.*?)"\s*\)', CONTEXT.current_line)
     if match:
         dbg_info("found SIP_TYPEHEADER_INCLUDE")
         write_output("STI", f'#include "{match.group(1)}"\n')
diff --git a/src/analysis/raster/qgsalignraster.h b/src/analysis/raster/qgsalignraster.h
index 6cfb785c5c2..0d720730485 100644
--- a/src/analysis/raster/qgsalignraster.h
+++ b/src/analysis/raster/qgsalignraster.h
@@ -43,7 +43,7 @@ typedef void *GDALDatasetH SIP_SKIP;
  */
 class ANALYSIS_EXPORT QgsAlignRaster
 {
-    SIP_TYPEHEADER_INCLUDE( gdal_version.h );
+    SIP_TYPEHEADER_INCLUDE( "gdal_version.h" );
 
 
   public:
diff --git a/src/core/browser/qgsdataitem.h b/src/core/browser/qgsdataitem.h
index 9d80623f86f..fddd6b1f2fc 100644
--- a/src/core/browser/qgsdataitem.h
+++ b/src/core/browser/qgsdataitem.h
@@ -44,12 +44,12 @@ typedef QgsDataItem *dataItem_t( QString, QgsDataItem * ) SIP_SKIP;
 */
 class CORE_EXPORT QgsDataItem : public QObject
 {
-    SIP_TYPEHEADER_INCLUDE( qgslayeritem.h );
-    SIP_TYPEHEADER_INCLUDE( qgsdirectoryitem.h );
-    SIP_TYPEHEADER_INCLUDE( qgsfavoritesitem.h );
-    SIP_TYPEHEADER_INCLUDE( qgszipitem.h );
-    SIP_TYPEHEADER_INCLUDE( qgsdatacollectionitem.h );
-    SIP_TYPEHEADER_INCLUDE( qgsprojectitem.h );
+    SIP_TYPEHEADER_INCLUDE( "qgslayeritem.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsdirectoryitem.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsfavoritesitem.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgszipitem.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsdatacollectionitem.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsprojectitem.h" );
 
 #ifdef SIP_RUN
     SIP_CONVERT_TO_SUBCLASS_CODE
diff --git a/src/core/gps/qgsgpsconnection.h b/src/core/gps/qgsgpsconnection.h
index be2830d0ac4..e9ca42bc6c8 100644
--- a/src/core/gps/qgsgpsconnection.h
+++ b/src/core/gps/qgsgpsconnection.h
@@ -48,8 +48,8 @@ template<class T> class QgsSettingsEntryEnumFlag;
 */
 class CORE_EXPORT QgsGpsConnection : public QObject
 {
-    SIP_TYPEHEADER_INCLUDE( qgsgpsdconnection.h );
-    SIP_TYPEHEADER_INCLUDE( qgsnmeaconnection.h );
+    SIP_TYPEHEADER_INCLUDE( "qgsgpsdconnection.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsnmeaconnection.h" );
 
 
 #ifdef SIP_RUN
diff --git a/src/core/layertree/qgslayertreemodellegendnode.h b/src/core/layertree/qgslayertreemodellegendnode.h
index d4c2437121d..69458bcddd4 100644
--- a/src/core/layertree/qgslayertreemodellegendnode.h
+++ b/src/core/layertree/qgslayertreemodellegendnode.h
@@ -50,7 +50,7 @@ class QgsTextDocumentMetrics;
  */
 class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject
 {
-    SIP_TYPEHEADER_INCLUDE( qgscolorramplegendnode.h );
+    SIP_TYPEHEADER_INCLUDE( "qgscolorramplegendnode.h" );
 
 #ifdef SIP_RUN
     SIP_CONVERT_TO_SUBCLASS_CODE
diff --git a/src/core/layout/qgslayoutitem.h b/src/core/layout/qgslayoutitem.h
index 3cb56ea252b..34174b15672 100644
--- a/src/core/layout/qgslayoutitem.h
+++ b/src/core/layout/qgslayoutitem.h
@@ -105,19 +105,19 @@ class CORE_EXPORT QgsLayoutItemRenderContext
  */
 class CORE_EXPORT QgsLayoutItem : public QgsLayoutObject, public QGraphicsRectItem, public QgsLayoutUndoObjectInterface
 {
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemgroup.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemmap.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitempicture.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemlabel.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemlegend.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitempolygon.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitempolyline.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemscalebar.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutframe.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemshape.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitempage.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemmarker.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemelevationprofile.h );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemgroup.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmap.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitempicture.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemlabel.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemlegend.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitempolygon.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitempolyline.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemscalebar.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutframe.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemshape.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitempage.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmarker.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemelevationprofile.h" );
 
 #ifdef SIP_RUN
     SIP_CONVERT_TO_SUBCLASS_CODE
diff --git a/src/core/layout/qgslayoutmultiframe.h b/src/core/layout/qgslayoutmultiframe.h
index 9703f67f102..20147845d10 100644
--- a/src/core/layout/qgslayoutmultiframe.h
+++ b/src/core/layout/qgslayoutmultiframe.h
@@ -46,10 +46,10 @@ class QgsLayoutItemRenderContext;
 
 class CORE_EXPORT QgsLayoutMultiFrame: public QgsLayoutObject, public QgsLayoutUndoObjectInterface
 {
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemhtml.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemattributetable.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemmanualtable.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemtexttable.h );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemhtml.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemattributetable.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmanualtable.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemtexttable.h" );
 
 #ifdef SIP_RUN
     SIP_CONVERT_TO_SUBCLASS_CODE
diff --git a/src/core/layout/qgslayoutobject.h b/src/core/layout/qgslayoutobject.h
index 6872f0c23be..41b7bb7551f 100644
--- a/src/core/layout/qgslayoutobject.h
+++ b/src/core/layout/qgslayoutobject.h
@@ -37,20 +37,20 @@ class QgsReadWriteContext;
  */
 class CORE_EXPORT QgsLayoutObject: public QObject, public QgsExpressionContextGenerator
 {
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitem.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemgroup.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemmap.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitempicture.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemlabel.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemlegend.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitempolygon.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitempolyline.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemscalebar.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutframe.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemshape.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitempage.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemmarker.h );
-    SIP_TYPEHEADER_INCLUDE( qgslayoutitemelevationprofile.h );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitem.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemgroup.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmap.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitempicture.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemlabel.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemlegend.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitempolygon.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitempolyline.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemscalebar.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutframe.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemshape.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitempage.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemmarker.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgslayoutitemelevationprofile.h" );
 
 #ifdef SIP_RUN
     SIP_CONVERT_TO_SUBCLASS_CODE
diff --git a/src/core/qgsmaplayerelevationproperties.h b/src/core/qgsmaplayerelevationproperties.h
index 9a4d64824b5..d684660f15b 100644
--- a/src/core/qgsmaplayerelevationproperties.h
+++ b/src/core/qgsmaplayerelevationproperties.h
@@ -43,11 +43,11 @@ class QgsMapLayer;
  */
 class CORE_EXPORT QgsMapLayerElevationProperties : public QObject
 {
-    SIP_TYPEHEADER_INCLUDE( qgspointcloudlayerelevationproperties.h );
-    SIP_TYPEHEADER_INCLUDE( qgsrasterlayerelevationproperties.h );
-    SIP_TYPEHEADER_INCLUDE( qgsvectorlayerelevationproperties.h );
-    SIP_TYPEHEADER_INCLUDE( qgsmeshlayerelevationproperties.h );
-    SIP_TYPEHEADER_INCLUDE( qgstiledscenelayerelevationproperties.h );
+    SIP_TYPEHEADER_INCLUDE( "qgspointcloudlayerelevationproperties.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsrasterlayerelevationproperties.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsvectorlayerelevationproperties.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsmeshlayerelevationproperties.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgstiledscenelayerelevationproperties.h" );
     Q_OBJECT
 
 #ifdef SIP_RUN
diff --git a/src/core/qgsmaplayerselectionproperties.h b/src/core/qgsmaplayerselectionproperties.h
index 1d2c8c114ae..ae719b7ca4c 100644
--- a/src/core/qgsmaplayerselectionproperties.h
+++ b/src/core/qgsmaplayerselectionproperties.h
@@ -36,7 +36,7 @@
  */
 class CORE_EXPORT QgsMapLayerSelectionProperties : public QObject
 {
-    SIP_TYPEHEADER_INCLUDE( qgsvectorlayerselectionproperties.h );
+    SIP_TYPEHEADER_INCLUDE( "qgsvectorlayerselectionproperties.h" );
 
     Q_OBJECT
 
diff --git a/src/core/qgsmaplayertemporalproperties.h b/src/core/qgsmaplayertemporalproperties.h
index bdb6bf2dd27..aa9f0573ced 100644
--- a/src/core/qgsmaplayertemporalproperties.h
+++ b/src/core/qgsmaplayertemporalproperties.h
@@ -42,9 +42,9 @@ class QgsDataProviderTemporalCapabilities;
  */
 class CORE_EXPORT QgsMapLayerTemporalProperties : public QgsTemporalProperty
 {
-    SIP_TYPEHEADER_INCLUDE( qgsrasterlayertemporalproperties.h );
-    SIP_TYPEHEADER_INCLUDE( qgsmeshlayertemporalproperties.h );
-    SIP_TYPEHEADER_INCLUDE( qgsvectorlayertemporalproperties.h );
+    SIP_TYPEHEADER_INCLUDE( "qgsrasterlayertemporalproperties.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsmeshlayertemporalproperties.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsvectorlayertemporalproperties.h" );
 
     Q_OBJECT
 
diff --git a/src/core/raster/qgsrasterinterface.h b/src/core/raster/qgsrasterinterface.h
index 4d78b622c17..e736de31eb8 100644
--- a/src/core/raster/qgsrasterinterface.h
+++ b/src/core/raster/qgsrasterinterface.h
@@ -135,22 +135,22 @@ class CORE_EXPORT QgsRasterBlockFeedback : public QgsFeedback
 class CORE_EXPORT QgsRasterInterface
 {
 // QgsRasterInterface subclasses
-    SIP_TYPEHEADER_INCLUDE( qgsbrightnesscontrastfilter.h );
-    SIP_TYPEHEADER_INCLUDE( qgshuesaturationfilter.h );
-    SIP_TYPEHEADER_INCLUDE( qgsrasterdataprovider.h );
-    SIP_TYPEHEADER_INCLUDE( qgsrasternuller.h );
-    SIP_TYPEHEADER_INCLUDE( qgsrasterprojector.h );
-    SIP_TYPEHEADER_INCLUDE( qgsrasterrenderer.h );
-    SIP_TYPEHEADER_INCLUDE( qgsrasterresamplefilter.h );
+    SIP_TYPEHEADER_INCLUDE( "qgsbrightnesscontrastfilter.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgshuesaturationfilter.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsrasterdataprovider.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsrasternuller.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsrasterprojector.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsrasterrenderer.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsrasterresamplefilter.h" );
 // QgsRasterRenderer subclasses
-    SIP_TYPEHEADER_INCLUDE( qgshillshaderenderer.h );
-    SIP_TYPEHEADER_INCLUDE( qgsmultibandcolorrenderer.h );
-    SIP_TYPEHEADER_INCLUDE( qgspalettedrasterrenderer.h );
-    SIP_TYPEHEADER_INCLUDE( qgssinglebandcolordatarenderer.h );
-    SIP_TYPEHEADER_INCLUDE( qgssinglebandgrayrenderer.h );
-    SIP_TYPEHEADER_INCLUDE( qgssinglebandpseudocolorrenderer.h );
-    SIP_TYPEHEADER_INCLUDE( qgsrastersinglecolorrenderer.h );
-    SIP_TYPEHEADER_INCLUDE( qgsrastercontourrenderer.h );
+    SIP_TYPEHEADER_INCLUDE( "qgshillshaderenderer.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsmultibandcolorrenderer.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgspalettedrasterrenderer.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgssinglebandcolordatarenderer.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgssinglebandgrayrenderer.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgssinglebandpseudocolorrenderer.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsrastersinglecolorrenderer.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgsrastercontourrenderer.h" );
 
 
 #ifdef SIP_RUN
diff --git a/src/core/raster/qgsrasterresampler.h b/src/core/raster/qgsrasterresampler.h
index 64e80306ea9..0de097b5b48 100644
--- a/src/core/raster/qgsrasterresampler.h
+++ b/src/core/raster/qgsrasterresampler.h
@@ -32,8 +32,8 @@ class QSize;
   */
 class CORE_EXPORT QgsRasterResampler
 {
-    SIP_TYPEHEADER_INCLUDE( qgsbilinearrasterresampler.h );
-    SIP_TYPEHEADER_INCLUDE( qgscubicrasterresampler.h );
+    SIP_TYPEHEADER_INCLUDE( "qgsbilinearrasterresampler.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgscubicrasterresampler.h" );
 
 
 #ifdef SIP_RUN
diff --git a/src/core/raster/qgsrastershaderfunction.h b/src/core/raster/qgsrastershaderfunction.h
index 7973a3e778e..f59d51d70bb 100644
--- a/src/core/raster/qgsrastershaderfunction.h
+++ b/src/core/raster/qgsrastershaderfunction.h
@@ -33,7 +33,7 @@ email                : ersts@amnh.org
 
 class CORE_EXPORT QgsRasterShaderFunction
 {
-    SIP_TYPEHEADER_INCLUDE( qgscolorrampshader.h );
+    SIP_TYPEHEADER_INCLUDE( "qgscolorrampshader.h" );
 
 
 #ifdef SIP_RUN
diff --git a/src/core/sensor/qgsabstractsensor.h b/src/core/sensor/qgsabstractsensor.h
index 4cb15afe72e..4da3a2622fd 100644
--- a/src/core/sensor/qgsabstractsensor.h
+++ b/src/core/sensor/qgsabstractsensor.h
@@ -32,8 +32,8 @@
  */
 class CORE_EXPORT QgsAbstractSensor : public QObject
 {
-    SIP_TYPEHEADER_INCLUDE( qgsiodevicesensor.h );
-    SIP_TYPEHEADER_INCLUDE( qgssensorregistry.h );
+    SIP_TYPEHEADER_INCLUDE( "qgsiodevicesensor.h" );
+    SIP_TYPEHEADER_INCLUDE( "qgssensorregistry.h" );
 
 
 #ifdef SIP_RUN
diff --git a/src/core/symbology/qgssymbollayer.h b/src/core/symbology/qgssymbollayer.h
index 4990348e015..71a42a80672 100644
--- a/src/core/symbology/qgssymbollayer.h
+++ b/src/core/symbology/qgssymbollayer.h
@@ -53,7 +53,7 @@ typedef QMap<QString, QString> QgsStringMap;
  */
 class CORE_EXPORT QgsSymbolLayer
 {
-    SIP_TYPEHEADER_INCLUDE( qgslinesymbollayer.h );
+    SIP_TYPEHEADER_INCLUDE( "qgslinesymbollayer.h" );
 
 
 #ifdef SIP_RUN