diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp
index 8a8301c..c0596d1 100644
--- a/gpt-utils/Android.bp
+++ b/gpt-utils/Android.bp
@@ -32,7 +32,7 @@ cc_library {
     ],
     owner: "qti",
     header_libs: [
-        "device_kernel_headers",
+        "generated_kernel_headers",
     ],
     export_include_dirs: ["."],
 }
diff --git a/gpt-utils/gpt-utils.cpp b/gpt-utils/gpt-utils.cpp
index 7f04f42..ec1d4bb 100644
--- a/gpt-utils/gpt-utils.cpp
+++ b/gpt-utils/gpt-utils.cpp
@@ -32,7 +32,6 @@
 /******************************************************************************
  * INCLUDE SECTION
  ******************************************************************************/
-#include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
@@ -46,7 +45,6 @@
 #include <dirent.h>
 #include <inttypes.h>
 #include <linux/kernel.h>
-#include <asm/byteorder.h>
 #include <map>
 #include <vector>
 #include <string>