diff --git a/Android.mk b/Android.mk
index a53f072..31db4f2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,7 @@
     EMUGL_COMMON_CFLAGS += -DGOLDFISH_HIDL_GRALLOC
 endif
 
-ifeq ($(PLATFORM_VERSION_CODENAME.PPR1),P)
+ifdef IS_AT_LEAST_OPD1
     EMUGL_COMMON_CFLAGS += -DEMULATOR_OPENGL_POST_O=1
 endif
 
diff --git a/common.mk b/common.mk
index 81f558b..c15812e 100644
--- a/common.mk
+++ b/common.mk
@@ -106,8 +106,8 @@
     STATIC_LIBRARIES \
     ADDITIONAL_DEPENDENCIES
 
-ifeq ($(PLATFORM_VERSION_CODENAME.PPR1),P)
-EMUGL_EXPORT_TYPES +=    HEADER_LIBRARIES
+ifdef IS_AT_LEAST_OPD1
+EMUGL_EXPORT_TYPES += HEADER_LIBRARIES
 endif
 
 # Initialize a module in our database
diff --git a/system/OpenglSystemCommon/Android.mk b/system/OpenglSystemCommon/Android.mk
index 007b503..9305119 100644
--- a/system/OpenglSystemCommon/Android.mk
+++ b/system/OpenglSystemCommon/Android.mk
@@ -11,12 +11,17 @@
     QemuPipeStream.cpp \
     ThreadInfo.cpp
 
-ifeq ($(PLATFORM_VERSION_CODENAME.PPR1),P)
+ifdef IS_AT_LEAST_OPD1
 LOCAL_HEADER_LIBRARIES += libnativebase_headers
 
 $(call emugl-export,HEADER_LIBRARIES,libnativebase_headers)
 endif
 
+ifdef IS_AT_LEAST_OPD1
+LOCAL_HEADER_LIBRARIES += libhardware_headers
+$(call emugl-export,HEADER_LIBRARIES,libhardware_headers)
+endif
+
 $(call emugl-export,C_INCLUDES,$(LOCAL_PATH) bionic/libc/private)
 
 $(call emugl-end-module)
diff --git a/system/egl/Android.mk b/system/egl/Android.mk
index 476cf94..2d7a559 100644
--- a/system/egl/Android.mk
+++ b/system/egl/Android.mk
@@ -13,12 +13,17 @@
     egl.cpp \
     ClientAPIExts.cpp
 
-ifeq ($(PLATFORM_VERSION_CODENAME.PPR1),P)
+ifdef IS_AT_LEAST_OPD1
 LOCAL_SHARED_LIBRARIES += libdl libnativewindow
 else
 LOCAL_SHARED_LIBRARIES += libdl
 endif
 
+ifdef IS_AT_LEAST_OPD1
+LOCAL_SHARED_LIBRARIES += libui
+LOCAL_HEADER_LIBRARIES += libnativebase_headers
+endif
+
 # Used to access the Bionic private OpenGL TLS slot
 LOCAL_C_INCLUDES += bionic/libc/private
 
diff --git a/system/egl/goldfish_sync.h b/system/egl/goldfish_sync.h
index 4667a77..6b30fe5 100644
--- a/system/egl/goldfish_sync.h
+++ b/system/egl/goldfish_sync.h
@@ -18,6 +18,10 @@
 #include <linux/ioctl.h>
 #include <linux/types.h>
 #include <sys/cdefs.h>
+#ifdef EMULATOR_OPENGL_POST_O
+#include <sys/ioctl.h>
+#include <sys/unistd.h>
+#endif
 #include <fcntl.h>
 
 // Make it conflict with ioctls that are not likely to be used