diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
index 25d2582208..bce33a73f3 100644
--- a/build/cmake/setup.h.in
+++ b/build/cmake/setup.h.in
@@ -609,6 +609,10 @@
 
 #cmakedefine01 wxUSE_LIBTIFF
 
+#cmakedefine01 wxUSE_NANOSVG
+
+#cmakedefine01 wxUSE_NANOSVG_EXTERNAL
+
 #cmakedefine01 wxUSE_TGA
 
 #cmakedefine01 wxUSE_GIF
diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h
index 3ecdb97159..66ce004571 100644
--- a/include/wx/android/setup.h
+++ b/include/wx/android/setup.h
@@ -1581,6 +1581,12 @@
 // Set to 1 for TIFF format support (requires libtiff)
 #define wxUSE_LIBTIFF       1
 
+// Set to 1 for SVG rasterizing support using nanosvg
+#define wxUSE_NANOSVG       1
+
+// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
+#define wxUSE_NANOSVG_EXTERNAL 0
+
 // Set to 1 for TGA format support (loading only)
 #define wxUSE_TGA           1
 
diff --git a/include/wx/gtk/setup.h b/include/wx/gtk/setup.h
index 88200afd17..e1b491e317 100644
--- a/include/wx/gtk/setup.h
+++ b/include/wx/gtk/setup.h
@@ -1582,6 +1582,12 @@
 // Set to 1 for TIFF format support (requires libtiff)
 #define wxUSE_LIBTIFF       1
 
+// Set to 1 for SVG rasterizing support using nanosvg
+#define wxUSE_NANOSVG       1
+
+// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
+#define wxUSE_NANOSVG_EXTERNAL 0
+
 // Set to 1 for TGA format support (loading only)
 #define wxUSE_TGA           1
 
diff --git a/include/wx/motif/setup.h b/include/wx/motif/setup.h
index d661e9f9c5..6ac6bf82de 100644
--- a/include/wx/motif/setup.h
+++ b/include/wx/motif/setup.h
@@ -1582,6 +1582,12 @@
 // Set to 1 for TIFF format support (requires libtiff)
 #define wxUSE_LIBTIFF       1
 
+// Set to 1 for SVG rasterizing support using nanosvg
+#define wxUSE_NANOSVG       1
+
+// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
+#define wxUSE_NANOSVG_EXTERNAL 0
+
 // Set to 1 for TGA format support (loading only)
 #define wxUSE_TGA           1
 
diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index 408ad55745..6a875dc179 100644
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -803,6 +803,13 @@
 // Recommended setting: 1 when building for Windows with WebView2 SDK
 #define wxUSE_WEBVIEW_EDGE 0
 
+// Use the Edge (Chromium) wxWebView backend without loader DLL
+//
+// Default is 0, set it to 1 if you don't want to depend on WebView2Loader.dll.
+//
+// Recommended setting: 0
+#define wxUSE_WEBVIEW_EDGE_STATIC 0
+
 // Use the WebKit wxWebView backend
 //
 // Default is 1 on GTK and OSX
@@ -1575,6 +1582,12 @@
 // Set to 1 for TIFF format support (requires libtiff)
 #define wxUSE_LIBTIFF       1
 
+// Set to 1 for SVG rasterizing support using nanosvg
+#define wxUSE_NANOSVG       1
+
+// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
+#define wxUSE_NANOSVG_EXTERNAL 0
+
 // Set to 1 for TGA format support (loading only)
 #define wxUSE_TGA           1
 
diff --git a/include/wx/osx/setup.h b/include/wx/osx/setup.h
index 8de661716d..edb835cc8c 100644
--- a/include/wx/osx/setup.h
+++ b/include/wx/osx/setup.h
@@ -1588,6 +1588,12 @@
 // Set to 1 for TIFF format support (requires libtiff)
 #define wxUSE_LIBTIFF       1
 
+// Set to 1 for SVG rasterizing support using nanosvg
+#define wxUSE_NANOSVG       1
+
+// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
+#define wxUSE_NANOSVG_EXTERNAL 0
+
 // Set to 1 for TGA format support (loading only)
 #define wxUSE_TGA           1
 
diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 27c15fc3ae..8b7a63c15f 100644
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -1578,6 +1578,12 @@
 // Set to 1 for TIFF format support (requires libtiff)
 #define wxUSE_LIBTIFF       1
 
+// Set to 1 for SVG rasterizing support using nanosvg
+#define wxUSE_NANOSVG       1
+
+// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
+#define wxUSE_NANOSVG_EXTERNAL 0
+
 // Set to 1 for TGA format support (loading only)
 #define wxUSE_TGA           1
 
diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index b8d760e012..1382b90bab 100644
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -1581,6 +1581,12 @@
 // Set to 1 for TIFF format support (requires libtiff)
 #define wxUSE_LIBTIFF       1
 
+// Set to 1 for SVG rasterizing support using nanosvg
+#define wxUSE_NANOSVG       1
+
+// Set to 1 to use external nanosvg library when wxUSE_NANOSVG is enabled
+#define wxUSE_NANOSVG_EXTERNAL 0
+
 // Set to 1 for TGA format support (loading only)
 #define wxUSE_TGA           1
 
diff --git a/setup.h.in b/setup.h.in
index dc8a214718..f76293bab4 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -609,6 +609,10 @@
 
 #define wxUSE_LIBTIFF       0
 
+#define wxUSE_NANOSVG       0
+
+#define wxUSE_NANOSVG_EXTERNAL 0
+
 #define wxUSE_TGA           0
 
 #define wxUSE_GIF           0