diff --git a/core/Utils.hpp b/core/Utils.hpp
index 6d7b3078e..973b002f4 100644
--- a/core/Utils.hpp
+++ b/core/Utils.hpp
@@ -19,6 +19,8 @@
 #include <utility>
 #include <algorithm>
 #include <memory>
+#include <stdint.h>
+#include <stddef.h>
 
 namespace ZeroTier {
 
diff --git a/core/zerotier.h b/core/zerotier.h
index e6e189697..e429e6a66 100644
--- a/core/zerotier.h
+++ b/core/zerotier.h
@@ -27,9 +27,10 @@
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#endif
+
 #include <stdint.h>
 #include <stdlib.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dockerbuild/Dockerfile.ubuntu-xenial b/dockerbuild/Dockerfile.ubuntu-xenial
index 4d371ca37..0798a44d3 100644
--- a/dockerbuild/Dockerfile.ubuntu-xenial
+++ b/dockerbuild/Dockerfile.ubuntu-xenial
@@ -7,10 +7,10 @@ RUN apt-get update && apt-get -y install build-essential curl ca-certificates de
 RUN curl -s -k $go_pkg_url -o go.tar.gz && \
     tar -C /usr/local -xzf go.tar.gz && \
     rm go.tar.gz
-RUN curl -s -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \
-    chmod +x cmake.sh && \
-    ./cmake.sh --skip-license --exclude-subdir && \
-    rm cmake.sh
+RUN curl -s -k -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz -o cmake-3.17.3.tar.gz && tar -xzf cmake-3.17.3.tar.gz
+WORKDIR /cmake-3.17.3
+RUN ./bootstrap && make -j8 && make install
+WORKDIR /
 
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
diff --git a/dockerbuild/Dockerfile.ubuntu-xenial-x64 b/dockerbuild/Dockerfile.ubuntu-xenial-x64
new file mode 100644
index 000000000..4d371ca37
--- /dev/null
+++ b/dockerbuild/Dockerfile.ubuntu-xenial-x64
@@ -0,0 +1,19 @@
+FROM ubuntu:xenial-20200114
+
+ARG go_pkg_url
+
+RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd
+
+RUN curl -s -k $go_pkg_url -o go.tar.gz && \
+    tar -C /usr/local -xzf go.tar.gz && \
+    rm go.tar.gz
+RUN curl -s -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh -o cmake.sh && \
+    chmod +x cmake.sh && \
+    ./cmake.sh --skip-license --exclude-subdir && \
+    rm cmake.sh
+
+
+RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
+RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
+CMD ["/usr/bin/sshd", "-D"]
+
diff --git a/dockerbuild/Makefile b/dockerbuild/Makefile
index e566c74dc..cb54f9bc6 100644
--- a/dockerbuild/Makefile
+++ b/dockerbuild/Makefile
@@ -82,7 +82,7 @@ ubuntu-trusty:
 	@docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-ppc64le.tar.gz" --platform linux/ppc64le -f Dockerfile.ubuntu-trusty . -t ztbuild/ubuntu-trusty-ppc64le --load
 
 ubuntu-xenial:
-	@docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.ubuntu-xenial . -t ztbuild/ubuntu-xenial-amd64 --load
+	@docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" --platform linux/amd64 -f Dockerfile.ubuntu-xenial-x64 . -t ztbuild/ubuntu-xenial-amd64 --load
 	@docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz" --platform linux/arm64 -f Dockerfile.ubuntu-xenial . -t ztbuild/ubuntu-xenial-arm64 --load
 	@docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz" --platform linux/arm/v7 -f Dockerfile.ubuntu-xenial . -t ztbuild/ubuntu-xenial-armhf --load
 	@docker buildx build --build-arg go_pkg_url="https://dl.google.com/go/go${GO_VERSION}.linux-386.tar.gz" --platform linux/386 -f Dockerfile.ubuntu-xenial . -t ztbuild/ubuntu-xenial-i386 --load