diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0be25f7..3901428 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,7 @@ if (ANBOX_VERSION_SUFFIX)
 endif()
 set(ANBOX_RESOURCE_DIR "${CMAKE_INSTALL_DATADIR}/anbox")
 set(ANBOX_RESOURCE_DIR_FULL "${CMAKE_INSTALL_FULL_DATADIR}/anbox")
-set(ANBOX_STATEDIR_FULL "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/anbox")
+set(ANBOX_STATEDIR_FULL "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/anbox")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/config.h.in
                ${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/config.h)
 
diff --git a/android/opengl/system/GLESv1_enc/gl_client_proc.h b/android/opengl/system/GLESv1_enc/gl_client_proc.h
index a94fc76..707c524 100644
--- a/android/opengl/system/GLESv1_enc/gl_client_proc.h
+++ b/android/opengl/system/GLESv1_enc/gl_client_proc.h
@@ -6,8 +6,6 @@
 
 
 #include "gl_types.h"
-
-#include "emugl/common/logging.h"
 #ifndef gl_APIENTRY
 #define gl_APIENTRY 
 #endif
diff --git a/android/opengl/system/GLESv2_enc/gl2_client_proc.h b/android/opengl/system/GLESv2_enc/gl2_client_proc.h
index a57df23..445910d 100644
--- a/android/opengl/system/GLESv2_enc/gl2_client_proc.h
+++ b/android/opengl/system/GLESv2_enc/gl2_client_proc.h
@@ -6,8 +6,6 @@
 
 
 #include "gl2_types.h"
-
-#include "emugl/common/logging.h"
 #ifndef gl2_APIENTRY
 #define gl2_APIENTRY 
 #endif
diff --git a/android/opengl/system/renderControl_enc/renderControl_client_proc.h b/android/opengl/system/renderControl_enc/renderControl_client_proc.h
index 3d422e0..5129b99 100644
--- a/android/opengl/system/renderControl_enc/renderControl_client_proc.h
+++ b/android/opengl/system/renderControl_enc/renderControl_client_proc.h
@@ -6,8 +6,6 @@
 
 
 #include "renderControl_types.h"
-
-#include "emugl/common/logging.h"
 #ifndef renderControl_APIENTRY
 #define renderControl_APIENTRY 
 #endif
diff --git a/external/android-emugl/host/tools/emugen/ApiGen.cpp b/external/android-emugl/host/tools/emugen/ApiGen.cpp
index c7713d2..cd3d67b 100644
--- a/external/android-emugl/host/tools/emugen/ApiGen.cpp
+++ b/external/android-emugl/host/tools/emugen/ApiGen.cpp
@@ -69,7 +69,6 @@ int ApiGen::genProcTypes(const std::string &filename, SideType side)
     fprintf(fp, "#define __%s_%s_proc_t_h\n", basename, sideString(side));
     fprintf(fp, "\n\n");
     fprintf(fp, "\n#include \"%s_types.h\"\n",basename);
-    fprintf(fp, "\n#include \"emugl/common/logging.h\"\n");
     fprintf(fp, "#ifndef %s_APIENTRY\n",basename);
     fprintf(fp, "#define %s_APIENTRY \n",basename);
     fprintf(fp, "#endif\n");
@@ -754,6 +753,7 @@ int ApiGen::genDecoderHeader(const std::string &filename)
 
     fprintf(fp, "#include \"IOStream.h\" \n");
     fprintf(fp, "#include \"%s_%s_context.h\"\n\n\n", m_basename.c_str(), sideString(SERVER_SIDE));
+    fprintf(fp, "\n#include \"emugl/common/logging.h\"\n");
 
     for (size_t i = 0; i < m_decoderHeaders.size(); i++) {
         fprintf(fp, "#include %s\n", m_decoderHeaders[i].c_str());