diff --git a/Makefile b/Makefile
index 11521096..d1dedbf8 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ LIB_SOURCES =	src/libhttp.c					\
 		src/httplib_accept_new_connection.c		\
 		src/httplib_check_feature.c			\
 		src/httplib_close_connection.c			\
+		src/httplib_close_socket_gracefully.c		\
 		src/httplib_connect_client.c			\
 		src/httplib_connect_websocket_client.c		\
 		src/httplib_consume_socket.c			\
@@ -59,6 +60,7 @@ LIB_SOURCES =	src/libhttp.c					\
 		src/httplib_master_thread.c			\
 		src/httplib_process_new_connection.c		\
 		src/httplib_produce_socket.c			\
+		src/httplib_set_tcp_nodelay.c			\
 		src/httplib_start.c				\
 		src/httplib_stop.c				\
 		src/httplib_version.c				\
diff --git a/src/httplib_set_tcp_nodelay.c b/src/httplib_set_tcp_nodelay.c
new file mode 100644
index 00000000..0a4dec7e
--- /dev/null
+++ b/src/httplib_set_tcp_nodelay.c
@@ -0,0 +1,44 @@
+/* 
+ * 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"
+
+
+
+/*
+ * The function XX_httplib_set_tcp_nodelay() switches on or off delays on the
+ * socket passed as a parameter.
+ */
+
+int XX_httplib_set_tcp_nodelay( SOCKET sock, int nodelay_on ) {
+
+	if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (SOCK_OPT_TYPE)&nodelay_on, sizeof(nodelay_on)) != 0) { /* Error */
+		return 1;
+	}
+	/* OK */
+	return 0;
+
+}  /* XX_httplib_set_tcp_nodelay */
diff --git a/src/libhttp.c b/src/libhttp.c
index 7465085e..60efb11e 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -9041,14 +9041,3 @@ int XX_httplib_set_sock_timeout( SOCKET sock, int milliseconds ) {
 	return r0 || r1 || r2;
 
 }  /* XX_httplib_set_sock_timeout */
-
-
-int XX_httplib_set_tcp_nodelay( SOCKET sock, int nodelay_on ) {
-
-	if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (SOCK_OPT_TYPE)&nodelay_on, sizeof(nodelay_on)) != 0) { /* Error */
-		return 1;
-	}
-	/* OK */
-	return 0;
-
-}  /* XX_httplib_set_tcp_nodelay */