diff --git a/binding_generator.py b/binding_generator.py
index 54c56f2d..60dfb7a2 100644
--- a/binding_generator.py
+++ b/binding_generator.py
@@ -131,7 +131,7 @@ def generate_class_header(used_classes, c):
 
     source.append("\n\t// enums")
     for enum in c["enums"]:
-        source.append("\tenum " + strip_name(enum["name"]) + " {")
+        source.append("\tenum class " + strip_name(enum["name"]) + " {")
         for value in enum["values"]:
             source.append("\t\t" + remove_nested_type_prefix(value) + " = " + str(enum["values"][value]) + ",")
             enum_values.append(value)
diff --git a/include/core/Defs.hpp b/include/core/Defs.hpp
index f8c76d3e..4b73cfa5 100644
--- a/include/core/Defs.hpp
+++ b/include/core/Defs.hpp
@@ -4,7 +4,7 @@
 
 namespace godot {
 
-enum Error {
+enum class Error {
 	OK,
 	FAILED, ///< Generic fail error
 	ERR_UNAVAILABLE, ///< What is requested is unsupported/unavailable