diff --git a/.gitmodules b/.gitmodules
index 4eb6395..80e8c2d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/Tasssadar/kexec-tools
 [submodule "adbd"]
 	path = adbd
-	url = https://github.com/Tasssadar/multirom_adbd.git
+	url = https://github.com/multirom-nexus6p/multirom_adbd.git
diff --git a/adbd b/adbd
index 8dd5490..d310c99 160000
--- a/adbd
+++ b/adbd
@@ -1 +1 @@
-Subproject commit 8dd5490b00b84f1d66555a2164a1a59d3f0a3dbe
+Subproject commit d310c996406baedfcbec5b6ad149e3442894575c
diff --git a/lib/containers.c b/lib/containers.c
index 2fec79c..f45f91f 100644
--- a/lib/containers.c
+++ b/lib/containers.c
@@ -15,6 +15,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "containers.h"
 #include "util.h"
diff --git a/lib/framebuffer.h b/lib/framebuffer.h
index a0ec8eb..2eeec95 100644
--- a/lib/framebuffer.h
+++ b/lib/framebuffer.h
@@ -21,6 +21,7 @@
 #include <linux/fb.h>
 #include <stdarg.h>
 #include <pthread.h>
+#include <string.h>
 
 #if defined(RECOVERY_BGRA) || defined(RECOVERY_RGBX)
 #define PIXEL_SIZE 4
diff --git a/lib/progressdots.c b/lib/progressdots.c
index 220939e..4f39e64 100644
--- a/lib/progressdots.c
+++ b/lib/progressdots.c
@@ -16,6 +16,7 @@
  */
 
 #include <unistd.h>
+#include <stdlib.h>
 
 #include "progressdots.h"
 #include "colors.h"
diff --git a/lib/util.c b/lib/util.c
index 37a0f74..b7bc754 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#define _GNU_SOURCE
 
 #include <stdarg.h>
 #include <stdlib.h>
@@ -23,7 +24,6 @@
 #include <errno.h>
 #include <time.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <cutils/android_reboot.h>
 #include <unistd.h>
 
diff --git a/multirom.h b/multirom.h
index 09462a2..5b310e0 100644
--- a/multirom.h
+++ b/multirom.h
@@ -20,6 +20,8 @@
 
 #include <pthread.h>
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 #include "lib/fstab.h"
 #include "lib/containers.h"
diff --git a/trampoline/adb.c b/trampoline/adb.c
index e2df45e..e00bc3c 100644
--- a/trampoline/adb.c
+++ b/trampoline/adb.c
@@ -27,7 +27,9 @@
 #include <sys/mount.h>
 #include <sys/klog.h>
 #include <linux/loop.h>
+#include <unistd.h>
 
+#include <fcntl.h>
 #include "adb.h"
 #include "../lib/util.h"
 #include "../lib/log.h"