diff --git a/library/Core.cpp b/library/Core.cpp
index 4472fe9f4..47bddbab8 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -429,14 +429,37 @@ command_result Core::runCommand(color_ostream &out, const std::string &command)
         return CR_NOT_IMPLEMENTED;
 }
 
+// List of built in commands
+static const std::set<std::string> built_in_commands = {
+    "ls" ,
+    "help" ,
+    "type" ,
+    "load" ,
+    "unload" ,
+    "reload" ,
+    "enable" ,
+    "disable" ,
+    "plug" ,
+    "keybinding" ,
+    "alias" ,
+    "fpause" ,
+    "cls" ,
+    "die" ,
+    "kill-lua" ,
+    "script" ,
+    "hide" ,
+    "show" ,
+    "sc-script"
+};
+
 static bool try_autocomplete(color_ostream &con, const std::string &first, std::string &completed)
 {
     std::vector<std::string> possible;
 
     // Check for possible built in commands to autocomplete first
-    for (auto iter = built_in_commands.begin(); iter != built_in_commands.end(); ++iter)
-        if (iter->substr(0, first.size()) == first)
-            possible.push_back(*iter);
+    for (auto const &command : built_in_commands)
+        if (command.substr(0, first.size()) == first)
+            possible.push_back(command);
 
     auto plug_mgr = Core::getInstance().getPluginManager();
     for (auto it = plug_mgr->begin(); it != plug_mgr->end(); ++it)
diff --git a/library/include/Core.h b/library/include/Core.h
index ef90550b4..fa65645a1 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -30,7 +30,6 @@ distribution.
 #include <vector>
 #include <stack>
 #include <map>
-#include <set>
 #include <stdint.h>
 #include "Console.h"
 #include "modules/Graphic.h"
@@ -85,29 +84,6 @@ namespace DFHack
         SC_UNPAUSED = 8
     };
 
-    // List of built in commands
-    const std::set<std::string> built_in_commands = {
-        "ls" ,
-        "help" ,
-        "type" ,
-        "load" ,
-        "unload" ,
-        "reload" ,
-        "enable" ,
-        "disable" ,
-        "plug" ,
-        "keybinding" ,
-        "alias" ,
-        "fpause" ,
-        "cls" ,
-        "die" ,
-        "kill-lua" ,
-        "script" ,
-        "hide" ,
-        "show" ,
-        "sc-script"
-    };
-
     class DFHACK_EXPORT StateChangeScript
     {
     public: