diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install
index e11eceb704e..25092700f15 100644
--- a/debian/libmariadb-dev.install
+++ b/debian/libmariadb-dev.install
@@ -1,6 +1,5 @@
 usr/bin/mysql_config
-usr/include/mysql/*.h
-usr/include/mysql/psi/*.h
+usr/include/mysql
 usr/lib/*/libmariadb.so
 usr/lib/*/libmariadbclient.a
 usr/lib/*/libmysqlservices.a
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 770a9492993..e47522a4931 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -64,18 +64,24 @@ SET(HEADERS
   json_lib.h
 )
 
-INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
+# don't use C/C's (possibly outdated) copy of mysqld_error.h
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
+  DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
+
+INSTALL(FILES ${HEADERS}
+  DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development)
 FOREACH(f ${HEADERS_GEN_CONFIGURE})
-  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f}
+    DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development)
 ENDFOREACH(f)
-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
 
 STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
 STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
 
 MACRO(INSTALL_PRIVATE DIR)
   INSTALL(DIRECTORY ${DIR}/.
-    DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+    DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
     FILES_MATCHING PATTERN "*.h"
     PATTERN CMakeFiles EXCLUDE
     PATTERN mysql EXCLUDE
diff --git a/libmariadb b/libmariadb
index eb058204233..11321f16bfc 160000
--- a/libmariadb
+++ b/libmariadb
@@ -1 +1 @@
-Subproject commit eb058204233863f1b949209e5c4649489174d299
+Subproject commit 11321f16bfcd92e210d5736af7b7d5073a89c2ef
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 5516cd7013a..0022bb1442d 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -158,7 +158,7 @@ ENDFOREACH()
 MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} 
   OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER})
 
-INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT  ${COMPONENT_MYSQLSERVER})
+INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT  ${COMPONENT_MYSQLSERVER})
 
 # Visual Studio users need debug  static library 
 IF(MSVC)
diff --git a/pcre/CMakeLists.txt b/pcre/CMakeLists.txt
index 30b06a46fef..8aaa9b57361 100644
--- a/pcre/CMakeLists.txt
+++ b/pcre/CMakeLists.txt
@@ -510,6 +510,6 @@ IF(PCRE_SHOW_REPORT)
   MESSAGE(STATUS "")
 ENDIF(PCRE_SHOW_REPORT)
 
-INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development)
 
 # end CMakeLists.txt
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 7e7ed69ab46..eddbccfbb66 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -472,7 +472,7 @@ IF(WIN32)
   TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
 ENDIF(WIN32)
 
-INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
   FILES_MATCHING PATTERN "*.h"
   PATTERN share EXCLUDE
   PATTERN CMakeFiles EXCLUDE)