diff --git a/thermal-engine/Android.mk b/thermal-engine/Android.mk
index bcb5423..511e8dc 100644
--- a/thermal-engine/Android.mk
+++ b/thermal-engine/Android.mk
@@ -1,9 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
-
-LOCAL_MODULE:=thermal-engine
-
-LOCAL_EXPORT_C_INCLUDE_DIRS:=$(LOCAL_PATH)
-
-include $(BUILD_HEADER_LIBRARY)
+LOCAL_COPY_HEADERS_TO := thermal-engine
+LOCAL_COPY_HEADERS := ./thermal_client.h
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_COPY_HEADERS)
diff --git a/thermal-engine/thermal_client.h b/thermal-engine/thermal_client.h
index dda35ff..a8fbce3 100644
--- a/thermal-engine/thermal_client.h
+++ b/thermal-engine/thermal_client.h
@@ -48,10 +48,9 @@ enum supported_fields {
 	THRESHOLDS_CLR_FIELD = 0x8,
 	SET_POINT_CLR_FIELD = THRESHOLDS_CLR_FIELD,
 	ACTION_INFO_FIELD = 0x10,
- 	UPPER_LIMIT_FIELD = ACTION_INFO_FIELD,
- 	LOWER_LIMIT_FIELD = 0x20,
- 	PASSIVE_DELAY_FIELD = 0x40,
-
+	UPPER_LIMIT_FIELD = ACTION_INFO_FIELD,
+	LOWER_LIMIT_FIELD = 0x20,
+	PASSIVE_DELAY_FIELD = 0x40,
 	SUPPORTED_FIELD_MAX = 0x80,
 };