Clean up some chaos in old code.

library/PlugLoad-linux.cpp

@@ -14,7 +14,7 @@
 #include <map>
 
 #include "DFHack.h"
-#include "Core.h"
+#include "PluginManager.h"
 #include "Hooks.h"
 #include <iostream>
 

library/PlugLoad-windows.cpp

@@ -28,7 +28,7 @@ distribution.
 #include <stdint.h>
 #include <vector>
 #include <string>
-#include "Core.h"
+#include "PluginManager.h"
 #include "Hooks.h"
 #include <stdio.h>
 

library/include/Core.h

@@ -65,12 +65,6 @@ namespace DFHack
     {
         class df_window;
     }
-    // anon type, pretty much
-    struct DFLibrary;
-
-    DFLibrary * OpenPlugin (const char * filename);
-    void * LookupPlugin (DFLibrary * plugin ,const char * function);
-    void ClosePlugin (DFLibrary * plugin);
 
     // Core is a singleton. Why? Because it is closely tied to SDL calls. It tracks the global state of DF.
     // There should never be more than one instance

library/include/PluginManager.h

@@ -35,7 +35,6 @@ distribution.
 
 typedef struct lua_State lua_State;
 
-struct DFLibrary;
 namespace tthread
 {
     class mutex;
@@ -53,6 +52,16 @@ namespace DFHack
     class RPCService;
     class function_identity_base;
 
+    // anon type, pretty much
+    struct DFLibrary;
+
+    // Open a plugin library
+    DFLibrary * OpenPlugin (const char * filename);
+    // find a symbol inside plugin
+    void * LookupPlugin (DFLibrary * plugin ,const char * function);
+    // Close a plugin library
+    void ClosePlugin (DFLibrary * plugin);
+
     enum state_change_event
     {
         SC_WORLD_LOADED,