diff --git a/build/src/http_client.c b/build/src/http_client.c
index db06b206ee5e84546e8edee954591f65bcbe8497..0e4a6c7afe1f115011a96db387dc881eb5a34055 100644
--- a/build/src/http_client.c
+++ b/build/src/http_client.c
@@ -3,14 +3,18 @@
 static SOCKET conn2(const char *host, int port, int use_ssl,
                     char *ebuf, size_t ebuf_len) {
   struct sockaddr_in sin;
-  struct hostent *he;
+  struct hostent *he = NULL;
   SOCKET sock = INVALID_SOCKET;
 
+  (void) use_ssl; // Prevent warning for -DNO_SSL case
+
   if (host == NULL) {
     snprintf(ebuf, ebuf_len, "%s", "NULL host");
+#ifndef NO_SSL
   } else if (use_ssl && SSLv23_client_method == NULL) {
     snprintf(ebuf, ebuf_len, "%s", "SSL is not initialized");
     // TODO(lsm): use something threadsafe instead of gethostbyname()
+#endif
   } else if ((he = gethostbyname(host)) == NULL) {
     snprintf(ebuf, ebuf_len, "gethostbyname(%s): %s", host, strerror(ERRNO));
   } else if ((sock = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
diff --git a/build/src/mongoose.c b/build/src/mongoose.c
index 8a461b9bc38aacdb1e72ed3496329927c3d00477..5a4d910546db721edfb7fb1712f52c32b79cd75a 100644
--- a/build/src/mongoose.c
+++ b/build/src/mongoose.c
@@ -149,9 +149,12 @@ static int64_t push(FILE *fp, SOCKET sock, SSL *ssl, const char *buf,
     // How many bytes we send in this iteration
     k = len - sent > INT_MAX ? INT_MAX : (int) (len - sent);
 
+#if !defined(NO_SSL)
     if (ssl != NULL) {
       n = SSL_write(ssl, buf + sent, k);
-    } else if (fp != NULL) {
+    } else
+#endif
+    if (fp != NULL) {
       n = (int) fwrite(buf + sent, 1, (size_t) k, fp);
       if (ferror(fp))
         n = -1;
diff --git a/build/src/ssl.c b/build/src/ssl.c
index 6da584b5165375012bc5ba5019cad1e90dc8708c..9a52e250cebe84493ab9519d2e357da2096258ee 100644
--- a/build/src/ssl.c
+++ b/build/src/ssl.c
@@ -176,4 +176,3 @@ static void uninitialize_ssl(struct mg_context *ctx) {
   }
 }
 #endif // !NO_SSL
-
diff --git a/mongoose.c b/mongoose.c
index 36e4386af1f3b50118d6595896913317c45ee9b5..a24e6221f2a0e1514e66a6a1fc1fbd5f2c6ddd5b 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -2072,18 +2072,21 @@ static void uninitialize_ssl(struct mg_context *ctx) {
 }
 #endif // !NO_SSL
 
-
 static SOCKET conn2(const char *host, int port, int use_ssl,
                     char *ebuf, size_t ebuf_len) {
   struct sockaddr_in sin;
-  struct hostent *he;
+  struct hostent *he = NULL;
   SOCKET sock = INVALID_SOCKET;
 
+  (void) use_ssl; // Prevent warning for -DNO_SSL case
+
   if (host == NULL) {
     snprintf(ebuf, ebuf_len, "%s", "NULL host");
+#ifndef NO_SSL
   } else if (use_ssl && SSLv23_client_method == NULL) {
     snprintf(ebuf, ebuf_len, "%s", "SSL is not initialized");
     // TODO(lsm): use something threadsafe instead of gethostbyname()
+#endif
   } else if ((he = gethostbyname(host)) == NULL) {
     snprintf(ebuf, ebuf_len, "gethostbyname(%s): %s", host, strerror(ERRNO));
   } else if ((sock = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
@@ -2314,9 +2317,12 @@ static int64_t push(FILE *fp, SOCKET sock, SSL *ssl, const char *buf,
     // How many bytes we send in this iteration
     k = len - sent > INT_MAX ? INT_MAX : (int) (len - sent);
 
+#if !defined(NO_SSL)
     if (ssl != NULL) {
       n = SSL_write(ssl, buf + sent, k);
-    } else if (fp != NULL) {
+    } else
+#endif
+    if (fp != NULL) {
       n = (int) fwrite(buf + sent, 1, (size_t) k, fp);
       if (ferror(fp))
         n = -1;