diff --git a/external/android-emugl/shared/OpenglCodecCommon/CMakeLists.txt b/external/android-emugl/shared/OpenglCodecCommon/CMakeLists.txt
index 1dda7913a3b85ad6bebf9b9a694169ff5c234b64..67606d79756688db57d927c9b01187f108135616 100644
--- a/external/android-emugl/shared/OpenglCodecCommon/CMakeLists.txt
+++ b/external/android-emugl/shared/OpenglCodecCommon/CMakeLists.txt
@@ -1,6 +1,15 @@
 set(SOURCES
-    glUtils.cpp
     ChecksumCalculator.cpp
-    ChecksumCalculatorThreadInfo.cpp)
+    ChecksumCalculator.h
+    ChecksumCalculatorThreadInfo.cpp
+    ChecksumCalculatorThreadInfo.h
+    CMakeLists.txt
+    ErrorLog.h
+    gl_base_types.h
+    GLDecoderContextData.h
+    glUtils.cpp
+    glUtils.h
+    Makefile
+    ProtocolUtils.h)
 
 add_library(OpenglCodecCommon ${SOURCES})
diff --git a/external/android-emugl/shared/emugl/common/CMakeLists.txt b/external/android-emugl/shared/emugl/common/CMakeLists.txt
index a479a9b82d895a4f690d8ec50b9cc037db340250..ef8b6d232265ed99f43fdecc12f2f6461b8a068b 100644
--- a/external/android-emugl/shared/emugl/common/CMakeLists.txt
+++ b/external/android-emugl/shared/emugl/common/CMakeLists.txt
@@ -1,15 +1,32 @@
 set(COMMON_SOURCES
+    condition_variable.h
     crash_reporter.cpp
+    crash_reporter.h
     id_to_object_map.cpp
+    id_to_object_map.h
     lazy_instance.cpp
+    lazy_instance.h
     logging.cpp
+    logging.h
     message_channel.cpp
+    message_channel.h
+    mutex.h
+    mutex_unittest.cpp
     pod_vector.cpp
+    pod_vector.h
+    scoped_pointer_vector.h
     shared_library.cpp
+    shared_library.h
     smart_ptr.cpp
+    smart_ptr.h
     sockets.cpp
+    sockets.h
+    thread.h
+    thread_pthread.cpp
     thread_store.cpp
-    thread_pthread.cpp)
+    thread_store.h
+    thread_unittest.cpp
+    unique_integer_map.h)
 
 add_library(emugl_common ${COMMON_SOURCES})
 target_link_libraries(emugl_common