diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca6b52799..a353495b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
 endif()
 
 # set up versioning.
-set(DF_VERSION "0.40.12")
+set(DF_VERSION "0.40.13")
 SET(DFHACK_RELEASE "r1" CACHE STRING "Current release revision.")
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/library/xml b/library/xml
index 08064793c..93606b34b 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 08064793ceb3d54e8e1fdeb73c550e19ba886e5c
+Subproject commit 93606b34b78a94b201704adb5c9ae28af304cdb1
diff --git a/plugins/add-spatter.cpp b/plugins/add-spatter.cpp
index b915845fb..52e95e88b 100644
--- a/plugins/add-spatter.cpp
+++ b/plugins/add-spatter.cpp
@@ -31,7 +31,7 @@
 #include "df/reaction_product_item_improvementst.h"
 #include "df/reaction_product_improvement_flags.h"
 #include "df/matter_state.h"
-#include "df/contaminant.h"
+#include "df/spatter.h"
 
 #include "MiscUtils.h"
 
diff --git a/plugins/cleaners.cpp b/plugins/cleaners.cpp
index 665be447b..ab1ccda2b 100644
--- a/plugins/cleaners.cpp
+++ b/plugins/cleaners.cpp
@@ -7,13 +7,11 @@
 #include "DataDefs.h"
 #include "df/item_actual.h"
 #include "df/unit.h"
-#include "df/unit_spatter.h"
+#include "df/spatter.h"
 #include "df/matter_state.h"
 #include "df/global_objects.h"
 #include "df/builtin_mats.h"
-#include "df/contaminant.h"
 #include "df/plant.h"
-#include "df/plant_spatter.h"
 
 using std::vector;
 using std::string;
@@ -91,7 +89,7 @@ command_result cleanitems (color_ostream &out)
         df::item_actual *item = (df::item_actual *)world->items.all[i];
         if (item->contaminants && item->contaminants->size())
         {
-            std::vector<df::contaminant*> saved;
+            std::vector<df::spatter*> saved;
             for (size_t j = 0; j < item->contaminants->size(); j++)
             {
                 auto obj = (*item->contaminants)[j];
diff --git a/plugins/tweak.cpp b/plugins/tweak.cpp
index 819639e1a..1e114fc43 100644
--- a/plugins/tweak.cpp
+++ b/plugins/tweak.cpp
@@ -47,7 +47,7 @@
 #include "df/item_barst.h"
 #include "df/item_threadst.h"
 #include "df/item_clothst.h"
-#include "df/contaminant.h"
+#include "df/spatter.h"
 #include "df/layer_object.h"
 #include "df/reaction.h"
 #include "df/reaction_reagent_itemst.h"