diff --git a/libgenlock/Android.mk b/libgenlock/Android.mk
index d8a3dfe..2ac565e 100644
--- a/libgenlock/Android.mk
+++ b/libgenlock/Android.mk
@@ -4,12 +4,15 @@ include $(CLEAR_VARS)
 LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
 LOCAL_SHARED_LIBRARIES := liblog libcutils
-LOCAL_C_INCLUDES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_C_INCLUDES += hardware/qcom/display/libgralloc
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 LOCAL_SRC_FILES := genlock.cpp
 LOCAL_CFLAGS:= -DLOG_TAG=\"libgenlock\"
 LOCAL_MODULE_TAGS := optional
+
+ifeq ($(BOARD_USES_GENLOCK),true)
+	LOCAL_CFLAGS += -DUSE_GENLOCK
+endif
+
 LOCAL_MODULE := libgenlock
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/libgenlock/genlock.cpp b/libgenlock/genlock.cpp
index 37bcc0e..2aa709a 100644
--- a/libgenlock/genlock.cpp
+++ b/libgenlock/genlock.cpp
@@ -38,10 +38,6 @@
 
 #define GENLOCK_DEVICE "/dev/genlock"
 
-#ifndef USE_GENLOCK
-#define USE_GENLOCK
-#endif
-
 namespace {
     /* Internal function to map the userspace locks to the kernel lock types */
     int get_kernel_lock_type(genlock_lock_type lockType)