6 files changed, 9 insertions, 5 deletions
diff --git a/modules/regex/doc_classes/RegEx.xml b/modules/regex/doc_classes/RegEx.xml
index 79c5bfe1b0..5770e7155e 100644
--- a/modules/regex/doc_classes/RegEx.xml
+++ b/modules/regex/doc_classes/RegEx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RegEx" inherits="RefCounted" version="4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="RegEx" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Class for searching text for patterns using regular expressions.
 	</brief_description>
diff --git a/modules/regex/doc_classes/RegExMatch.xml b/modules/regex/doc_classes/RegExMatch.xml
index fab51f1e6b..82182f0de5 100644
--- a/modules/regex/doc_classes/RegExMatch.xml
+++ b/modules/regex/doc_classes/RegExMatch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="RegExMatch" inherits="RefCounted" version="4.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="RegExMatch" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
 		Contains the results of a [RegEx] search.
 	</brief_description>
diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp
index 8d1e92b4e3..704c107f20 100644
--- a/modules/regex/regex.cpp
+++ b/modules/regex/regex.cpp
@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "regex.h"
+
 #include "core/os/memory.h"
 
 extern "C" {
diff --git a/modules/regex/regex.h b/modules/regex/regex.h
index 2ed20c9b14..13476d69de 100644
--- a/modules/regex/regex.h
+++ b/modules/regex/regex.h
@@ -33,7 +33,7 @@
 
 #include "core/object/ref_counted.h"
 #include "core/string/ustring.h"
-#include "core/templates/rb_map.h"
+#include "core/templates/hash_map.h"
 #include "core/templates/vector.h"
 #include "core/variant/array.h"
 #include "core/variant/dictionary.h"
diff --git a/modules/regex/register_types.cpp b/modules/regex/register_types.cpp
index 715e98a79a..9e3a296ce3 100644
--- a/modules/regex/register_types.cpp
+++ b/modules/regex/register_types.cpp
@@ -29,9 +29,11 @@
 /**************************************************************************/
 
 #include "register_types.h"
-#include "core/object/class_db.h"
+
 #include "regex.h"
 
+#include "core/object/class_db.h"
+
 void initialize_regex_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
 		return;
diff --git a/modules/regex/tests/test_regex.h b/modules/regex/tests/test_regex.h
index ac6192e373..6515d5d130 100644
--- a/modules/regex/tests/test_regex.h
+++ b/modules/regex/tests/test_regex.h
@@ -31,8 +31,9 @@
 #ifndef TEST_REGEX_H
 #define TEST_REGEX_H
 
+#include "../regex.h"
+
 #include "core/string/ustring.h"
-#include "modules/regex/regex.h"
 
 #include "tests/test_macros.h"