diff --git a/Makefile b/Makefile
index 44c7a689..f592254f 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_get_response_code_text.c			\
 		src/httplib_get_system_name.c				\
 		src/httplib_get_uri_type.c				\
+		src/httplib_get_user_data.c				\
 		src/httplib_get_valid_options.c				\
 		src/httplib_get_var.c					\
 		src/httplib_getreq.c					\
diff --git a/src/httplib_get_user_data.c b/src/httplib_get_user_data.c
new file mode 100644
index 00000000..cf95af74
--- /dev/null
+++ b/src/httplib_get_user_data.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"
+
+
+
+void * mg_get_user_data(const struct mg_context *ctx) {
+
+	return (ctx == NULL) ? NULL : ctx->user_data;
+
+}  /* mg_get_user_data */
diff --git a/src/libhttp.c b/src/libhttp.c
index 654ddec9..1daa685c 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -828,13 +828,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
 
 
 
-void * mg_get_user_data(const struct mg_context *ctx) {
-
-	return (ctx == NULL) ? NULL : ctx->user_data;
-
-}  /* mg_get_user_data */
-
-
 void mg_set_user_connection_data(struct mg_connection *conn, void *data) {
 
 	if (conn != NULL) conn->request_info.conn_data = data;