diff --git a/library/include/Core.h b/library/include/Core.h
index 92bf63d93..a574b029a 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -72,6 +72,17 @@ namespace DFHack
         struct Hide;
     }
 
+    enum command_result
+    {
+        CR_LINK_FAILURE = -3,    // RPC call failed due to I/O or protocol error
+        CR_NEEDS_CONSOLE = -2,   // Attempt to call interactive command without console
+        CR_NOT_IMPLEMENTED = -1, // Command not implemented, or plugin not loaded
+        CR_OK = 0,               // Success
+        CR_FAILURE = 1,          // Failure
+        CR_WRONG_USAGE = 2,      // Wrong arguments or ui state
+        CR_NOT_FOUND = 3         // Target object not found (for RPC mainly)
+    };
+
     enum state_change_event
     {
         SC_UNKNOWN = -1,
diff --git a/library/include/Export.h b/library/include/Export.h
index ad2b4ceec..9e2a78d4b 100644
--- a/library/include/Export.h
+++ b/library/include/Export.h
@@ -69,17 +69,3 @@ distribution.
 #else
     #define Wformat(type, fmtstr, vararg)
 #endif
-
-namespace  DFHack
-{
-    enum command_result
-    {
-        CR_LINK_FAILURE = -3,    // RPC call failed due to I/O or protocol error
-        CR_NEEDS_CONSOLE = -2,   // Attempt to call interactive command without console
-        CR_NOT_IMPLEMENTED = -1, // Command not implemented, or plugin not loaded
-        CR_OK = 0,               // Success
-        CR_FAILURE = 1,          // Failure
-        CR_WRONG_USAGE = 2,      // Wrong arguments or ui state
-        CR_NOT_FOUND = 3         // Target object not found (for RPC mainly)
-    };
-}
diff --git a/library/include/RemoteClient.h b/library/include/RemoteClient.h
index 17e296a2e..921d351c3 100644
--- a/library/include/RemoteClient.h
+++ b/library/include/RemoteClient.h
@@ -26,6 +26,7 @@ distribution.
 #include "Pragma.h"
 #include "Export.h"
 #include "ColorText.h"
+#include "Core.h"
 
 class CPassiveSocket;
 class CActiveSocket;