diff --git a/include/maxscale/buffer.hh b/include/maxscale/buffer.hh
index c6c1ac8cb..77e7dc2a5 100644
--- a/include/maxscale/buffer.hh
+++ b/include/maxscale/buffer.hh
@@ -15,11 +15,26 @@
 #include <maxscale/ccdefs.hh>
 #include <algorithm>
 #include <iterator>
+#include <memory>
 #include <new>
 #include <vector>
 #include <maxbase/assert.h>
 #include <maxscale/buffer.h>
 
+namespace std
+{
+
+template<>
+struct default_delete<GWBUF>
+{
+    void operator()(GWBUF* pBuffer)
+    {
+        gwbuf_free(pBuffer);
+    }
+};
+
+}
+
 namespace maxscale
 {