diff --git a/server/include/gw_ssl.h b/server/include/gw_ssl.h
index 0d263ed7c..4465e306a 100644
--- a/server/include/gw_ssl.h
+++ b/server/include/gw_ssl.h
@@ -33,6 +33,10 @@
  */
 
 #include <gw_protocol.h>
+#include <openssl/crypto.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/dh.h>
 
 struct dcb;
 
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index eb91a1cfe..e5f341db9 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -81,6 +81,7 @@ static int gw_client_hangup_event(DCB *dcb);
 static int mysql_send_ok(DCB *dcb, int packet_number, int in_affected_rows, const char* mysql_message);
 static int MySQLSendHandshake(DCB* dcb);
 static int route_by_statement(SESSION *, GWBUF **);
+static void mysql_client_auth_error_handling(DCB *dcb, int auth_val);
 extern char* create_auth_fail_str(char *username, char *hostaddr, char *sha1, char *db,int);
 
 /*
@@ -806,7 +807,7 @@ return_rc:
  * @param auth_val The type of authentication failure
  * @note Authentication status codes are defined in mysql_client_server_protocol.h
  */
-void
+static void
 mysql_client_auth_error_handling(DCB *dcb, int auth_val)
 {
     int packet_number, message_len;