3 files changed, 15 insertions, 5 deletions
diff --git a/modules/svg/image_loader_svg.cpp b/modules/svg/image_loader_svg.cpp
index 7fe2e589b1..dcb1f1d744 100644
--- a/modules/svg/image_loader_svg.cpp
+++ b/modules/svg/image_loader_svg.cpp
@@ -94,7 +94,7 @@ void ImageLoaderSVG::create_image_from_string(Ref<Image> p_image, String p_strin
 		ERR_FAIL_MSG("ImageLoaderSVG can't create image.");
 	}
 
-	res = sw_canvas->push(move(picture));
+	res = sw_canvas->push(std::move(picture));
 	if (res != tvg::Result::Success) {
 		memfree(buffer);
 		ERR_FAIL_MSG("ImageLoaderSVG can't create image.");
diff --git a/modules/svg/register_types.cpp b/modules/svg/register_types.cpp
index b59c815056..5b4d1d31ca 100644
--- a/modules/svg/register_types.cpp
+++ b/modules/svg/register_types.cpp
@@ -36,7 +36,11 @@
 
 static ImageLoaderSVG *image_loader_svg = nullptr;
 
-void register_svg_types() {
+void initialize_svg_module(ModuleInitializationLevel p_level) {
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
+		return;
+	}
+
 	tvg::CanvasEngine tvgEngine = tvg::CanvasEngine::Sw;
 	if (tvg::Initializer::init(tvgEngine, 1) != tvg::Result::Success) {
 		return;
@@ -45,7 +49,11 @@ void register_svg_types() {
 	ImageLoader::add_image_format_loader(image_loader_svg);
 }
 
-void unregister_svg_types() {
+void uninitialize_svg_module(ModuleInitializationLevel p_level) {
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
+		return;
+	}
+
 	if (!image_loader_svg) {
 		return;
 	}
diff --git a/modules/svg/register_types.h b/modules/svg/register_types.h
index 11fd9e7007..66f3e94600 100644
--- a/modules/svg/register_types.h
+++ b/modules/svg/register_types.h
@@ -31,7 +31,9 @@
 #ifndef SVG_REGISTER_TYPES_H
 #define SVG_REGISTER_TYPES_H
 
-void register_svg_types();
-void unregister_svg_types();
+#include "modules/register_module_types.h"
+
+void initialize_svg_module(ModuleInitializationLevel p_level);
+void uninitialize_svg_module(ModuleInitializationLevel p_level);
 
 #endif // SVG_REGISTER_TYPES_H