diff --git a/plugins/labormanager/CMakeLists.txt b/plugins/labormanager/CMakeLists.txt
index e5abb8c39..8e9e28b81 100644
--- a/plugins/labormanager/CMakeLists.txt
+++ b/plugins/labormanager/CMakeLists.txt
@@ -2,12 +2,12 @@ PROJECT (labormanager)
 # A list of source files
 SET(PROJECT_SRCS
     labormanager.cpp
-    labormanager_joblabormapper.cpp
+    joblabormapper.cpp
 )
 # A list of headers
 SET(PROJECT_HDRS
     labormanager.h
-    labormanager_joblabormapper.h
+    joblabormapper.h
 )
 SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
 
diff --git a/plugins/labormanager/labormanager_joblabormapper.cpp b/plugins/labormanager/joblabormapper.cpp
similarity index 99%
rename from plugins/labormanager/labormanager_joblabormapper.cpp
rename to plugins/labormanager/joblabormapper.cpp
index c3e21c962..051331137 100644
--- a/plugins/labormanager/labormanager_joblabormapper.cpp
+++ b/plugins/labormanager/joblabormapper.cpp
@@ -60,7 +60,7 @@ using df::global::ui;
 using df::global::world;
 
 #include "labormanager.h"
-#include "labormanager_joblabormapper.h"
+#include "joblabormapper.h"
 
 static df::unit_labor hauling_labor_map[] =
 {
@@ -635,6 +635,7 @@ JobLaborMapper::~JobLaborMapper()
         }
         job_to_labor_table[j] = 0;
     }
+
 }
 
 JobLaborMapper::JobLaborMapper()
diff --git a/plugins/labormanager/labormanager_joblabormapper.h b/plugins/labormanager/joblabormapper.h
similarity index 66%
rename from plugins/labormanager/labormanager_joblabormapper.h
rename to plugins/labormanager/joblabormapper.h
index adde5c340..37d405f54 100644
--- a/plugins/labormanager/labormanager_joblabormapper.h
+++ b/plugins/labormanager/joblabormapper.h
@@ -1,5 +1,16 @@
 #pragma once
 
+#include <map>
+
+#include <Core.h>
+
+using namespace DFHack;
+using namespace df::enums;
+
+#include "df/job.h"
+#include "df/job_type.h"
+#include "df/unit_labor.h"
+
 
 class jlfunc;
 
diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp
index f791fe398..5fb8dc60e 100644
--- a/plugins/labormanager/labormanager.cpp
+++ b/plugins/labormanager/labormanager.cpp
@@ -69,7 +69,7 @@
 #include <df/general_ref_contains_itemst.h>
 
 #include "labormanager.h"
-#include "labormanager_joblabormapper.h"
+#include "joblabormapper.h"
 
 using namespace std;
 using std::string;