diff --git a/Android.mk b/Android.mk
index 6e61c1d..691baf4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,8 @@
 	-Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wno-long-long \
 	-Wfloat-equal -Wno-multichar -Wno-sign-compare -Wno-format-nonliteral \
 	-Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement \
-	-Wno-system-headers -DHAVE_CONFIG_H -DOS='$(version_string)' -Werror
+	-Wno-system-headers -DHAVE_CONFIG_H -DOS='$(version_string)' -Werror \
+	-DBUILDING_LIBCURL
 
 curl_includes := \
 	$(LOCAL_PATH)/include/ \
diff --git a/androidconfigure b/androidconfigure
index f6c1aea..d9f25f4 100755
--- a/androidconfigure
+++ b/androidconfigure
@@ -19,6 +19,7 @@
   "-isystem ${T}/external/libcxx/include"
   "-isystem ${T}/bionic/libc/include/"
   "-isystem ${T}/bionic/libc/arch-arm/include"
+  "-isystem ${T}/bionic/libc/kernel/android/uapi/"
   "-isystem ${T}/bionic/libc/kernel/uapi/"
   "-isystem ${T}/bionic/libc/kernel/uapi/asm-arm/"
   "-isystem ${T}/bionic/libm/include"
diff --git a/lib/curl_config.h b/lib/curl_config.h
index 0649de8..0288018 100644
--- a/lib/curl_config.h
+++ b/lib/curl_config.h
@@ -570,7 +570,7 @@
 /* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
 
 /* Define to 1 if you have the <sgtty.h> header file. */
-/* #undef HAVE_SGTTY_H */
+#define HAVE_SGTTY_H 1
 
 /* Define to 1 if you have the sigaction function. */
 #define HAVE_SIGACTION 1
@@ -714,7 +714,7 @@
 #define HAVE_SYS_UN_H 1
 
 /* Define to 1 if you have the <sys/utime.h> header file. */
-/* #undef HAVE_SYS_UTIME_H */
+#define HAVE_SYS_UTIME_H 1
 
 /* Define to 1 if you have the <sys/wait.h> header file. */
 #define HAVE_SYS_WAIT_H 1