1diff --git a/contrib/android/block_range.c b/contrib/android/block_range.c 2index 0a068826c98c8ba3d5b490b9188202c261d4988b..5a45bca094c43b8fe9c1fb3817ae373c15b22387 100644 3--- a/contrib/android/block_range.c 4+++ b/contrib/android/block_range.c 5@@ -1,4 +1,6 @@ 6+#ifndef _GNU_SOURCE 7 #define _GNU_SOURCE 8+#endif 9 10 #include "block_range.h" 11 #include <stdio.h> 12diff --git a/contrib/android/e2fsdroid.c b/contrib/android/e2fsdroid.c 13index 1beb1e25bee8f1d4d33f1bf1b0e36064c567d544..622ad570f2eabc201e0e69cae4dc4ca86221dbd6 100644 14--- a/contrib/android/e2fsdroid.c 15+++ b/contrib/android/e2fsdroid.c 16@@ -1,4 +1,6 @@ 17+#ifndef _GNU_SOURCE 18 #define _GNU_SOURCE 19+#endif 20 21 #include <stdio.h> 22 #include <getopt.h> 23diff --git a/contrib/android/perms.c b/contrib/android/perms.c 24index 680d348e38e9374c2352dc66633132b95fe867fd..bfe06ca365682d4a508dd1634860a9abcf2c6c4b 100644 25--- a/contrib/android/perms.c 26+++ b/contrib/android/perms.c 27@@ -3,6 +3,7 @@ 28 #endif 29 #include "perms.h" 30 #include "support/nls-enable.h" 31+#include <linux/capability.h> 32 #include <time.h> 33 #include <sys/stat.h> 34 35diff --git a/misc/blkid.c b/misc/blkid.c 36index 472f0179ee99ba28c51c2ce48561394482da753b..e46efc707daaf5867bea6cd415b9637e6c5bba61 100644 37--- a/misc/blkid.c 38+++ b/misc/blkid.c 39@@ -17,6 +17,7 @@ 40 #ifdef HAVE_TERMIOS_H 41 #include <termios.h> 42 #endif 43+#undef HAVE_TERMIO_H 44 #ifdef HAVE_TERMIO_H 45 #include <termio.h> 46 #endif 47