diff --git a/include/my_md5.h b/include/my_md5.h
index c58385a715d4..5a712d91de00 100644
--- a/include/my_md5.h
+++ b/include/my_md5.h
@@ -33,7 +33,7 @@
 extern "C" {
 #endif
 
-void compute_md5_hash(char *digest, const char *buf, int len);
+void compute_md5_hash(char *digest, const char *buf, size_t len);
 
 /*
   Convert an array of bytes to a hexadecimal representation.
diff --git a/mysys_ssl/my_md5.cc b/mysys_ssl/my_md5.cc
index a343468b4992..9906169e083a 100644
--- a/mysys_ssl/my_md5.cc
+++ b/mysys_ssl/my_md5.cc
@@ -39,7 +39,7 @@
 #if defined(HAVE_OPENSSL)
 #include <openssl/md5.h>
 
-static void my_md5_hash(unsigned char* digest, unsigned const char *buf, int len)
+static void my_md5_hash(unsigned char* digest, unsigned const char *buf, size_t len)
 {
   MD5_CTX ctx;
   MD5_Init (&ctx);
@@ -58,7 +58,7 @@ static void my_md5_hash(unsigned char* digest, unsigned const char *buf, int len
 
     @return              void
 */
-void compute_md5_hash(char *digest, const char *buf, int len)
+void compute_md5_hash(char *digest, const char *buf, size_t len)
 {
 #if defined(HAVE_OPENSSL)
   my_md5_hash((unsigned char*)digest, (unsigned const char*)buf, len);
diff --git a/sql/json_dom.h b/sql/json_dom.h
index 14d120fe838e..6195960447f7 100644
--- a/sql/json_dom.h
+++ b/sql/json_dom.h
@@ -34,6 +34,7 @@
 #include "sql_error.h"          // Sql_condition
 #include "prealloced_array.h"   // Prealloced_array
 
+#include <functional>
 #include <map>
 #include <string>
 
diff --git a/storage/innobase/sync/sync0debug.cc b/storage/innobase/sync/sync0debug.cc
index 0cbea6e7733e..e3a633be86ed 100644
--- a/storage/innobase/sync/sync0debug.cc
+++ b/storage/innobase/sync/sync0debug.cc
@@ -43,11 +43,12 @@ Created 2012-08-21 Sunny Bains
 #include "ut0new.h"
 #include "srv0start.h"
 
+#include <algorithm>
+#include <functional>
+#include <iostream>
 #include <map>
 #include <vector>
 #include <string>
-#include <algorithm>
-#include <iostream>
 
 #ifdef UNIV_DEBUG
 
diff --git a/storage/myisam/sort.cc b/storage/myisam/sort.cc
index fc54f6f2a7cb..a81feee1343b 100644
--- a/storage/myisam/sort.cc
+++ b/storage/myisam/sort.cc
@@ -28,6 +28,7 @@
 */
 
 #include <algorithm>
+#include <functional>
 
 #include "fulltext.h"
 #if defined(_WIN32)