diff --git a/library/DataIdentity.cpp b/library/DataIdentity.cpp
index 8e9467c5b..767724931 100644
--- a/library/DataIdentity.cpp
+++ b/library/DataIdentity.cpp
@@ -47,7 +47,10 @@ namespace df {
     STL_OPAQUE_IDENTITY_TRAITS(condition_variable);
     STL_OPAQUE_IDENTITY_TRAITS(fstream);
     STL_OPAQUE_IDENTITY_TRAITS(mutex);
+    STL_OPAQUE_IDENTITY_TRAITS(shared_ptr<df::widget>);
     STL_OPAQUE_IDENTITY_TRAITS(future<void>);
+    STL_OPAQUE_IDENTITY_TRAITS(function<void()>);
+    STL_OPAQUE_IDENTITY_TRAITS(optional<std::function<void()> >);
 
     buffer_container_identity buffer_container_identity::base_instance;
 }
diff --git a/library/include/DataIdentity.h b/library/include/DataIdentity.h
index 07e85e8a8..4f275b854 100644
--- a/library/include/DataIdentity.h
+++ b/library/include/DataIdentity.h
@@ -30,6 +30,7 @@ distribution.
 #include <string>
 #include <vector>
 #include <future>
+#include <optional>
 
 #include "DataDefs.h"
 
@@ -38,6 +39,10 @@ namespace std {
     class mutex;
 };
 
+namespace df {
+    class widget;
+}
+
 /*
  * Definitions of DFHack namespace structs used by generated headers.
  */
@@ -573,6 +578,9 @@ namespace df
     OPAQUE_IDENTITY_TRAITS(std::fstream);
     OPAQUE_IDENTITY_TRAITS(std::mutex);
     OPAQUE_IDENTITY_TRAITS(std::future<void>);
+    OPAQUE_IDENTITY_TRAITS(std::shared_ptr<df::widget>);
+    OPAQUE_IDENTITY_TRAITS(std::function<void()>);
+    OPAQUE_IDENTITY_TRAITS(std::optional<std::function<void()> >);
 
     template<> struct DFHACK_EXPORT identity_traits<bool> {
         static bool_identity identity;