diff --git a/Makefile b/Makefile
index 5805b1f8..7c935419 100644
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_get_cookie.c				\
 		src/httplib_get_first_ssl_listener_index.c		\
 		src/httplib_get_mime_type.c				\
+		src/httplib_get_option_index.c				\
 		src/httplib_get_random.c				\
 		src/httplib_get_rel_url_at_current_server.c		\
 		src/httplib_get_remote_ip.c				\
diff --git a/src/httplib_get_option_index.c b/src/httplib_get_option_index.c
new file mode 100644
index 00000000..593b1d7e
--- /dev/null
+++ b/src/httplib_get_option_index.c
@@ -0,0 +1,41 @@
+/* 
+ * 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"
+
+
+
+
+int XX_httplib_get_option_index( const char *name ) {
+
+	int i;
+
+	for (i = 0; XX_httplib_config_options[i].name != NULL; i++) {
+		if (strcmp(XX_httplib_config_options[i].name, name) == 0) return i;
+	}
+	return -1;
+
+}  /* XX_httplib_get_option_index */
diff --git a/src/libhttp.c b/src/libhttp.c
index b289db23..480c0fb6 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -828,18 +828,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
 
 
 
-int XX_httplib_get_option_index( const char *name ) {
-
-	int i;
-
-	for (i = 0; XX_httplib_config_options[i].name != NULL; i++) {
-		if (strcmp(XX_httplib_config_options[i].name, name) == 0) return i;
-	}
-	return -1;
-
-}  /* XX_httplib_get_option_index */
-
-
 const char *mg_get_option(const struct mg_context *ctx, const char *name) {
 
 	int i;