diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index 218e254..4abfd53 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -15,6 +15,8 @@
  *
  */
 
+#include <string.h>
+
 #include "if-main.h"
 #include "terminal.h"
 #include "../hal-utils.h"
diff --git a/android/client/if-gatt.c b/android/client/if-gatt.c
index f021a8b..d593022 100644
--- a/android/client/if-gatt.c
+++ b/android/client/if-gatt.c
@@ -17,6 +17,8 @@
 
 #include <stdbool.h>
 
+#include <string.h>
+
 #include <hardware/bluetooth.h>
 
 #include "../hal-utils.h"
diff --git a/android/client/if-hh.c b/android/client/if-hh.c
index df3fd30..b2bf8ca 100644
--- a/android/client/if-hh.c
+++ b/android/client/if-hh.c
@@ -17,6 +17,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 
 #include <hardware/bluetooth.h>
 #include <hardware/bt_hh.h>
diff --git a/android/client/if-hl.c b/android/client/if-hl.c
index a3c351c..e0818ba 100644
--- a/android/client/if-hl.c
+++ b/android/client/if-hl.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <string.h>
 
 #include <hardware/bluetooth.h>
 #include <hardware/bt_hl.h>
diff --git a/android/client/if-pan.c b/android/client/if-pan.c
index bdb36cc..6207f6e 100644
--- a/android/client/if-pan.c
+++ b/android/client/if-pan.c
@@ -15,8 +15,6 @@
  *
  */
 
-#include <hardware/bluetooth.h>
-
 #include "if-main.h"
 #include "../hal-utils.h"
 
diff --git a/android/client/if-rc.c b/android/client/if-rc.c
index afd90a3..ed65600 100644
--- a/android/client/if-rc.c
+++ b/android/client/if-rc.c
@@ -17,6 +17,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 
 #include <hardware/bluetooth.h>
 #include <hardware/bt_hh.h>
diff --git a/android/client/if-sock.c b/android/client/if-sock.c
index 20a1fc8..ee2c1e8 100644
--- a/android/client/if-sock.c
+++ b/android/client/if-sock.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <string.h>
 
 #include "if-main.h"
 #include "pollhandler.h"
diff --git a/android/client/tabcompletion.c b/android/client/tabcompletion.c
index cf3fd80..bcca5fa 100644
--- a/android/client/tabcompletion.c
+++ b/android/client/tabcompletion.c
@@ -17,6 +17,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include "if-main.h"
 #include "terminal.h"