diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 5822c9f6..e5b86850 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -16,14 +16,14 @@
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
-  ${PCRE_INCLUDES}
   ${CMAKE_SOURCE_DIR}/mysys_ssl
-  ${ZLIB_INCLUDE_DIR}
-  ${SSL_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_SOURCE_DIR}/strings
-  ${MY_READLINE_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${SSL_INCLUDE_DIRS}
+  ${PCRE_INCLUDES}
+  ${ZLIB_INCLUDE_DIR}
+  ${MY_READLINE_INCLUDE_DIR}
 )
 
 INCLUDE_DIRECTORIES(BEFORE
diff --git a/libmariadb/libmariadb/CMakeLists.txt b/libmariadb/libmariadb/CMakeLists.txt
index b189300f..3494a20b 100644
--- a/libmariadb/libmariadb/CMakeLists.txt
+++ b/libmariadb/libmariadb/CMakeLists.txt
@@ -314,7 +314,7 @@ IF(WIN32)
     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)
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 6ed51eff..93f42223 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -22,10 +22,10 @@ ${CMAKE_SOURCE_DIR}/include
 ${CMAKE_SOURCE_DIR}/libmysqld
 ${CMAKE_SOURCE_DIR}/sql
 ${CMAKE_BINARY_DIR}/sql 
+${SSL_INTERNAL_INCLUDE_DIRS}
+${SSL_INCLUDE_DIRS}
 ${PCRE_INCLUDES}
 ${ZLIB_INCLUDE_DIR}
-${SSL_INCLUDE_DIRS}
-${SSL_INTERNAL_INCLUDE_DIRS}
 )
 
 SET(GEN_SOURCES
diff --git a/plugin/feedback/CMakeLists.txt b/plugin/feedback/CMakeLists.txt
index 2103250e..c98126f4 100644
--- a/plugin/feedback/CMakeLists.txt
+++ b/plugin/feedback/CMakeLists.txt
@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
-                    ${PCRE_INCLUDES}
-                    ${SSL_INCLUDE_DIRS})
+                    ${SSL_INCLUDE_DIRS}
+                    ${PCRE_INCLUDES})
 
 SET(FEEDBACK_SOURCES feedback.cc sender_thread.cc
     url_base.cc url_http.cc utils.cc)
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 47716274..9ffc47ad 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -38,10 +38,10 @@ ENDIF()
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}/include 
 ${CMAKE_SOURCE_DIR}/sql 
+${CMAKE_BINARY_DIR}/sql
+${SSL_INCLUDE_DIRS}
 ${PCRE_INCLUDES}
 ${ZLIB_INCLUDE_DIR}
-${SSL_INCLUDE_DIRS}
-${CMAKE_BINARY_DIR}/sql
 ${WSREP_INCLUDES}
 )
 
diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt
index 7ed365ea..00c2c410 100644
--- a/storage/perfschema/CMakeLists.txt
+++ b/storage/perfschema/CMakeLists.txt
@@ -23,8 +23,8 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/sql
                     ${CMAKE_BINARY_DIR}/sql
-                    ${PCRE_INCLUDES}
-                    ${SSL_INCLUDE_DIRS})
+                    ${SSL_INCLUDE_DIRS}
+                    ${PCRE_INCLUDES})
 
 ADD_DEFINITIONS(-DMYSQL_SERVER)
 
diff --git a/storage/perfschema/unittest/CMakeLists.txt b/storage/perfschema/unittest/CMakeLists.txt
index 7b8c906a..71386642 100644
--- a/storage/perfschema/unittest/CMakeLists.txt
+++ b/storage/perfschema/unittest/CMakeLists.txt
@@ -22,11 +22,11 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/include/mysql
-                    ${PCRE_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/sql
-                    ${SSL_INCLUDE_DIRS}
                     ${CMAKE_SOURCE_DIR}/unittest/mytap
-                    ${CMAKE_SOURCE_DIR}/storage/perfschema)
+                    ${CMAKE_SOURCE_DIR}/storage/perfschema
+                    ${SSL_INCLUDE_DIRS}
+                    ${PCRE_INCLUDES})
 
 ADD_DEFINITIONS(-DMYSQL_SERVER ${SSL_DEFINES})