Index: Makefile
===================================================================
--- Makefile	(revision 451300)
+++ Makefile	(working copy)
@@ -24,6 +24,10 @@
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
 	${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
 	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/my_global.h
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/my_sys.h
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/mysql_com.h
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/mysql_version.h
 	${RM} -r ${STAGEDIR}${DATADIR}/policy
 	${RM} ${STAGEDIR}${PREFIX}/man/man1/aria* ${STAGEDIR}${PREFIX}/man/man1/myisam*
 	# Fix https://mariadb.atlassian.net/browse/MDEV-9388
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 451300)
+++ pkg-plist	(working copy)
@@ -21,11 +21,12 @@
 include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
+include/mysql/my_config.h
 include/mysql/mysql.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/plugin_auth.h
 include/mysql/mysql/plugin_auth_common.h
-@comment include/mysql/mysqld_error.h
+include/mysql/mysqld_error.h
 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
 lib/mysql/libmariadb.so
 lib/mysql/libmariadb.so.3