diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h
index 86015fa1..f4fcde8a 100644
--- a/lib/mosquitto_internal.h
+++ b/lib/mosquitto_internal.h
@@ -24,7 +24,9 @@ Contributors:
 #endif
 
 #ifdef WITH_TLS
-#include <openssl/ssl.h>
+#  include <openssl/ssl.h>
+#else
+#  include <time.h>
 #endif
 #include <stdlib.h>
 
diff --git a/lib/socks_mosq.c b/lib/socks_mosq.c
index 9085fd2a..564f8d78 100644
--- a/lib/socks_mosq.c
+++ b/lib/socks_mosq.c
@@ -15,6 +15,7 @@ Contributors:
 */
 
 #include <errno.h>
+#include <string.h>
 
 #include "mosquitto_internal.h"
 #include "memory_mosq.h"
diff --git a/src/read_handle_server.c b/src/read_handle_server.c
index 8a6da562..f349c762 100644
--- a/src/read_handle_server.c
+++ b/src/read_handle_server.c
@@ -93,8 +93,8 @@ int mqtt3_handle_connect(struct mosquitto_db *db, struct mosquitto *context)
 	struct mosquitto *found_context;
 	int slen;
 	struct _mosquitto_subleaf *leaf;
-#ifdef WITH_TLS
 	int i;
+#ifdef WITH_TLS
 	X509 *client_cert = NULL;
 	X509_NAME *name;
 	X509_NAME_ENTRY *name_entry;