--- a/libmariadb/libmariadb/CMakeLists.txt
+++ b/libmariadb/libmariadb/CMakeLists.txt
@@ -315,7 +315,7 @@
     win32_errmsg.h)
 ELSE()
   IF(ICONV_INCLUDE_DIR)
-     INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR}) 
+     INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) 
   ENDIF()
   IF(APPLE)
     ADD_DEFINITIONS(-Wno-deprecated-declarations)
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -22,10 +22,10 @@
 ${CMAKE_SOURCE_DIR}/libmysqld
 ${CMAKE_SOURCE_DIR}/sql
 ${CMAKE_BINARY_DIR}/sql 
-${PCRE_INCLUDES}
-${ZLIB_INCLUDE_DIR}
 ${SSL_INCLUDE_DIRS}
 ${SSL_INTERNAL_INCLUDE_DIRS}
+${PCRE_INCLUDES}
+${ZLIB_INCLUDE_DIR}
 )
 
 SET(GEN_SOURCES