diff --git a/Makefile b/Makefile
index 592f996f..c747401a 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_forward_body_data.c				\
 		src/httplib_free_context.c				\
 		src/httplib_get_builtin_mime_type.c			\
+		src/httplib_get_cookie.c				\
 		src/httplib_get_first_ssl_listener_index.c		\
 		src/httplib_get_mime_type.c				\
 		src/httplib_get_rel_url_at_current_server.c		\
diff --git a/src/httplib_get_cookie.c b/src/httplib_get_cookie.c
new file mode 100644
index 00000000..91b878a4
--- /dev/null
+++ b/src/httplib_get_cookie.c
@@ -0,0 +1,69 @@
+/* 
+ * 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"
+
+
+/* HCP24: some changes to compare hole var_name */
+int mg_get_cookie(const char *cookie_header, const char *var_name, char *dst, size_t dst_size) {
+
+	const char *s;
+	const char *p;
+	const char *end;
+	int name_len;
+	int len = -1;
+
+	if (dst == NULL || dst_size == 0) return -2;
+
+	dst[0] = '\0';
+	if (var_name == NULL || (s = cookie_header) == NULL) return -1;
+
+	name_len = (int)strlen(var_name);
+	end = s + strlen(s);
+	for (; (s = XX_httplib_strcasestr(s, var_name)) != NULL; s += name_len) {
+		if (s[name_len] == '=') {
+			/* HCP24: now check is it a substring or a full cookie name */
+			if ((s == cookie_header) || (s[-1] == ' ')) {
+				s += name_len + 1;
+				if ((p = strchr(s, ' ')) == NULL) {
+					p = end;
+				}
+				if (p[-1] == ';') p--;
+				if (*s == '"' && p[-1] == '"' && p > s + 1) {
+					s++;
+					p--;
+				}
+				if ((size_t)(p - s) < dst_size) {
+					len = (int)(p - s);
+					XX_httplib_strlcpy(dst, s, (size_t)len + 1);
+				} else len = -3;
+				break;
+			}
+		}
+	}
+	return len;
+
+}  /* mg_get_cookie */
diff --git a/src/libhttp.c b/src/libhttp.c
index 0e6f119d..0873b2a3 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -3214,7 +3214,7 @@ int mg_get_var(const char *data, size_t data_len, const char *name, char *dst, s
 }
 
 
-int mg_get_var2(const char *data, size_t data_len, const char *name, char *dst, size_t dst_len, size_t occurrence) {
+int mg_get_var2( const char *data, size_t data_len, const char *name, char *dst, size_t dst_len, size_t occurrence ) {
 
 	const char *p;
 	const char *e;
@@ -3258,46 +3258,5 @@ int mg_get_var2(const char *data, size_t data_len, const char *name, char *dst,
 	}
 
 	return len;
-}
 
-
-/* HCP24: some changes to compare hole var_name */
-int mg_get_cookie(const char *cookie_header, const char *var_name, char *dst, size_t dst_size) {
-
-	const char *s;
-	const char *p;
-	const char *end;
-	int name_len;
-	int len = -1;
-
-	if (dst == NULL || dst_size == 0) return -2;
-
-	dst[0] = '\0';
-	if (var_name == NULL || (s = cookie_header) == NULL) return -1;
-
-	name_len = (int)strlen(var_name);
-	end = s + strlen(s);
-	for (; (s = XX_httplib_strcasestr(s, var_name)) != NULL; s += name_len) {
-		if (s[name_len] == '=') {
-			/* HCP24: now check is it a substring or a full cookie name */
-			if ((s == cookie_header) || (s[-1] == ' ')) {
-				s += name_len + 1;
-				if ((p = strchr(s, ' ')) == NULL) {
-					p = end;
-				}
-				if (p[-1] == ';') p--;
-				if (*s == '"' && p[-1] == '"' && p > s + 1) {
-					s++;
-					p--;
-				}
-				if ((size_t)(p - s) < dst_size) {
-					len = (int)(p - s);
-					XX_httplib_strlcpy(dst, s, (size_t)len + 1);
-				} else len = -3;
-				break;
-			}
-		}
-	}
-	return len;
-
-}  /* mg_get_cookie */
+}  /* mg_get_var2 */