diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 7ed7a46ed..465a68eb1 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -96,7 +96,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
     dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua)
     dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
-    dfhack_plugin(buildingplan buildingplan.cpp buildingplan-planner.cpp buildingplan-rooms.cpp LINK_LIBRARIES lua)
+    add_subdirectory(buildingplan)
     dfhack_plugin(changeitem changeitem.cpp)
     dfhack_plugin(changelayer changelayer.cpp)
     dfhack_plugin(changevein changevein.cpp)
diff --git a/plugins/buildingplan/CMakeLists.txt b/plugins/buildingplan/CMakeLists.txt
new file mode 100644
index 000000000..1d34b169a
--- /dev/null
+++ b/plugins/buildingplan/CMakeLists.txt
@@ -0,0 +1,11 @@
+project(buildingplan)
+
+set(COMMON_HDRS
+    buildingplan.h
+    buildingplan-planner.h
+    buildingplan-rooms.h
+)
+set_source_files_properties(${COMMON_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
+
+dfhack_plugin(buildingplan buildingplan.cpp buildingplan-planner.cpp
+    buildingplan-rooms.cpp ${COMMON_HDRS} LINK_LIBRARIES lua)
diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan/buildingplan-planner.cpp
similarity index 99%
rename from plugins/buildingplan-planner.cpp
rename to plugins/buildingplan/buildingplan-planner.cpp
index 9e754742d..4ac11c4e1 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan/buildingplan-planner.cpp
@@ -13,7 +13,7 @@
 #include "modules/Job.h"
 
 #include "LuaTools.h"
-#include "uicommon.h"
+#include "../uicommon.h"
 
 #include "buildingplan.h"
 
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan/buildingplan-planner.h
similarity index 100%
rename from plugins/buildingplan-planner.h
rename to plugins/buildingplan/buildingplan-planner.h
diff --git a/plugins/buildingplan-rooms.cpp b/plugins/buildingplan/buildingplan-rooms.cpp
similarity index 100%
rename from plugins/buildingplan-rooms.cpp
rename to plugins/buildingplan/buildingplan-rooms.cpp
diff --git a/plugins/buildingplan-rooms.h b/plugins/buildingplan/buildingplan-rooms.h
similarity index 100%
rename from plugins/buildingplan-rooms.h
rename to plugins/buildingplan/buildingplan-rooms.h
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan/buildingplan.cpp
similarity index 99%
rename from plugins/buildingplan.cpp
rename to plugins/buildingplan/buildingplan.cpp
index 1e1866ddd..e0bc6dd69 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan/buildingplan.cpp
@@ -12,8 +12,8 @@
 #include "LuaTools.h"
 #include "PluginManager.h"
 
-#include "uicommon.h"
-#include "listcolumn.h"
+#include "../uicommon.h"
+#include "../listcolumn.h"
 #include "buildingplan.h"
 
 DFHACK_PLUGIN("buildingplan");
diff --git a/plugins/buildingplan.h b/plugins/buildingplan/buildingplan.h
similarity index 100%
rename from plugins/buildingplan.h
rename to plugins/buildingplan/buildingplan.h