diff --git a/containers/std-over-boost b/containers/std-over-boost
new file mode 100644
index 0000000..d00e664
--- /dev/null
+++ b/containers/std-over-boost
@@ -0,0 +1,17 @@
+FROM ubuntu:20.04
+ENV DEBIAN_FRONTEND=noninteractive
+RUN \
+        apt update; \
+        apt -qqyy install build-essential git cmake libboost-all-dev
+
+
+# Calls for a random number to break the cahing of the git clone
+# (https://stackoverflow.com/questions/35134713/disable-cache-for-specific-run-commands/58801213#58801213)
+ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" /tmp/skipcache
+RUN git clone https://github.com/sehe/msghub --depth 1 -b std-over-boost
+
+WORKDIR /msghub
+
+RUN cmake . && make
+
+CMD ./test/tester -l all
diff --git a/src/msghub.cpp b/src/msghub.cpp
index 9c8f1f9..60fe4df 100644
--- a/src/msghub.cpp
+++ b/src/msghub.cpp
@@ -1,7 +1,5 @@
 #include "msghub.h"
 
-#include <boost/system/detail/error_code.hpp>
-#include <hub_error.h>
 #include <utility>
 
 #include "hubclient.h"