Merge branch 'master' into cwe407-hashset-shadow-index-12-defects

Author: russellballestrini

core/variant/type_info.h

@@ -32,8 +32,10 @@
 
 #pragma once
 
+#include "core/object/object.h"
 #include "core/templates/simple_type.h"
 #include "core/typedefs.h"
+#include "core/variant/variant.h"
 
 #include <type_traits>