diff --git a/usr.bin/dtc/HACKING b/usr.bin/dtc/HACKING
index 9acaeef5bfc..d90e0f5693b 100644
--- a/usr.bin/dtc/HACKING
+++ b/usr.bin/dtc/HACKING
@@ -8,9 +8,9 @@ This file contains some notes for people wishing to hack on dtc.
 Upstreaming
 -----------
 
-This code is developed in the FreeBSD svn repository:
+This code is developed in the git repository:
 
-https://svn.freebsd.org/base/head/usr.bin/dtc
+https://github.com/davidchisnall/dtc
 
 If you got the source from anywhere else and wish to make changes, please
 ensure that you are working against the latest version, or you may end up
diff --git a/usr.bin/dtc/string.cc b/usr.bin/dtc/string.cc
index 71a304a2ea2..c5acb82687e 100644
--- a/usr.bin/dtc/string.cc
+++ b/usr.bin/dtc/string.cc
@@ -36,6 +36,7 @@
 #include <functional>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <ctype.h>
 #include <libgen.h>
 
diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh
index 337685ef3f4..84646b444b3 100644
--- a/usr.bin/dtc/util.hh
+++ b/usr.bin/dtc/util.hh
@@ -35,6 +35,9 @@
 #ifndef _UTIL_HH_
 #define _UTIL_HH_
 
+#include <memory>
+#include <stdint.h>
+#include <string>
 #include <vector>
 
 // If we aren't using C++11, then just ignore static asserts.