diff --git a/Android.mk b/Android.mk
index 36f562f..ab79031 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,6 @@
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
 
-LOCAL_CPP_EXTENSION := .cc
-
-LOCAL_SRC_FILES := \
+sgdisk_src_files := \
     sgdisk.cc \
     gptcl.cc \
     crc32.cc \
@@ -21,9 +18,29 @@ LOCAL_SRC_FILES := \
     diskio-unix.cc \
     android_popt.cc \
 
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib
+LOCAL_SRC_FILES := $(sgdisk_src_files)
+
 LOCAL_SHARED_LIBRARIES := libext2_uuid
 
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := sgdisk
 
 include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cc
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib
+LOCAL_SRC_FILES := $(sgdisk_src_files)
+
+LOCAL_SHARED_LIBRARIES := libext2_uuid_host
+
+LOCAL_MODULE := sgdisk_host
+LOCAL_MODULE_STEM := sgdisk
+
+include $(BUILD_HOST_EXECUTABLE)
diff --git a/android_popt.cc b/android_popt.cc
index c5f94d6..a1492c6 100644
--- a/android_popt.cc
+++ b/android_popt.cc
@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#include "android_popt.h"
+#include <popt.h>
 
 // #define LOCAL_DEBUG
 
diff --git a/gptcl.h b/gptcl.h
index 3936887..610ca5f 100644
--- a/gptcl.h
+++ b/gptcl.h
@@ -23,11 +23,7 @@
 #define __GPTCL_H
 
 #include "gpt.h"
-#ifdef __ANDROID__
-#include "android_popt.h"
-#else
 #include <popt.h>
-#endif
 
 using namespace std;
 
diff --git a/guid.h b/guid.h
index 7fd0d46..229d5bd 100644
--- a/guid.h
+++ b/guid.h
@@ -26,11 +26,7 @@
    #endif
 typedef unsigned char my_uuid_t[16];
 #else // Not Windows
-#ifdef __ANDROID__
-#include <uuid.h>
-#else
 #include <uuid/uuid.h>
-#endif
 typedef uuid_t my_uuid_t;
 #endif
 
diff --git a/android_popt.h b/popt.h
similarity index 100%
rename from android_popt.h
rename to popt.h