diff --git a/extension.json b/extension.json
index 605cde27..32ad0585 100644
--- a/extension.json
+++ b/extension.json
@@ -66,7 +66,9 @@
 		"gadgets-definition"
 	],
 	"AutoloadClasses": {
+		"Gadget": "includes/Gadget.php",
 		"GadgetRepo": "includes/GadgetRepo.php",
+		"MediaWiki\\Extension\\Gadgets\\Gadget": "includes/Gadget.php",
 		"MediaWiki\\Extension\\Gadgets\\GadgetRepo": "includes/GadgetRepo.php"
 	},
 	"AutoloadNamespaces": {
diff --git a/includes/Gadget.php b/includes/Gadget.php
index de4c0fc8..e99f78a2 100644
--- a/includes/Gadget.php
+++ b/includes/Gadget.php
@@ -417,3 +417,5 @@ class Gadget {
 		return 'general';
 	}
 }
+
+class_alias( Gadget::class, 'Gadget' );