diff --git a/Makefile b/Makefile
index 844c0a15..c48b2e68 100644
--- a/Makefile
+++ b/Makefile
@@ -215,6 +215,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_strncasecmp.c				\
 		src/httplib_strndup.c					\
 		src/httplib_substitute_index_file.c			\
+		src/httplib_suggest_connection_header.c			\
 		src/httplib_timer.c					\
 		src/httplib_tls_dtor.c					\
 		src/httplib_uninitialize_ssl.c				\
diff --git a/src/httplib_suggest_connection_header.c b/src/httplib_suggest_connection_header.c
new file mode 100644
index 00000000..45ef41b0
--- /dev/null
+++ b/src/httplib_suggest_connection_header.c
@@ -0,0 +1,35 @@
+/* 
+ * Copyright (c) 2016 Lammert Bies
+ * Copyright (c) 2013-2016 the Civetweb developers
+ * Copyright (c) 2004-2013 Sergey Lyubka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+
+#include "libhttp-private.h"
+
+
+
+const char * XX_httplib_suggest_connection_header( const struct mg_connection *conn ) {
+
+	return XX_httplib_should_keep_alive(conn) ? "keep-alive" : "close";
+
+}  /* XX_httplib_suggest_connection_header */
diff --git a/src/libhttp.c b/src/libhttp.c
index 4a1b60fd..69c1f7c9 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -827,14 +827,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
 #endif
 
 
-
-const char * XX_httplib_suggest_connection_header( const struct mg_connection *conn ) {
-
-	return XX_httplib_should_keep_alive(conn) ? "keep-alive" : "close";
-
-}  /* XX_httplib_suggest_connection_header */
-
-
 int XX_httplib_send_no_cache_header( struct mg_connection *conn ) {
 
 	/* Send all current and obsolete cache opt-out directives. */