diff --git a/include/amqpcpp/fieldproxy.h b/include/amqpcpp/fieldproxy.h
index a122f76..91ab004 100644
--- a/include/amqpcpp/fieldproxy.h
+++ b/include/amqpcpp/fieldproxy.h
@@ -19,6 +19,7 @@
 #include "booleanset.h"
 #include "decimalfield.h"
 #include "numericfield.h"
+#include "voidfield.h"
 
 /**
  *  Set up namespace
diff --git a/include/amqpcpp/table.h b/include/amqpcpp/table.h
index edc1e5f..ebc30e8 100644
--- a/include/amqpcpp/table.h
+++ b/include/amqpcpp/table.h
@@ -138,6 +138,7 @@ public:
     Table &set(const std::string &name, int64_t value) { return set(name, LongLong(value)); }
     Table &set(const std::string &name, const std::string &value) { return set(name, LongString(value)); }
     Table &set(const std::string &name, const char *value) { return set(name, LongString(std::string(value))); }
+    Table &set(const std::string &name, nullptr_t) { return set(name, VoidField()); }
 
     /**
      *  Is a certain field set in the table
diff --git a/src/includes.h b/src/includes.h
index 991521e..ec90975 100644
--- a/src/includes.h
+++ b/src/includes.h
@@ -53,10 +53,10 @@
 #include "amqpcpp/decimalfield.h"
 #include "amqpcpp/stringfield.h"
 #include "amqpcpp/booleanset.h"
+#include "amqpcpp/voidfield.h"
 #include "amqpcpp/fieldproxy.h"
 #include "amqpcpp/table.h"
 #include "amqpcpp/array.h"
-#include "amqpcpp/voidfield.h"
 
 // envelope for publishing and consuming
 #include "amqpcpp/metadata.h"