diff --git a/Makefile b/Makefile
index 2168ed23..5d18ce18 100644
--- a/Makefile
+++ b/Makefile
@@ -387,489 +387,714 @@ ${LIBDIR}libhttp${LIBEXT} :	\
 # Individual source files with their header dependencies
 #
 
-${OBJDIR}extern_md5${OBJEXT}				: ${SRCDIR}extern_md5.c
+${OBJDIR}extern_md5${OBJEXT}						: ${SRCDIR}extern_md5.c
 
-${OBJDIR}extern_sha1${OBJEXT}				: ${SRCDIR}extern_sha1.c
+${OBJDIR}extern_sha1${OBJEXT}						: ${SRCDIR}extern_sha1.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}extern_ssl_lut${OBJEXT}			: ${SRCDIR}extern_ssl_lut.c
+${OBJDIR}extern_ssl_lut${OBJEXT}					: ${SRCDIR}extern_ssl_lut.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_accept_new_connection${OBJEXT}		: ${SRCDIR}httplib_accept_new_connection.c
+${OBJDIR}httplib_accept_new_connection${OBJEXT}				: ${SRCDIR}httplib_accept_new_connection.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_addenv${OBJEXT}			: ${SRCDIR}httplib_addenv.c
+${OBJDIR}httplib_addenv${OBJEXT}					: ${SRCDIR}httplib_addenv.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_atomic_dec${OBJEXT}			: ${SRCDIR}httplib_atomic_dec.c
+${OBJDIR}httplib_atomic_dec${OBJEXT}					: ${SRCDIR}httplib_atomic_dec.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_atomic_inc${OBJEXT}			: ${SRCDIR}httplib_atomic_inc.c
+${OBJDIR}httplib_atomic_inc${OBJEXT}					: ${SRCDIR}httplib_atomic_inc.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_authorize${OBJEXT}			: ${SRCDIR}httplib_authorize.c
+${OBJDIR}httplib_authorize${OBJEXT}					: ${SRCDIR}httplib_authorize.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_base64_encode${OBJEXT}			: ${SRCDIR}httplib_base64_encode.c
+${OBJDIR}httplib_base64_encode${OBJEXT}					: ${SRCDIR}httplib_base64_encode.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_check_acl${OBJEXT}			: ${SRCDIR}httplib_check_acl.c
+${OBJDIR}httplib_check_acl${OBJEXT}					: ${SRCDIR}httplib_check_acl.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_check_authorization${OBJEXT}		: ${SRCDIR}httplib_check_authorization.c
+${OBJDIR}httplib_check_authorization${OBJEXT}				: ${SRCDIR}httplib_check_authorization.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_check_feature${OBJEXT}			: ${SRCDIR}httplib_check_feature.c
+${OBJDIR}httplib_check_feature${OBJEXT}					: ${SRCDIR}httplib_check_feature.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_check_password${OBJEXT}		: ${SRCDIR}httplib_check_password.c
+${OBJDIR}httplib_check_password${OBJEXT}				: ${SRCDIR}httplib_check_password.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_close_all_listening_sockets${OBJDIR}	: ${SRCDIR}httplib_close_all_listening_sockets.c
+${OBJDIR}httplib_close_all_listening_sockets${OBJDIR}			: ${SRCDIR}httplib_close_all_listening_sockets.c		\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_close_connection${OBJEXT}		: ${SRCDIR}httplib_close_connection.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_close_connection${OBJEXT}				: ${SRCDIR}httplib_close_connection.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_close_socket_gracefully${OBJEXT}	: ${SRCDIR}httplib_close_socket_gracefully.c
+${OBJDIR}httplib_close_socket_gracefully${OBJEXT}			: ${SRCDIR}httplib_close_socket_gracefully.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_closedir${OBJEXT}			: ${SRCDIR}httplib_closedir.c
+${OBJDIR}httplib_closedir${OBJEXT}					: ${SRCDIR}httplib_closedir.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_compare_dir_entries${OBJEXT}		: ${SRCDIR}httplib_compare_dir_entries.c
+${OBJDIR}httplib_compare_dir_entries${OBJEXT}				: ${SRCDIR}httplib_compare_dir_entries.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_config_options${OBJEXT}		: ${SRCDIR}httplib_config_options.c
+${OBJDIR}httplib_config_options${OBJEXT}				: ${SRCDIR}httplib_config_options.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_connect_client${OBJEXT}		: ${SRCDIR}httplib_connect_client.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_connect_client${OBJEXT}				: ${SRCDIR}httplib_connect_client.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_connect_socket${OBJEXT}		: ${SRCDIR}httplib_connect_socket.c
+${OBJDIR}httplib_connect_socket${OBJEXT}				: ${SRCDIR}httplib_connect_socket.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_connect_websocket_client${OBJEXT}	: ${SRCDIR}httplib_connect_websocket_client.c
+${OBJDIR}httplib_connect_websocket_client${OBJEXT}			: ${SRCDIR}httplib_connect_websocket_client.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_construct_etag${OBJEXT}		: ${SRCDIR}httplib_construct_etag.c
+${OBJDIR}httplib_construct_etag${OBJEXT}				: ${SRCDIR}httplib_construct_etag.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_consume_socket${OBJEXT}		: ${SRCDIR}httplib_consume_socket.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_consume_socket${OBJEXT}				: ${SRCDIR}httplib_consume_socket.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_cry${OBJEXT}				: ${SRCDIR}httplib_cry.c
+${OBJDIR}httplib_cry${OBJEXT}						: ${SRCDIR}httplib_cry.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_delete_file${OBJEXT}			: ${SRCDIR}httplib_delete_file.c
+${OBJDIR}httplib_delete_file${OBJEXT}					: ${SRCDIR}httplib_delete_file.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_difftimespec${OBJEXT}			: ${SRCDIR}httplib_difftimespec.c
+${OBJDIR}httplib_difftimespec${OBJEXT}					: ${SRCDIR}httplib_difftimespec.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_dir_scan_callback${OBJEXT}		: ${SRCDIR}httplib_dir_scan_callback.c
+${OBJDIR}httplib_dir_scan_callback${OBJEXT}				: ${SRCDIR}httplib_dir_scan_callback.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_discard_unread_request_data${OBJEXT}	: ${SRCDIR}httplib_discard_unread_request_data.c
+${OBJDIR}httplib_discard_unread_request_data${OBJEXT}			: ${SRCDIR}httplib_discard_unread_request_data.c		\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_download${OBJEXT}			: ${SRCDIR}httplib_download.c
+${OBJDIR}httplib_download${OBJEXT}					: ${SRCDIR}httplib_download.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_event_queue${OBJEXT}			: ${SRCDIR}httplib_event_queue.c
+${OBJDIR}httplib_event_queue${OBJEXT}					: ${SRCDIR}httplib_event_queue.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_fc${OBJEXT}				: ${SRCDIR}httplib_fc.c
+${OBJDIR}httplib_fc${OBJEXT}						: ${SRCDIR}httplib_fc.c						\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_fclose${OBJEXT}			: ${SRCDIR}httplib_fclose.c
+${OBJDIR}httplib_fclose${OBJEXT}					: ${SRCDIR}httplib_fclose.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_fclose_on_exec${OBJEXT}		: ${SRCDIR}httplib_fclose_on_exec.c
+${OBJDIR}httplib_fclose_on_exec${OBJEXT}				: ${SRCDIR}httplib_fclose_on_exec.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_fgets${OBJEXT}				: ${SRCDIR}httplib_fgets.c
+${OBJDIR}httplib_fgets${OBJEXT}						: ${SRCDIR}httplib_fgets.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_fopen${OBJEXT}				: ${SRCDIR}httplib_fopen.c
+${OBJDIR}httplib_fopen${OBJEXT}						: ${SRCDIR}httplib_fopen.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_forward_body_data${OBJEXT}		: ${SRCDIR}httplib_forward_body_data.c
+${OBJDIR}httplib_forward_body_data${OBJEXT}				: ${SRCDIR}httplib_forward_body_data.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_free_context${OBJEXT}			: ${SRCDIR}httplib_free_context.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_free_context${OBJEXT}					: ${SRCDIR}httplib_free_context.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_builtin_mime_type${OBJEXT}		: ${SRCDIR}httplib_get_builtin_mime_type.c
+${OBJDIR}httplib_get_builtin_mime_type${OBJEXT}				: ${SRCDIR}httplib_get_builtin_mime_type.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_context${OBJEXT}			: ${SRCDIR}httplib_get_context.c
+${OBJDIR}httplib_get_context${OBJEXT}					: ${SRCDIR}httplib_get_context.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_cookie${OBJEXT}			: ${SRCDIR}httplib_get_cookie.c
+${OBJDIR}httplib_get_cookie${OBJEXT}					: ${SRCDIR}httplib_get_cookie.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_first_ssl_listener_index${OBJEXT}	: ${SRCDIR}httplib_get_first_ssl_listener_index.c
+${OBJDIR}httplib_get_first_ssl_listener_index${OBJEXT}			: ${SRCDIR}httplib_get_first_ssl_listener_index.c		\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_header${OBJEXT}			: ${SRCDIR}httplib_get_header.c
+${OBJDIR}httplib_get_header${OBJEXT}					: ${SRCDIR}httplib_get_header.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_mime_type${OBJEXT}			: ${SRCDIR}httplib_get_mime_type.c
+${OBJDIR}httplib_get_mime_type${OBJEXT}					: ${SRCDIR}httplib_get_mime_type.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_option${OBJEXT}			: ${SRCDIR}httplib_get_option.c
+${OBJDIR}httplib_get_option${OBJEXT}					: ${SRCDIR}httplib_get_option.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_option_index${OBJEXT}		: ${SRCDIR}httplib_get_option_index.c
+${OBJDIR}httplib_get_option_index${OBJEXT}				: ${SRCDIR}httplib_get_option_index.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_random${OBJEXT}			: ${SRCDIR}httplib_get_random.c
+${OBJDIR}httplib_get_random${OBJEXT}					: ${SRCDIR}httplib_get_random.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_rel_url_at_current_server${OBJEXT}	: ${SRCDIR}httplib_get_rel_url_at_current_server.c
+${OBJDIR}httplib_get_rel_url_at_current_server${OBJEXT}			: ${SRCDIR}httplib_get_rel_url_at_current_server.c		\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_remote_ip${OBJEXT}			: ${SRCDIR}httplib_get_remote_ip.c
+${OBJDIR}httplib_get_remote_ip${OBJEXT}					: ${SRCDIR}httplib_get_remote_ip.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_request_handler${OBJEXT}		: ${SRCDIR}httplib_get_request_handler.c
+${OBJDIR}httplib_get_request_handler${OBJEXT}				: ${SRCDIR}httplib_get_request_handler.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_request_info${OBJEXT}		: ${SRCDIR}httplib_get_request_info.c
+${OBJDIR}httplib_get_request_info${OBJEXT}				: ${SRCDIR}httplib_get_request_info.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_request_len${OBJEXT}		: ${SRCDIR}httplib_get_request_len.c
+${OBJDIR}httplib_get_request_len${OBJEXT}				: ${SRCDIR}httplib_get_request_len.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_response${OBJEXT}			: ${SRCDIR}httplib_get_response.c
+${OBJDIR}httplib_get_response${OBJEXT}					: ${SRCDIR}httplib_get_response.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_response_code_text${OBJEXT}	: ${SRCDIR}httplib_get_response_code_text.c
+${OBJDIR}httplib_get_response_code_text${OBJEXT}			: ${SRCDIR}httplib_get_response_code_text.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_server_ports${OBJEXT}		: ${SRCDIR}httplib_get_server_ports.c
+${OBJDIR}httplib_get_server_ports${OBJEXT}				: ${SRCDIR}httplib_get_server_ports.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_system_name${OBJEXT}		: ${SRCDIR}httplib_get_system_name.c
+${OBJDIR}httplib_get_system_name${OBJEXT}				: ${SRCDIR}httplib_get_system_name.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_uri_type${OBJEXT}			: ${SRCDIR}httplib_get_uri_type.c
+${OBJDIR}httplib_get_uri_type${OBJEXT}					: ${SRCDIR}httplib_get_uri_type.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_user_connection_data${OBJEXT}	: ${SRCDIR}httplib_get_user_connection_data.c
+${OBJDIR}httplib_get_user_connection_data${OBJEXT}			: ${SRCDIR}httplib_get_user_connection_data.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_user_data${OBJEXT}			: ${SRCDIR}httplib_get_user_data.c
+${OBJDIR}httplib_get_user_data${OBJEXT}					: ${SRCDIR}httplib_get_user_data.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_valid_options${OBJEXT}		: ${SRCDIR}httplib_get_valid_options.c
+${OBJDIR}httplib_get_valid_options${OBJEXT}				: ${SRCDIR}httplib_get_valid_options.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_get_var${OBJEXT}			: ${SRCDIR}httplib_get_var.c
+${OBJDIR}httplib_get_var${OBJEXT}					: ${SRCDIR}httplib_get_var.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_getreq${OBJEXT}			: ${SRCDIR}httplib_getreq.c
+${OBJDIR}httplib_getreq${OBJEXT}					: ${SRCDIR}httplib_getreq.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_global_data${OBJEXT}			: ${SRCDIR}httplib_global_data.c
+${OBJDIR}httplib_global_data${OBJEXT}					: ${SRCDIR}httplib_global_data.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_gmt_time_string${OBJEXT}		: ${SRCDIR}httplib_gmt_time_string.c
+${OBJDIR}httplib_gmt_time_string${OBJEXT}				: ${SRCDIR}httplib_gmt_time_string.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_handle_cgi_request${OBJEXT}		: ${SRCDIR}httplib_handle_cgi_request.c
+${OBJDIR}httplib_handle_cgi_request${OBJEXT}				: ${SRCDIR}httplib_handle_cgi_request.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_handle_directory_request${OBJEXT}	: ${SRCDIR}httplib_handle_directory_request.c
+${OBJDIR}httplib_handle_directory_request${OBJEXT}			: ${SRCDIR}httplib_handle_directory_request.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_handle_file_based_request${OBJEXT}	: ${SRCDIR}httplib_handle_file_based_request.c
+${OBJDIR}httplib_handle_file_based_request${OBJEXT}			: ${SRCDIR}httplib_handle_file_based_request.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_handle_form_request${OBJEXT}		: ${SRCDIR}httplib_handle_form_request.c
+${OBJDIR}httplib_handle_form_request${OBJEXT}				: ${SRCDIR}httplib_handle_form_request.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_handle_not_modified_static_file_request${OBJEXT}	: ${SRCDIR}httplib_handle_not_modified_static_file_request.c
+${OBJDIR}httplib_handle_not_modified_static_file_request${OBJEXT}	: ${SRCDIR}httplib_handle_not_modified_static_file_request.c	\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_handle_propfind${OBJEXT}		: ${SRCDIR}httplib_handle_propfind.c
+${OBJDIR}httplib_handle_propfind${OBJEXT}				: ${SRCDIR}httplib_handle_propfind.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_handle_request${OBJEXT}		: ${SRCDIR}httplib_handle_request.c
+${OBJDIR}httplib_handle_request${OBJEXT}				: ${SRCDIR}httplib_handle_request.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_handle_static_file_request${OBJEXT}	: ${SRCDIR}httplib_handle_static_file_request.c
+${OBJDIR}httplib_handle_static_file_request${OBJEXT}			: ${SRCDIR}httplib_handle_static_file_request.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_handle_websocket_request${OBJEXT}	: ${SRCDIR}httplib_handle_websocket_request.c
+${OBJDIR}httplib_handle_websocket_request${OBJEXT}			: ${SRCDIR}httplib_handle_websocket_request.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_header_has_option${OBJEXT}		: ${SRCDIR}httplib_header_has_option.c
+${OBJDIR}httplib_header_has_option${OBJEXT}				: ${SRCDIR}httplib_header_has_option.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_inet_pton${OBJEXT}			: ${SRCDIR}httplib_inet_pton.c
+${OBJDIR}httplib_inet_pton${OBJEXT}					: ${SRCDIR}httplib_inet_pton.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_initialize_ssl${OBJEXT}		: ${SRCDIR}httplib_initialize_ssl.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_initialize_ssl${OBJEXT}				: ${SRCDIR}httplib_initialize_ssl.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_interpret_uri${OBJEXT}			: ${SRCDIR}httplib_interpret_uri.c
+${OBJDIR}httplib_interpret_uri${OBJEXT}					: ${SRCDIR}httplib_interpret_uri.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_is_authorized_for_put${OBJEXT}		: ${SRCDIR}httplib_is_authorized_for_put.c
+${OBJDIR}httplib_is_authorized_for_put${OBJEXT}				: ${SRCDIR}httplib_is_authorized_for_put.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_is_file_in_memory${OBJEXT}		: ${SRCDIR}httplib_is_file_in_memory.c
+${OBJDIR}httplib_is_file_in_memory${OBJEXT}				: ${SRCDIR}httplib_is_file_in_memory.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_is_file_opened${OBJEXT}		: ${SRCDIR}httplib_is_file_opened.c
+${OBJDIR}httplib_is_file_opened${OBJEXT}				: ${SRCDIR}httplib_is_file_opened.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_is_not_modified${OBJEXT}		: ${SRCDIR}httplib_is_not_modified.c
+${OBJDIR}httplib_is_not_modified${OBJEXT}				: ${SRCDIR}httplib_is_not_modified.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_is_put_or_delete_method${OBJEXT}	: ${SRCDIR}httplib_is_put_or_delete_method.c
+${OBJDIR}httplib_is_put_or_delete_method${OBJEXT}			: ${SRCDIR}httplib_is_put_or_delete_method.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_is_valid_http_method${OBJEXT}		: ${SRCDIR}httplib_is_valid_http_method.c
+${OBJDIR}httplib_is_valid_http_method${OBJEXT}				: ${SRCDIR}httplib_is_valid_http_method.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_is_valid_port${OBJEXT}			: ${SRCDIR}httplib_is_valid_port.c
+${OBJDIR}httplib_is_valid_port${OBJEXT}					: ${SRCDIR}httplib_is_valid_port.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_is_websocket_protocol${OBJEXT}		: ${SRCDIR}httplib_is_websocket_protocol.c
+${OBJDIR}httplib_is_websocket_protocol${OBJEXT}				: ${SRCDIR}httplib_is_websocket_protocol.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_join_thread${OBJEXT}			: ${SRCDIR}httplib_join_thread.c
+${OBJDIR}httplib_join_thread${OBJEXT}					: ${SRCDIR}httplib_join_thread.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_load_dll${OBJEXT}			: ${SRCDIR}httplib_load_dll.c
+${OBJDIR}httplib_load_dll${OBJEXT}					: ${SRCDIR}httplib_load_dll.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_lock_unlock_connection${OBJEXT}	: ${SRCDIR}httplib_lock_unlock_connection.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_lock_unlock_connection${OBJEXT}			: ${SRCDIR}httplib_lock_unlock_connection.c			\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_lock_unlock_context${OBJEXT}		: ${SRCDIR}httplib_lock_unlock_context.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_lock_unlock_context${OBJEXT}				: ${SRCDIR}httplib_lock_unlock_context.c			\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_log_access${OBJEXT}			: ${SRCDIR}httplib_log_access.c
+${OBJDIR}httplib_log_access${OBJEXT}					: ${SRCDIR}httplib_log_access.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_lowercase${OBJEXT}			: ${SRCDIR}httplib_lowercase.c
+${OBJDIR}httplib_lowercase${OBJEXT}					: ${SRCDIR}httplib_lowercase.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_malloc${OBJEXT}			: ${SRCDIR}httplib_malloc.c
+${OBJDIR}httplib_malloc${OBJEXT}					: ${SRCDIR}httplib_malloc.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_master_thread${OBJEXT}			: ${SRCDIR}httplib_master_thread.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_master_thread${OBJEXT}					: ${SRCDIR}httplib_master_thread.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_match_prefix${OBJEXT}			: ${SRCDIR}httplib_match_prefix.c
+${OBJDIR}httplib_match_prefix${OBJEXT}					: ${SRCDIR}httplib_match_prefix.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_md5${OBJEXT}				: ${SRCDIR}httplib_md5.c
+${OBJDIR}httplib_md5${OBJEXT}						: ${SRCDIR}httplib_md5.c					\
 
-${OBJDIR}httplib_mkcol${OBJEXT}				: ${SRCDIR}httplib_mkcol.c
+${OBJDIR}httplib_mkcol${OBJEXT}						: ${SRCDIR}httplib_mkcol.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_mkdir${OBJEXT}				: ${SRCDIR}httplib_mkdir.c
+${OBJDIR}httplib_mkdir${OBJEXT}						: ${SRCDIR}httplib_mkdir.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_modify_passwords_file${OBJEXT}		: ${SRCDIR}httplib_modify_passwords_file.c
+${OBJDIR}httplib_modify_passwords_file${OBJEXT}				: ${SRCDIR}httplib_modify_passwords_file.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_must_hide_file${OBJEXT}		: ${SRCDIR}httplib_must_hide_file.c
+${OBJDIR}httplib_must_hide_file${OBJEXT}				: ${SRCDIR}httplib_must_hide_file.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_next_option${OBJEXT}			: ${SRCDIR}httplib_next_option.c
+${OBJDIR}httplib_next_option${OBJEXT}					: ${SRCDIR}httplib_next_option.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_open_auth_file${OBJEXT}		: ${SRCDIR}httplib_open_auth_file.c
+${OBJDIR}httplib_open_auth_file${OBJEXT}				: ${SRCDIR}httplib_open_auth_file.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_opendir${OBJEXT}			: ${SRCDIR}httplib_opendir.c
+${OBJDIR}httplib_opendir${OBJEXT}					: ${SRCDIR}httplib_opendir.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_parse_auth_header${OBJEXT}		: ${SRCDIR}httplib_parse_auth_header.c
+${OBJDIR}httplib_parse_auth_header${OBJEXT}				: ${SRCDIR}httplib_parse_auth_header.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_parse_date_string${OBJEXT}		: ${SRCDIR}httplib_parse_date_string.c
+${OBJDIR}httplib_parse_date_string${OBJEXT}				: ${SRCDIR}httplib_parse_date_string.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_parse_http_headers${OBJEXT}		: ${SRCDIR}httplib_parse_http_headers.c
+${OBJDIR}httplib_parse_http_headers${OBJEXT}				: ${SRCDIR}httplib_parse_http_headers.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_parse_http_message${OBJEXT}		: ${SRCDIR}httplib_parse_http_message.c
+${OBJDIR}httplib_parse_http_message${OBJEXT}				: ${SRCDIR}httplib_parse_http_message.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_parse_net${OBJEXT}			: ${SRCDIR}httplib_parse_net.c
+${OBJDIR}httplib_parse_net${OBJEXT}					: ${SRCDIR}httplib_parse_net.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_parse_range_header${OBJEXT}		: ${SRCDIR}httplib_parse_range_header.c
+${OBJDIR}httplib_parse_range_header${OBJEXT}				: ${SRCDIR}httplib_parse_range_header.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_path_to_unicode${OBJEXT}		: ${SRCDIR}httplib_path_to_unicode.c
+${OBJDIR}httplib_path_to_unicode${OBJEXT}				: ${SRCDIR}httplib_path_to_unicode.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_poll${OBJEXT}				: ${SRCDIR}httplib_poll.c
+${OBJDIR}httplib_poll${OBJEXT}						: ${SRCDIR}httplib_poll.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_prepare_cgi_environment${OBJEXT}	: ${SRCDIR}httplib_prepare_cgi_environment.c
+${OBJDIR}httplib_prepare_cgi_environment${OBJEXT}			: ${SRCDIR}httplib_prepare_cgi_environment.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_print_dir_entry${OBJEXT}		: ${SRCDIR}httplib_print_dir_entry.c
+${OBJDIR}httplib_print_dir_entry${OBJEXT}				: ${SRCDIR}httplib_print_dir_entry.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_printf${OBJEXT}			: ${SRCDIR}httplib_printf.c
+${OBJDIR}httplib_printf${OBJEXT}					: ${SRCDIR}httplib_printf.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_process_new_connection${OBJEXT}	: ${SRCDIR}httplib_process_new_connection.c
+${OBJDIR}httplib_process_new_connection${OBJEXT}			: ${SRCDIR}httplib_process_new_connection.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_produce_socket${OBJEXT}		: ${SRCDIR}httplib_produce_socket.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_produce_socket${OBJEXT}				: ${SRCDIR}httplib_produce_socket.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_pull${OBJEXT}				: ${SRCDIR}httplib_pull.c
+${OBJDIR}httplib_pull${OBJEXT}						: ${SRCDIR}httplib_pull.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_pull_all${OBJEXT}			: ${SRCDIR}httplib_pull_all.c
+${OBJDIR}httplib_pull_all${OBJEXT}					: ${SRCDIR}httplib_pull_all.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_push_all${OBJEXT}			: ${SRCDIR}httplib_push_all.c
+${OBJDIR}httplib_push_all${OBJEXT}					: ${SRCDIR}httplib_push_all.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_put_dir${OBJEXT}			: ${SRCDIR}httplib_put_dir.c
+${OBJDIR}httplib_put_dir${OBJEXT}					: ${SRCDIR}httplib_put_dir.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_put_file${OBJEXT}			: ${SRCDIR}httplib_put_file.c
+${OBJDIR}httplib_put_file${OBJEXT}					: ${SRCDIR}httplib_put_file.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_read${OBJEXT}				: ${SRCDIR}httplib_read.c
+${OBJDIR}httplib_read${OBJEXT}						: ${SRCDIR}httplib_read.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_read_auth_file${OBJEXT}		: ${SRCDIR}httplib_read_auth_file.c
+${OBJDIR}httplib_read_auth_file${OBJEXT}				: ${SRCDIR}httplib_read_auth_file.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_read_request${OBJEXT}			: ${SRCDIR}httplib_read_request.c
+${OBJDIR}httplib_read_request${OBJEXT}					: ${SRCDIR}httplib_read_request.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_read_websocket${OBJEXT}		: ${SRCDIR}httplib_read_websocket.c
+${OBJDIR}httplib_read_websocket${OBJEXT}				: ${SRCDIR}httplib_read_websocket.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_readdir${OBJEXT}			: ${SRCDIR}httplib_readdir.c
+${OBJDIR}httplib_readdir${OBJEXT}					: ${SRCDIR}httplib_readdir.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_realloc2${OBJEXT}			: ${SRCDIR}httplib_realloc2.c
+${OBJDIR}httplib_realloc2${OBJEXT}					: ${SRCDIR}httplib_realloc2.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_redirect_to_https_port${OBJEXT}	: ${SRCDIR}httplib_redirect_to_https_port.c
+${OBJDIR}httplib_redirect_to_https_port${OBJEXT}			: ${SRCDIR}httplib_redirect_to_https_port.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_refresh_trust${OBJEXT}			: ${SRCDIR}httplib_refresh_trust.c
+${OBJDIR}httplib_refresh_trust${OBJEXT}					: ${SRCDIR}httplib_refresh_trust.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_remove${OBJEXT}			: ${SRCDIR}httplib_remove.c
+${OBJDIR}httplib_remove${OBJEXT}					: ${SRCDIR}httplib_remove.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_remove_bad_file${OBJEXT}		: ${SRCDIR}httplib_remove_bad_file.c
+${OBJDIR}httplib_remove_bad_file${OBJEXT}				: ${SRCDIR}httplib_remove_bad_file.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_remove_directory${OBJEXT}		: ${SRCDIR}httplib_remove_directory.c
+${OBJDIR}httplib_remove_directory${OBJEXT}				: ${SRCDIR}httplib_remove_directory.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_remove_double_dots${OBJEXT}		: ${SRCDIR}httplib_remove_double_dots.c
+${OBJDIR}httplib_remove_double_dots${OBJEXT}				: ${SRCDIR}httplib_remove_double_dots.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_reset_per_request_attributes${OBJEXT}	: ${SRCDIR}httplib_reset_per_request_attributes.c
+${OBJDIR}httplib_reset_per_request_attributes${OBJEXT}			: ${SRCDIR}httplib_reset_per_request_attributes.c		\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_scan_directory${OBJEXT}		: ${SRCDIR}httplib_scan_directory.c
+${OBJDIR}httplib_scan_directory${OBJEXT}				: ${SRCDIR}httplib_scan_directory.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_send_authorization_request${OBJEXT}	: ${SRCDIR}httplib_send_authorization_request.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_send_authorization_request${OBJEXT}			: ${SRCDIR}httplib_send_authorization_request.c			\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_send_file${OBJEXT}			: ${SRCDIR}httplib_send_file.c
+${OBJDIR}httplib_send_file${OBJEXT}					: ${SRCDIR}httplib_send_file.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_send_file_data${OBJEXT}		: ${SRCDIR}httplib_send_file_data.c
+${OBJDIR}httplib_send_file_data${OBJEXT}				: ${SRCDIR}httplib_send_file_data.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_send_http_error${OBJEXT}		: ${SRCDIR}httplib_send_http_error.c
+${OBJDIR}httplib_send_http_error${OBJEXT}				: ${SRCDIR}httplib_send_http_error.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_send_no_cache_header${OBJEXT}		: ${SRCDIR}httplib_send_no_cache_header.c
+${OBJDIR}httplib_send_no_cache_header${OBJEXT}				: ${SRCDIR}httplib_send_no_cache_header.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_send_options${OBJEXT}			: ${SRCDIR}httplib_send_options.c
+${OBJDIR}httplib_send_options${OBJEXT}					: ${SRCDIR}httplib_send_options.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_send_static_cache_header${OBJEXT}	: ${SRCDIR}httplib_send_static_cache_header.c
+${OBJDIR}httplib_send_static_cache_header${OBJEXT}			: ${SRCDIR}httplib_send_static_cache_header.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_send_websocket_handshake${OBJEXT}	: ${SRCDIR}httplib_send_websocket_handshake.c
+${OBJDIR}httplib_send_websocket_handshake${OBJEXT}			: ${SRCDIR}httplib_send_websocket_handshake.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_acl_option${OBJEXT}		: ${SRCDIR}httplib_set_acl_option.c
+${OBJDIR}httplib_set_acl_option${OBJEXT}				: ${SRCDIR}httplib_set_acl_option.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_auth_handler${OBJEXT}		: ${SRCDIR}httplib_set_auth_handler.c
+${OBJDIR}httplib_set_auth_handler${OBJEXT}				: ${SRCDIR}httplib_set_auth_handler.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_close_on_exec${OBJEXT}		: ${SRCDIR}httplib_set_close_on_exec.c
+${OBJDIR}httplib_set_close_on_exec${OBJEXT}				: ${SRCDIR}httplib_set_close_on_exec.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_gpass_option${OBJEXT}		: ${SRCDIR}httplib_set_gpass_option.c
+${OBJDIR}httplib_set_gpass_option${OBJEXT}				: ${SRCDIR}httplib_set_gpass_option.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_handler_type${OBJEXT}		: ${SRCDIR}httplib_set_handler_type.c
+${OBJDIR}httplib_set_handler_type${OBJEXT}				: ${SRCDIR}httplib_set_handler_type.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_non_blocking_mode${OBJEXT}		: ${SRCDIR}httplib_set_non_blocking_mode.c
+${OBJDIR}httplib_set_non_blocking_mode${OBJEXT}				: ${SRCDIR}httplib_set_non_blocking_mode.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_ports_option${OBJEXT}		: ${SRCDIR}httplib_set_ports_option.c
+${OBJDIR}httplib_set_ports_option${OBJEXT}				: ${SRCDIR}httplib_set_ports_option.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_request_handler${OBJEXT}		: ${SRCDIR}httplib_set_request_handler.c
+${OBJDIR}httplib_set_request_handler${OBJEXT}				: ${SRCDIR}httplib_set_request_handler.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_ssl_option${OBJEXT}		: ${SRCDIR}httplib_set_ssl_option.c
+${OBJDIR}httplib_set_ssl_option${OBJEXT}				: ${SRCDIR}httplib_set_ssl_option.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_sock_timeout${OBJEXT}		: ${SRCDIR}httplib_set_sock_timeout.c
+${OBJDIR}httplib_set_sock_timeout${OBJEXT}				: ${SRCDIR}httplib_set_sock_timeout.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_tcp_nodelay${OBJEXT}		: ${SRCDIR}httplib_set_tcp_nodelay.c
+${OBJDIR}httplib_set_tcp_nodelay${OBJEXT}				: ${SRCDIR}httplib_set_tcp_nodelay.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_thread_name${OBJEXT}		: ${SRCDIR}httplib_set_thread_name.c
+${OBJDIR}httplib_set_thread_name${OBJEXT}				: ${SRCDIR}httplib_set_thread_name.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_throttle${OBJEXT}			: ${SRCDIR}httplib_set_throttle.c
+${OBJDIR}httplib_set_throttle${OBJEXT}					: ${SRCDIR}httplib_set_throttle.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_uid_option${OBJEXT}		: ${SRCDIR}httplib_set_uid_option.c
+${OBJDIR}httplib_set_uid_option${OBJEXT}				: ${SRCDIR}httplib_set_uid_option.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_user_connection_data${OBJEXT}	: ${SRCDIR}httplib_set_user_connection_data.c
+${OBJDIR}httplib_set_user_connection_data${OBJEXT}			: ${SRCDIR}httplib_set_user_connection_data.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_set_websocket_handler${OBJEXT}		: ${SRCDIR}httplib_set_websocket_handler.c
+${OBJDIR}httplib_set_websocket_handler${OBJEXT}				: ${SRCDIR}httplib_set_websocket_handler.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_should_decode_url${OBJEXT}		: ${SRCDIR}httplib_should_decode_url.c
+${OBJDIR}httplib_should_decode_url${OBJEXT}				: ${SRCDIR}httplib_should_decode_url.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_should_keep_alive${OBJEXT}		: ${SRCDIR}httplib_should_keep_alive.c
+${OBJDIR}httplib_should_keep_alive${OBJEXT}				: ${SRCDIR}httplib_should_keep_alive.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_skip${OBJEXT}				: ${SRCDIR}httplib_skip.c
+${OBJDIR}httplib_skip${OBJEXT}						: ${SRCDIR}httplib_skip.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_skip_quoted${OBJEXT}			: ${SRCDIR}httplib_skip_quoted.c
+${OBJDIR}httplib_skip_quoted${OBJEXT}					: ${SRCDIR}httplib_skip_quoted.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_snprintf${OBJEXT}			: ${SRCDIR}httplib_snprintf.c
+${OBJDIR}httplib_snprintf${OBJEXT}					: ${SRCDIR}httplib_snprintf.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_sockaddr_to_string${OBJEXT}		: ${SRCDIR}httplib_sockaddr_to_string.c
+${OBJDIR}httplib_sockaddr_to_string${OBJEXT}				: ${SRCDIR}httplib_sockaddr_to_string.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_spawn_process${OBJEXT}			: ${SRCDIR}httplib_spawn_process.c
+${OBJDIR}httplib_spawn_process${OBJEXT}					: ${SRCDIR}httplib_spawn_process.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_ssi${OBJEXT}				: ${SRCDIR}httplib_ssi.c
+${OBJDIR}httplib_ssi${OBJEXT}						: ${SRCDIR}httplib_ssi.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_ssl_error${OBJEXT}			: ${SRCDIR}httplib_ssl_error.c
+${OBJDIR}httplib_ssl_error${OBJEXT}					: ${SRCDIR}httplib_ssl_error.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_ssl_get_client_cert_info${OBJEXT}	: ${SRCDIR}httplib_ssl_get_client_cert_info.c
+${OBJDIR}httplib_ssl_get_client_cert_info${OBJEXT}			: ${SRCDIR}httplib_ssl_get_client_cert_info.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_ssl_get_protocol${OBJEXT}		: ${SRCDIR}httplib_ssl_get_protocol.c
+${OBJDIR}httplib_ssl_get_protocol${OBJEXT}				: ${SRCDIR}httplib_ssl_get_protocol.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_ssl_id_callback${OBJEXT}		: ${SRCDIR}httplib_ssl_id_callback.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_ssl_id_callback${OBJEXT}				: ${SRCDIR}httplib_ssl_id_callback.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_ssl_locking_callback${OBJEXT}		: ${SRCDIR}httplib_ssl_locking_callback.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_ssl_locking_callback${OBJEXT}				: ${SRCDIR}httplib_ssl_locking_callback.c			\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_ssl_use_pem_file${OBJEXT}		: ${SRCDIR}httplib_ssl_use_pem_file.c
+${OBJDIR}httplib_ssl_use_pem_file${OBJEXT}				: ${SRCDIR}httplib_ssl_use_pem_file.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_sslize${OBJEXT}			: ${SRCDIR}httplib_sslize.c
+${OBJDIR}httplib_sslize${OBJEXT}					: ${SRCDIR}httplib_sslize.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_start${OBJEXT}				: ${SRCDIR}httplib_start.c			\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_start${OBJEXT}						: ${SRCDIR}httplib_start.c					\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_start_thread${OBJEXT}			: ${SRCDIR}httplib_start_thread.c
+${OBJDIR}httplib_start_thread${OBJEXT}					: ${SRCDIR}httplib_start_thread.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_start_thread_with_id${OBJEXT}		: ${SRCDIR}httplib_start_thread_with_id.c
+${OBJDIR}httplib_start_thread_with_id${OBJEXT}				: ${SRCDIR}httplib_start_thread_with_id.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_stat${OBJEXT}				: ${SRCDIR}httplib_stat.c
+${OBJDIR}httplib_stat${OBJEXT}						: ${SRCDIR}httplib_stat.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_stop${OBJEXT}				: ${SRCDIR}httplib_stop.c
+${OBJDIR}httplib_stop${OBJEXT}						: ${SRCDIR}httplib_stop.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_store_body${OBJEXT}			: ${SRCDIR}httplib_store_body.c
+${OBJDIR}httplib_store_body${OBJEXT}					: ${SRCDIR}httplib_store_body.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_strlcpy${OBJEXT}			: ${SRCDIR}httplib_strlcpy.c
+${OBJDIR}httplib_strlcpy${OBJEXT}					: ${SRCDIR}httplib_strlcpy.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_strcasecmp${OBJEXT}			: ${SRCDIR}httplib_strcasecmp.c
+${OBJDIR}httplib_strcasecmp${OBJEXT}					: ${SRCDIR}httplib_strcasecmp.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_strcasestr${OBJEXT}			: ${SRCDIR}httplib_strcasestr.c
+${OBJDIR}httplib_strcasestr${OBJEXT}					: ${SRCDIR}httplib_strcasestr.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_strdup${OBJEXT}			: ${SRCDIR}httplib_strdup.c
+${OBJDIR}httplib_strdup${OBJEXT}					: ${SRCDIR}httplib_strdup.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_strncasecmp${OBJEXT}			: ${SRCDIR}httplib_strncasecmp.c
+${OBJDIR}httplib_strncasecmp${OBJEXT}					: ${SRCDIR}httplib_strncasecmp.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_strndup${OBJEXT}			: ${SRCDIR}httplib_strndup.c
+${OBJDIR}httplib_strndup${OBJEXT}					: ${SRCDIR}httplib_strndup.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_substitute_index_file${OBJEXT}		: ${SRCDIR}httplib_substitute_index_file.c
+${OBJDIR}httplib_substitute_index_file${OBJEXT}				: ${SRCDIR}httplib_substitute_index_file.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_suggest_connection_header${OBJEXT}	: ${SRCDIR}httplib_suggest_connection_header.c
+${OBJDIR}httplib_suggest_connection_header${OBJEXT}			: ${SRCDIR}httplib_suggest_connection_header.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_timer${OBJEXT}				: ${SRCDIR}httplib_timer.c
+${OBJDIR}httplib_timer${OBJEXT}						: ${SRCDIR}httplib_timer.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_tls_dtor${OBJEXT}			: ${SRCDIR}httplib_tls_dtor.c			\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_tls_dtor${OBJEXT}					: ${SRCDIR}httplib_tls_dtor.c					\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_uninitialize_ssl${OBJEXT}		: ${SRCDIR}httplib_uninitialize_ssl.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_uninitialize_ssl${OBJEXT}				: ${SRCDIR}httplib_uninitialize_ssl.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_url_decode${OBJEXT}			: ${SRCDIR}httplib_url_decode.c
+${OBJDIR}httplib_url_decode${OBJEXT}					: ${SRCDIR}httplib_url_decode.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_url_encode${OBJEXT}			: ${SRCDIR}httplib_url_encode.c
+${OBJDIR}httplib_url_encode${OBJEXT}					: ${SRCDIR}httplib_url_encode.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_version${OBJEXT}			: ${SRCDIR}httplib_version.c
+${OBJDIR}httplib_version${OBJEXT}					: ${SRCDIR}httplib_version.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_vprintf${OBJEXT}			: ${SRCDIR}httplib_vprintf.c
+${OBJDIR}httplib_vprintf${OBJEXT}					: ${SRCDIR}httplib_vprintf.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_vsnprintf${OBJEXT}			: ${SRCDIR}httplib_vsnprintf.c
+${OBJDIR}httplib_vsnprintf${OBJEXT}					: ${SRCDIR}httplib_vsnprintf.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_websocket_client_thread${OBJEXT}	: ${SRCDIR}httplib_websocket_client_thread.c
+${OBJDIR}httplib_websocket_client_thread${OBJEXT}			: ${SRCDIR}httplib_websocket_client_thread.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_websocket_client_write${OBJEXT}	: ${SRCDIR}httplib_websocket_client_write.c
+${OBJDIR}httplib_websocket_client_write${OBJEXT}			: ${SRCDIR}httplib_websocket_client_write.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_websocket_write${OBJEXT}		: ${SRCDIR}httplib_websocket_write.c
+${OBJDIR}httplib_websocket_write${OBJEXT}				: ${SRCDIR}httplib_websocket_write.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_websocket_write_exec${OBJEXT}		: ${SRCDIR}httplib_websocket_write_exec.c
+${OBJDIR}httplib_websocket_write_exec${OBJEXT}				: ${SRCDIR}httplib_websocket_write_exec.c			\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_worker_thread${OBJEXT}			: ${SRCDIR}httplib_worker_thread.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}httplib_worker_thread${OBJEXT}					: ${SRCDIR}httplib_worker_thread.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}httplib_write${OBJEXT}				: ${SRCDIR}httplib_write.c
+${OBJDIR}httplib_write${OBJEXT}						: ${SRCDIR}httplib_write.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}osx_clock_gettime${OBJEXT}			: ${SRCDIR}osx_clock_gettime.c
+${OBJDIR}osx_clock_gettime${OBJEXT}					: ${SRCDIR}osx_clock_gettime.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_clock_gettime${OBJEXT}			: ${SRCDIR}win32_clock_gettime.c
+${OBJDIR}win32_clock_gettime${OBJEXT}					: ${SRCDIR}win32_clock_gettime.c				\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_cond_broadcast${OBJEXT}		: ${SRCDIR}win32_pthread_cond_broadcast.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_cond_broadcast${OBJEXT}				: ${SRCDIR}win32_pthread_cond_broadcast.c			\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_cond_destroy${OBJEXT}		: ${SRCDIR}win32_pthread_cond_destroy.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_cond_destroy${OBJEXT}				: ${SRCDIR}win32_pthread_cond_destroy.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_cond_init${OBJEXT}		: ${SRCDIR}win32_pthread_cond_init.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_cond_init${OBJEXT}				: ${SRCDIR}win32_pthread_cond_init.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_cond_signal${OBJEXT}		: ${SRCDIR}win32_pthread_cond_signal.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_cond_signal${OBJEXT}				: ${SRCDIR}win32_pthread_cond_signal.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_cond_timedwait${OBJEXT}		: ${SRCDIR}win32_pthread_cond_timedwait.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_cond_timedwait${OBJEXT}				: ${SRCDIR}win32_pthread_cond_timedwait.c			\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_cond_wait${OBJEXT}		: ${SRCDIR}win32_pthread_cond_wait.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_cond_wait${OBJEXT}				: ${SRCDIR}win32_pthread_cond_wait.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_getspecific${OBJEXT}		: ${SRCDIR}win32_pthread_getspecific.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_getspecific${OBJEXT}				: ${SRCDIR}win32_pthread_getspecific.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_key_create${OBJEXT}		: ${SRCDIR}win32_pthread_key_create.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_key_create${OBJEXT}				: ${SRCDIR}win32_pthread_key_create.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_key_delete${OBJEXT}		: ${SRCDIR}win32_pthread_key_delete.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_key_delete${OBJEXT}				: ${SRCDIR}win32_pthread_key_delete.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_mutex_destroy${OBJEXT}		: ${SRCDIR}win32_pthread_mutex_destroy.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_mutex_destroy${OBJEXT}				: ${SRCDIR}win32_pthread_mutex_destroy.c			\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_mutex_init${OBJEXT}		: ${SRCDIR}win32_pthread_mutex_init.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_mutex_init${OBJEXT}				: ${SRCDIR}win32_pthread_mutex_init.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_mutex_lock${OBJEXT}		: ${SRCDIR}win32_pthread_mutex_lock.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_mutex_lock${OBJEXT}				: ${SRCDIR}win32_pthread_mutex_lock.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_mutex_trylock${OBJEXT}		: ${SRCDIR}win32_pthread_mutex_trylock.c	\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_mutex_trylock${OBJEXT}				: ${SRCDIR}win32_pthread_mutex_trylock.c			\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_mutex_unlock${OBJEXT}		: ${SRCDIR}win32_pthread_mutex_unlock.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_mutex_unlock${OBJEXT}				: ${SRCDIR}win32_pthread_mutex_unlock.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_self${OBJEXT}			: ${SRCDIR}win32_pthread_self.c			\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_self${OBJEXT}					: ${SRCDIR}win32_pthread_self.c					\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}win32_pthread_setspecific${OBJEXT}		: ${SRCDIR}win32_pthread_setspecific.c		\
-							  ${SRCDIR}httplib_pthread.h
+${OBJDIR}win32_pthread_setspecific${OBJEXT}				: ${SRCDIR}win32_pthread_setspecific.c				\
+									  ${SRCDIR}httplib_pthread.h					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}wince_gmtime${OBJEXT}				: ${SRCDIR}wince_gmtime.c
+${OBJDIR}wince_gmtime${OBJEXT}						: ${SRCDIR}wince_gmtime.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}wince_gmtime_s${OBJEXT}			: ${SRCDIR}wince_gmtime_s.c
+${OBJDIR}wince_gmtime_s${OBJEXT}					: ${SRCDIR}wince_gmtime_s.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}wince_localtime${OBJEXT}			: ${SRCDIR}wince_localtime.c
+${OBJDIR}wince_localtime${OBJEXT}					: ${SRCDIR}wince_localtime.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}wince_localtime_s${OBJEXT}			: ${SRCDIR}wince_localtime_s.c
+${OBJDIR}wince_localtime_s${OBJEXT}					: ${SRCDIR}wince_localtime_s.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}wince_rename${OBJEXT}				: ${SRCDIR}wince_rename.c
+${OBJDIR}wince_rename${OBJEXT}						: ${SRCDIR}wince_rename.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}wince_stat${OBJEXT}				: ${SRCDIR}wince_stat.c
+${OBJDIR}wince_stat${OBJEXT}						: ${SRCDIR}wince_stat.c						\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}wince_strftime${OBJEXT}			: ${SRCDIR}wince_strftime.c
+${OBJDIR}wince_strftime${OBJEXT}					: ${SRCDIR}wince_strftime.c					\
+									  ${SRCDIR}httplib_main.h
 
-${OBJDIR}wince_time${OBJEXT}				: ${SRCDIR}wince_time.c
+${OBJDIR}wince_time${OBJEXT}						: ${SRCDIR}wince_time.c						\
+									  ${SRCDIR}httplib_main.h
 
diff --git a/src/extern_sha1.c b/src/extern_sha1.c
index d85e5d4b..86afdc0d 100644
--- a/src/extern_sha1.c
+++ b/src/extern_sha1.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/extern_ssl_lut.c b/src/extern_ssl_lut.c
index 21b1fcd3..082533a0 100644
--- a/src/extern_ssl_lut.c
+++ b/src/extern_ssl_lut.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_accept_new_connection.c b/src/httplib_accept_new_connection.c
index 1c4e9151..8dc640fa 100644
--- a/src/httplib_accept_new_connection.c
+++ b/src/httplib_accept_new_connection.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_addenv.c b/src/httplib_addenv.c
index b759db1a..5a185940 100644
--- a/src/httplib_addenv.c
+++ b/src/httplib_addenv.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_atomic_dec.c b/src/httplib_atomic_dec.c
index c66195ee..d30f0034 100644
--- a/src/httplib_atomic_dec.c
+++ b/src/httplib_atomic_dec.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_atomic_inc.c b/src/httplib_atomic_inc.c
index 0ba1c4f9..ef03747f 100644
--- a/src/httplib_atomic_inc.c
+++ b/src/httplib_atomic_inc.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_authorize.c b/src/httplib_authorize.c
index e9fa9efd..73d41f1b 100644
--- a/src/httplib_authorize.c
+++ b/src/httplib_authorize.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_base64_encode.c b/src/httplib_base64_encode.c
index fb781015..b21b05a2 100644
--- a/src/httplib_base64_encode.c
+++ b/src/httplib_base64_encode.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_check_acl.c b/src/httplib_check_acl.c
index 08095768..721f3451 100644
--- a/src/httplib_check_acl.c
+++ b/src/httplib_check_acl.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_check_authorization.c b/src/httplib_check_authorization.c
index f60f7010..982c0df8 100644
--- a/src/httplib_check_authorization.c
+++ b/src/httplib_check_authorization.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 /* Return 1 if request is authorised, 0 otherwise. */
diff --git a/src/httplib_check_feature.c b/src/httplib_check_feature.c
index a7aa34d1..99580c9d 100644
--- a/src/httplib_check_feature.c
+++ b/src/httplib_check_feature.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_check_password.c b/src/httplib_check_password.c
index 0aa764be..d5268df1 100644
--- a/src/httplib_check_password.c
+++ b/src/httplib_check_password.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_close_all_listening_sockets.c b/src/httplib_close_all_listening_sockets.c
index f8003630..8d34a593 100644
--- a/src/httplib_close_all_listening_sockets.c
+++ b/src/httplib_close_all_listening_sockets.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_close_connection.c b/src/httplib_close_connection.c
index 791a846e..0737cb24 100644
--- a/src/httplib_close_connection.c
+++ b/src/httplib_close_connection.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_close_socket_gracefully.c b/src/httplib_close_socket_gracefully.c
index 8af9fc58..c32b21e9 100644
--- a/src/httplib_close_socket_gracefully.c
+++ b/src/httplib_close_socket_gracefully.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_closedir.c b/src/httplib_closedir.c
index 6b3ba3cf..c98e8b75 100644
--- a/src/httplib_closedir.c
+++ b/src/httplib_closedir.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_compare_dir_entries.c b/src/httplib_compare_dir_entries.c
index 303119fe..5e5501aa 100644
--- a/src/httplib_compare_dir_entries.c
+++ b/src/httplib_compare_dir_entries.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_config_options.c b/src/httplib_config_options.c
index 5884eea6..ce402548 100644
--- a/src/httplib_config_options.c
+++ b/src/httplib_config_options.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_connect_client.c b/src/httplib_connect_client.c
index 390fcf33..24d910e7 100644
--- a/src/httplib_connect_client.c
+++ b/src/httplib_connect_client.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_connect_socket.c b/src/httplib_connect_socket.c
index 86bb8695..736bdd70 100644
--- a/src/httplib_connect_socket.c
+++ b/src/httplib_connect_socket.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_connect_websocket_client.c b/src/httplib_connect_websocket_client.c
index bf528eb2..548bf397 100644
--- a/src/httplib_connect_websocket_client.c
+++ b/src/httplib_connect_websocket_client.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_construct_etag.c b/src/httplib_construct_etag.c
index 31a57420..7935d422 100644
--- a/src/httplib_construct_etag.c
+++ b/src/httplib_construct_etag.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_consume_socket.c b/src/httplib_consume_socket.c
index c09fb8e1..9689254f 100644
--- a/src/httplib_consume_socket.c
+++ b/src/httplib_consume_socket.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_cry.c b/src/httplib_cry.c
index 2197a429..6723b2f4 100644
--- a/src/httplib_cry.c
+++ b/src/httplib_cry.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 /* Print error message to the opened error log stream. */
diff --git a/src/httplib_delete_file.c b/src/httplib_delete_file.c
index 53ed073b..257ba1dc 100644
--- a/src/httplib_delete_file.c
+++ b/src/httplib_delete_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_difftimespec.c b/src/httplib_difftimespec.c
index c263232c..75139a66 100644
--- a/src/httplib_difftimespec.c
+++ b/src/httplib_difftimespec.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 /* difftime for struct timespec. Return value is in seconds. */
diff --git a/src/httplib_dir_scan_callback.c b/src/httplib_dir_scan_callback.c
index f0144f6d..ddba1258 100644
--- a/src/httplib_dir_scan_callback.c
+++ b/src/httplib_dir_scan_callback.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_discard_unread_request_data.c b/src/httplib_discard_unread_request_data.c
index 400b3ee7..b3162308 100644
--- a/src/httplib_discard_unread_request_data.c
+++ b/src/httplib_discard_unread_request_data.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_download.c b/src/httplib_download.c
index cd1107fa..373ea3ae 100644
--- a/src/httplib_download.c
+++ b/src/httplib_download.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_event_queue.c b/src/httplib_event_queue.c
index d2d8eb1e..84dcde53 100644
--- a/src/httplib_event_queue.c
+++ b/src/httplib_event_queue.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_fc.c b/src/httplib_fc.c
index aa610a59..03db8ef2 100644
--- a/src/httplib_fc.c
+++ b/src/httplib_fc.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 /* Return fake connection structure. Used for logging, if connection
diff --git a/src/httplib_fclose.c b/src/httplib_fclose.c
index 26893d63..b4e0aad2 100644
--- a/src/httplib_fclose.c
+++ b/src/httplib_fclose.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_fclose_on_exec.c b/src/httplib_fclose_on_exec.c
index cdb654e8..ea17ffe1 100644
--- a/src/httplib_fclose_on_exec.c
+++ b/src/httplib_fclose_on_exec.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_fgets.c b/src/httplib_fgets.c
index 33e2ece9..447baf38 100644
--- a/src/httplib_fgets.c
+++ b/src/httplib_fgets.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_fopen.c b/src/httplib_fopen.c
index 80b57093..194b7879 100644
--- a/src/httplib_fopen.c
+++ b/src/httplib_fopen.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_forward_body_data.c b/src/httplib_forward_body_data.c
index 415d2c4d..c12e6b7b 100644
--- a/src/httplib_forward_body_data.c
+++ b/src/httplib_forward_body_data.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_free_context.c b/src/httplib_free_context.c
index 0e9e3b32..de5caecb 100644
--- a/src/httplib_free_context.c
+++ b/src/httplib_free_context.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_get_builtin_mime_type.c b/src/httplib_get_builtin_mime_type.c
index 2091713a..68999b21 100644
--- a/src/httplib_get_builtin_mime_type.c
+++ b/src/httplib_get_builtin_mime_type.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 static const struct {
diff --git a/src/httplib_get_context.c b/src/httplib_get_context.c
index 310e975e..4113b6bc 100644
--- a/src/httplib_get_context.c
+++ b/src/httplib_get_context.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_cookie.c b/src/httplib_get_cookie.c
index 91b878a4..2b91bf6c 100644
--- a/src/httplib_get_cookie.c
+++ b/src/httplib_get_cookie.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 /* HCP24: some changes to compare hole var_name */
diff --git a/src/httplib_get_first_ssl_listener_index.c b/src/httplib_get_first_ssl_listener_index.c
index 3b34f137..643f8b3b 100644
--- a/src/httplib_get_first_ssl_listener_index.c
+++ b/src/httplib_get_first_ssl_listener_index.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_header.c b/src/httplib_get_header.c
index 632203c3..997dcaa4 100644
--- a/src/httplib_get_header.c
+++ b/src/httplib_get_header.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_mime_type.c b/src/httplib_get_mime_type.c
index b3beaed2..bf6ac9d1 100644
--- a/src/httplib_get_mime_type.c
+++ b/src/httplib_get_mime_type.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_option.c b/src/httplib_get_option.c
index 36be989b..93077d26 100644
--- a/src/httplib_get_option.c
+++ b/src/httplib_get_option.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_option_index.c b/src/httplib_get_option_index.c
index 593b1d7e..53c66a2c 100644
--- a/src/httplib_get_option_index.c
+++ b/src/httplib_get_option_index.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_random.c b/src/httplib_get_random.c
index acec6ffd..8b5868e0 100644
--- a/src/httplib_get_random.c
+++ b/src/httplib_get_random.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_rel_url_at_current_server.c b/src/httplib_get_rel_url_at_current_server.c
index 18422d40..24563620 100644
--- a/src/httplib_get_rel_url_at_current_server.c
+++ b/src/httplib_get_rel_url_at_current_server.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_remote_ip.c b/src/httplib_get_remote_ip.c
index 9e3d6db5..768be83b 100644
--- a/src/httplib_get_remote_ip.c
+++ b/src/httplib_get_remote_ip.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_request_handler.c b/src/httplib_get_request_handler.c
index 223ead8b..52380843 100644
--- a/src/httplib_get_request_handler.c
+++ b/src/httplib_get_request_handler.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_request_info.c b/src/httplib_get_request_info.c
index aa93b280..1e6efc9c 100644
--- a/src/httplib_get_request_info.c
+++ b/src/httplib_get_request_info.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_request_len.c b/src/httplib_get_request_len.c
index 51fb39e5..65ec8477 100644
--- a/src/httplib_get_request_len.c
+++ b/src/httplib_get_request_len.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_response.c b/src/httplib_get_response.c
index 54ec7499..b11c0a87 100644
--- a/src/httplib_get_response.c
+++ b/src/httplib_get_response.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_response_code_text.c b/src/httplib_get_response_code_text.c
index d0dc5ca1..42a36e10 100644
--- a/src/httplib_get_response_code_text.c
+++ b/src/httplib_get_response_code_text.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_server_ports.c b/src/httplib_get_server_ports.c
index 72bedf62..8914c5a8 100644
--- a/src/httplib_get_server_ports.c
+++ b/src/httplib_get_server_ports.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_system_name.c b/src/httplib_get_system_name.c
index d2ef93d8..7497543e 100644
--- a/src/httplib_get_system_name.c
+++ b/src/httplib_get_system_name.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_uri_type.c b/src/httplib_get_uri_type.c
index 6dffb48d..c09b3423 100644
--- a/src/httplib_get_uri_type.c
+++ b/src/httplib_get_uri_type.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_user_connection_data.c b/src/httplib_get_user_connection_data.c
index b2c04429..0c8113e9 100644
--- a/src/httplib_get_user_connection_data.c
+++ b/src/httplib_get_user_connection_data.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_user_data.c b/src/httplib_get_user_data.c
index cf95af74..dc3c2d24 100644
--- a/src/httplib_get_user_data.c
+++ b/src/httplib_get_user_data.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_get_valid_options.c b/src/httplib_get_valid_options.c
index ccb5e558..f6e1d1aa 100644
--- a/src/httplib_get_valid_options.c
+++ b/src/httplib_get_valid_options.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 const struct mg_option *mg_get_valid_options(void) {
diff --git a/src/httplib_get_var.c b/src/httplib_get_var.c
index 1da370b2..72a988ae 100644
--- a/src/httplib_get_var.c
+++ b/src/httplib_get_var.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 int mg_get_var( const char *data, size_t data_len, const char *name, char *dst, size_t dst_len ) {
diff --git a/src/httplib_getreq.c b/src/httplib_getreq.c
index faa26472..5c01a54d 100644
--- a/src/httplib_getreq.c
+++ b/src/httplib_getreq.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_global_data.c b/src/httplib_global_data.c
index c8491477..2897cdd6 100644
--- a/src/httplib_global_data.c
+++ b/src/httplib_global_data.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_gmt_time_string.c b/src/httplib_gmt_time_string.c
index 17472741..3d3a618d 100644
--- a/src/httplib_gmt_time_string.c
+++ b/src/httplib_gmt_time_string.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_handle_cgi_request.c b/src/httplib_handle_cgi_request.c
index 7a744574..1a966603 100644
--- a/src/httplib_handle_cgi_request.c
+++ b/src/httplib_handle_cgi_request.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_handle_directory_request.c b/src/httplib_handle_directory_request.c
index 4698f982..516a6a74 100644
--- a/src/httplib_handle_directory_request.c
+++ b/src/httplib_handle_directory_request.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_handle_file_based_request.c b/src/httplib_handle_file_based_request.c
index 73624859..6d5dee07 100644
--- a/src/httplib_handle_file_based_request.c
+++ b/src/httplib_handle_file_based_request.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_handle_form_request.c b/src/httplib_handle_form_request.c
index 17a4dec0..5d17338f 100644
--- a/src/httplib_handle_form_request.c
+++ b/src/httplib_handle_form_request.c
@@ -23,7 +23,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_handle_not_modified_static_file_request.c b/src/httplib_handle_not_modified_static_file_request.c
index 5e45065f..6145cb46 100644
--- a/src/httplib_handle_not_modified_static_file_request.c
+++ b/src/httplib_handle_not_modified_static_file_request.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_handle_propfind.c b/src/httplib_handle_propfind.c
index 62068c27..798db0ac 100644
--- a/src/httplib_handle_propfind.c
+++ b/src/httplib_handle_propfind.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_handle_request.c b/src/httplib_handle_request.c
index db9feeda..92235dda 100644
--- a/src/httplib_handle_request.c
+++ b/src/httplib_handle_request.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_handle_static_file_request.c b/src/httplib_handle_static_file_request.c
index d62fbae0..6ada0afe 100644
--- a/src/httplib_handle_static_file_request.c
+++ b/src/httplib_handle_static_file_request.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_handle_websocket_request.c b/src/httplib_handle_websocket_request.c
index 7d16f9a0..687394b5 100644
--- a/src/httplib_handle_websocket_request.c
+++ b/src/httplib_handle_websocket_request.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_header_has_option.c b/src/httplib_header_has_option.c
index 2b4c8fae..5dd4a006 100644
--- a/src/httplib_header_has_option.c
+++ b/src/httplib_header_has_option.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_inet_pton.c b/src/httplib_inet_pton.c
index d93025f8..72caa89b 100644
--- a/src/httplib_inet_pton.c
+++ b/src/httplib_inet_pton.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_initialize_ssl.c b/src/httplib_initialize_ssl.c
index b4514941..bd985714 100644
--- a/src/httplib_initialize_ssl.c
+++ b/src/httplib_initialize_ssl.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_interpret_uri.c b/src/httplib_interpret_uri.c
index 6e48d775..e9505126 100644
--- a/src/httplib_interpret_uri.c
+++ b/src/httplib_interpret_uri.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_is_authorized_for_put.c b/src/httplib_is_authorized_for_put.c
index e94071df..9e72e7d6 100644
--- a/src/httplib_is_authorized_for_put.c
+++ b/src/httplib_is_authorized_for_put.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if !defined(NO_FILES)
diff --git a/src/httplib_is_file_in_memory.c b/src/httplib_is_file_in_memory.c
index 154d802d..f13d3aa9 100644
--- a/src/httplib_is_file_in_memory.c
+++ b/src/httplib_is_file_in_memory.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_is_file_opened.c b/src/httplib_is_file_opened.c
index d30c1195..62c1505f 100644
--- a/src/httplib_is_file_opened.c
+++ b/src/httplib_is_file_opened.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_is_not_modified.c b/src/httplib_is_not_modified.c
index b8ecbb9d..a2250a2b 100644
--- a/src/httplib_is_not_modified.c
+++ b/src/httplib_is_not_modified.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_is_put_or_delete_method.c b/src/httplib_is_put_or_delete_method.c
index 23e1e9f2..78ccd232 100644
--- a/src/httplib_is_put_or_delete_method.c
+++ b/src/httplib_is_put_or_delete_method.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 int XX_httplib_is_put_or_delete_method( const struct mg_connection *conn ) {
diff --git a/src/httplib_is_valid_http_method.c b/src/httplib_is_valid_http_method.c
index 11cd2670..b747e9c5 100644
--- a/src/httplib_is_valid_http_method.c
+++ b/src/httplib_is_valid_http_method.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_is_valid_port.c b/src/httplib_is_valid_port.c
index 3a492db2..ca06a022 100644
--- a/src/httplib_is_valid_port.c
+++ b/src/httplib_is_valid_port.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_is_websocket_protocol.c b/src/httplib_is_websocket_protocol.c
index 49005adb..f0daac64 100644
--- a/src/httplib_is_websocket_protocol.c
+++ b/src/httplib_is_websocket_protocol.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_join_thread.c b/src/httplib_join_thread.c
index e5e4b7a4..b83b964f 100644
--- a/src/httplib_join_thread.c
+++ b/src/httplib_join_thread.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if defined(_WIN32)
diff --git a/src/httplib_load_dll.c b/src/httplib_load_dll.c
index 6e41d9e4..1d5eebce 100644
--- a/src/httplib_load_dll.c
+++ b/src/httplib_load_dll.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_lock_unlock_connection.c b/src/httplib_lock_unlock_connection.c
index e8d15db3..a1080259 100644
--- a/src/httplib_lock_unlock_connection.c
+++ b/src/httplib_lock_unlock_connection.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_lock_unlock_context.c b/src/httplib_lock_unlock_context.c
index 34afd5b3..2c7c1198 100644
--- a/src/httplib_lock_unlock_context.c
+++ b/src/httplib_lock_unlock_context.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_log_access.c b/src/httplib_log_access.c
index 1d5a3d6b..0822122c 100644
--- a/src/httplib_log_access.c
+++ b/src/httplib_log_access.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_lowercase.c b/src/httplib_lowercase.c
index 79624986..8b062762 100644
--- a/src/httplib_lowercase.c
+++ b/src/httplib_lowercase.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/libhttp-private.h b/src/httplib_main.h
similarity index 100%
rename from src/libhttp-private.h
rename to src/httplib_main.h
diff --git a/src/httplib_malloc.c b/src/httplib_malloc.c
index f268f333..1ac46aa5 100644
--- a/src/httplib_malloc.c
+++ b/src/httplib_malloc.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if defined(MEMORY_DEBUGGING)
diff --git a/src/httplib_master_thread.c b/src/httplib_master_thread.c
index 387e5bc9..3aec6bce 100644
--- a/src/httplib_master_thread.c
+++ b/src/httplib_master_thread.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_match_prefix.c b/src/httplib_match_prefix.c
index fe4faba6..3423553d 100644
--- a/src/httplib_match_prefix.c
+++ b/src/httplib_match_prefix.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_md5.c b/src/httplib_md5.c
index a3f46623..260284c4 100644
--- a/src/httplib_md5.c
+++ b/src/httplib_md5.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_mkcol.c b/src/httplib_mkcol.c
index 44904e40..66da5b2b 100644
--- a/src/httplib_mkcol.c
+++ b/src/httplib_mkcol.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_mkdir.c b/src/httplib_mkdir.c
index 12e024d0..6c1bb89e 100644
--- a/src/httplib_mkdir.c
+++ b/src/httplib_mkdir.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if defined(_WIN32)
diff --git a/src/httplib_modify_passwords_file.c b/src/httplib_modify_passwords_file.c
index 390445a5..c58df9c8 100644
--- a/src/httplib_modify_passwords_file.c
+++ b/src/httplib_modify_passwords_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_must_hide_file.c b/src/httplib_must_hide_file.c
index 3c9e3bdc..cdb70032 100644
--- a/src/httplib_must_hide_file.c
+++ b/src/httplib_must_hide_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_next_option.c b/src/httplib_next_option.c
index 5376caf2..6aa414e9 100644
--- a/src/httplib_next_option.c
+++ b/src/httplib_next_option.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_open_auth_file.c b/src/httplib_open_auth_file.c
index 28023fb0..7a053edf 100644
--- a/src/httplib_open_auth_file.c
+++ b/src/httplib_open_auth_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_opendir.c b/src/httplib_opendir.c
index 6b8f381e..e3e767c3 100644
--- a/src/httplib_opendir.c
+++ b/src/httplib_opendir.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_parse_auth_header.c b/src/httplib_parse_auth_header.c
index 75a2add5..7b0b07c0 100644
--- a/src/httplib_parse_auth_header.c
+++ b/src/httplib_parse_auth_header.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_parse_date_string.c b/src/httplib_parse_date_string.c
index a4c3ca85..e21bfdea 100644
--- a/src/httplib_parse_date_string.c
+++ b/src/httplib_parse_date_string.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if !defined(NO_CACHING)
diff --git a/src/httplib_parse_http_headers.c b/src/httplib_parse_http_headers.c
index 54c5b4d0..cdf80fcb 100644
--- a/src/httplib_parse_http_headers.c
+++ b/src/httplib_parse_http_headers.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_parse_http_message.c b/src/httplib_parse_http_message.c
index 3edcfa02..16f0b4d0 100644
--- a/src/httplib_parse_http_message.c
+++ b/src/httplib_parse_http_message.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_parse_net.c b/src/httplib_parse_net.c
index 28e1c8be..9264a939 100644
--- a/src/httplib_parse_net.c
+++ b/src/httplib_parse_net.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_parse_range_header.c b/src/httplib_parse_range_header.c
index f93bcd84..1cb1dd31 100644
--- a/src/httplib_parse_range_header.c
+++ b/src/httplib_parse_range_header.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_path_to_unicode.c b/src/httplib_path_to_unicode.c
index 0521454f..7fec378e 100644
--- a/src/httplib_path_to_unicode.c
+++ b/src/httplib_path_to_unicode.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_poll.c b/src/httplib_poll.c
index 1d6c4a14..14d53c31 100644
--- a/src/httplib_poll.c
+++ b/src/httplib_poll.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if defined(_WIN32)  &&  !defined(HAVE_POLL)
diff --git a/src/httplib_prepare_cgi_environment.c b/src/httplib_prepare_cgi_environment.c
index c7d909cc..7047ba5c 100644
--- a/src/httplib_prepare_cgi_environment.c
+++ b/src/httplib_prepare_cgi_environment.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_print_dir_entry.c b/src/httplib_print_dir_entry.c
index f4ef0c3b..dedfa5ed 100644
--- a/src/httplib_print_dir_entry.c
+++ b/src/httplib_print_dir_entry.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_printf.c b/src/httplib_printf.c
index cd637c3a..6c639082 100644
--- a/src/httplib_printf.c
+++ b/src/httplib_printf.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_process_new_connection.c b/src/httplib_process_new_connection.c
index df767295..08e92a19 100644
--- a/src/httplib_process_new_connection.c
+++ b/src/httplib_process_new_connection.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_produce_socket.c b/src/httplib_produce_socket.c
index b5ab9c8b..184613de 100644
--- a/src/httplib_produce_socket.c
+++ b/src/httplib_produce_socket.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_pull.c b/src/httplib_pull.c
index 4034943b..2056e549 100644
--- a/src/httplib_pull.c
+++ b/src/httplib_pull.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 /* Read from IO channel - opened file descriptor, socket, or SSL descriptor.
diff --git a/src/httplib_pull_all.c b/src/httplib_pull_all.c
index 22429b22..9356a646 100644
--- a/src/httplib_pull_all.c
+++ b/src/httplib_pull_all.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 int XX_httplib_pull_all( FILE *fp, struct mg_connection *conn, char *buf, int len ) {
diff --git a/src/httplib_push_all.c b/src/httplib_push_all.c
index c6b9ed7f..1117950c 100644
--- a/src/httplib_push_all.c
+++ b/src/httplib_push_all.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_put_dir.c b/src/httplib_put_dir.c
index 4654b6a9..67782e22 100644
--- a/src/httplib_put_dir.c
+++ b/src/httplib_put_dir.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_put_file.c b/src/httplib_put_file.c
index dbafa214..005ec4e5 100644
--- a/src/httplib_put_file.c
+++ b/src/httplib_put_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_read.c b/src/httplib_read.c
index 9090be95..e8573e05 100644
--- a/src/httplib_read.c
+++ b/src/httplib_read.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_read_auth_file.c b/src/httplib_read_auth_file.c
index d280af8e..68f98f56 100644
--- a/src/httplib_read_auth_file.c
+++ b/src/httplib_read_auth_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_read_request.c b/src/httplib_read_request.c
index d64caa50..96ad1058 100644
--- a/src/httplib_read_request.c
+++ b/src/httplib_read_request.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_read_websocket.c b/src/httplib_read_websocket.c
index 2b666a0a..cbd71377 100644
--- a/src/httplib_read_websocket.c
+++ b/src/httplib_read_websocket.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_readdir.c b/src/httplib_readdir.c
index d7da2411..8fd901c1 100644
--- a/src/httplib_readdir.c
+++ b/src/httplib_readdir.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_realloc2.c b/src/httplib_realloc2.c
index 794f7752..1ebd177c 100644
--- a/src/httplib_realloc2.c
+++ b/src/httplib_realloc2.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 /* Behaves like realloc(), but frees original pointer on failure */
diff --git a/src/httplib_redirect_to_https_port.c b/src/httplib_redirect_to_https_port.c
index 22500558..f5685690 100644
--- a/src/httplib_redirect_to_https_port.c
+++ b/src/httplib_redirect_to_https_port.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_refresh_trust.c b/src/httplib_refresh_trust.c
index 6b523bbd..b22d750e 100644
--- a/src/httplib_refresh_trust.c
+++ b/src/httplib_refresh_trust.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_remove.c b/src/httplib_remove.c
index bd687e33..78224b6c 100644
--- a/src/httplib_remove.c
+++ b/src/httplib_remove.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_remove_bad_file.c b/src/httplib_remove_bad_file.c
index 50e82162..eba4556e 100644
--- a/src/httplib_remove_bad_file.c
+++ b/src/httplib_remove_bad_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_remove_directory.c b/src/httplib_remove_directory.c
index c1e5e82d..e1ddf217 100644
--- a/src/httplib_remove_directory.c
+++ b/src/httplib_remove_directory.c
@@ -24,7 +24,9 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
+
+
 
 int XX_httplib_remove_directory( struct mg_connection *conn, const char *dir ) {
 
diff --git a/src/httplib_remove_double_dots.c b/src/httplib_remove_double_dots.c
index 4911cbd1..1d6a66f5 100644
--- a/src/httplib_remove_double_dots.c
+++ b/src/httplib_remove_double_dots.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_reset_per_request_attributes.c b/src/httplib_reset_per_request_attributes.c
index f8e950ec..b08cd33f 100644
--- a/src/httplib_reset_per_request_attributes.c
+++ b/src/httplib_reset_per_request_attributes.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_scan_directory.c b/src/httplib_scan_directory.c
index 224086d8..2983b782 100644
--- a/src/httplib_scan_directory.c
+++ b/src/httplib_scan_directory.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_send_authorization_request.c b/src/httplib_send_authorization_request.c
index 741d8653..6af71783 100644
--- a/src/httplib_send_authorization_request.c
+++ b/src/httplib_send_authorization_request.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_send_file.c b/src/httplib_send_file.c
index b3d0901c..301d12a3 100644
--- a/src/httplib_send_file.c
+++ b/src/httplib_send_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_send_file_data.c b/src/httplib_send_file_data.c
index 48d301e9..d1fdb5fe 100644
--- a/src/httplib_send_file_data.c
+++ b/src/httplib_send_file_data.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_send_http_error.c b/src/httplib_send_http_error.c
index f084d3c4..bba62915 100644
--- a/src/httplib_send_http_error.c
+++ b/src/httplib_send_http_error.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 void XX_httplib_send_http_error( struct mg_connection *conn, int status, const char *fmt, ... ) {
diff --git a/src/httplib_send_no_cache_header.c b/src/httplib_send_no_cache_header.c
index 3a500376..3ec81397 100644
--- a/src/httplib_send_no_cache_header.c
+++ b/src/httplib_send_no_cache_header.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 int XX_httplib_send_no_cache_header( struct mg_connection *conn ) {
diff --git a/src/httplib_send_options.c b/src/httplib_send_options.c
index 54a6c046..c0611698 100644
--- a/src/httplib_send_options.c
+++ b/src/httplib_send_options.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_send_static_cache_header.c b/src/httplib_send_static_cache_header.c
index 9d77308a..ba9c8c11 100644
--- a/src/httplib_send_static_cache_header.c
+++ b/src/httplib_send_static_cache_header.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 int XX_httplib_send_static_cache_header(struct mg_connection *conn) {
diff --git a/src/httplib_send_websocket_handshake.c b/src/httplib_send_websocket_handshake.c
index ae0b314e..924f3f71 100644
--- a/src/httplib_send_websocket_handshake.c
+++ b/src/httplib_send_websocket_handshake.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_acl_option.c b/src/httplib_set_acl_option.c
index a3c19132..387f5c73 100644
--- a/src/httplib_set_acl_option.c
+++ b/src/httplib_set_acl_option.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_auth_handler.c b/src/httplib_set_auth_handler.c
index db91f90a..ced9587e 100644
--- a/src/httplib_set_auth_handler.c
+++ b/src/httplib_set_auth_handler.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_close_on_exec.c b/src/httplib_set_close_on_exec.c
index f012eb4d..faa943d8 100644
--- a/src/httplib_set_close_on_exec.c
+++ b/src/httplib_set_close_on_exec.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if defined(_WIN32)
diff --git a/src/httplib_set_gpass_option.c b/src/httplib_set_gpass_option.c
index 6730d7ad..b0a99ff4 100644
--- a/src/httplib_set_gpass_option.c
+++ b/src/httplib_set_gpass_option.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_handler_type.c b/src/httplib_set_handler_type.c
index c952e5ae..45148f6f 100644
--- a/src/httplib_set_handler_type.c
+++ b/src/httplib_set_handler_type.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_non_blocking_mode.c b/src/httplib_set_non_blocking_mode.c
index bf4b3d47..27aebe94 100644
--- a/src/httplib_set_non_blocking_mode.c
+++ b/src/httplib_set_non_blocking_mode.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if defined(_WIN32)
diff --git a/src/httplib_set_ports_option.c b/src/httplib_set_ports_option.c
index 4f1ee833..46355844 100644
--- a/src/httplib_set_ports_option.c
+++ b/src/httplib_set_ports_option.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_request_handler.c b/src/httplib_set_request_handler.c
index b966e0c0..c5a5fb94 100644
--- a/src/httplib_set_request_handler.c
+++ b/src/httplib_set_request_handler.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_sock_timeout.c b/src/httplib_set_sock_timeout.c
index e05ebbca..69d2d0fc 100644
--- a/src/httplib_set_sock_timeout.c
+++ b/src/httplib_set_sock_timeout.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_ssl_option.c b/src/httplib_set_ssl_option.c
index a30e3a73..f0ef1b4b 100644
--- a/src/httplib_set_ssl_option.c
+++ b/src/httplib_set_ssl_option.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_tcp_nodelay.c b/src/httplib_set_tcp_nodelay.c
index 2888a215..5c891a77 100644
--- a/src/httplib_set_tcp_nodelay.c
+++ b/src/httplib_set_tcp_nodelay.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_thread_name.c b/src/httplib_set_thread_name.c
index 2f554046..11885662 100644
--- a/src/httplib_set_thread_name.c
+++ b/src/httplib_set_thread_name.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_throttle.c b/src/httplib_set_throttle.c
index 8a4e186a..984926e5 100644
--- a/src/httplib_set_throttle.c
+++ b/src/httplib_set_throttle.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_uid_option.c b/src/httplib_set_uid_option.c
index 79f83c3d..de48444e 100644
--- a/src/httplib_set_uid_option.c
+++ b/src/httplib_set_uid_option.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_set_user_connection_data.c b/src/httplib_set_user_connection_data.c
index a7674bb8..18b2a946 100644
--- a/src/httplib_set_user_connection_data.c
+++ b/src/httplib_set_user_connection_data.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 void mg_set_user_connection_data(struct mg_connection *conn, void *data) {
diff --git a/src/httplib_set_websocket_handler.c b/src/httplib_set_websocket_handler.c
index eae05d95..2738eb17 100644
--- a/src/httplib_set_websocket_handler.c
+++ b/src/httplib_set_websocket_handler.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_should_decode_url.c b/src/httplib_should_decode_url.c
index d6b43f75..c49b798c 100644
--- a/src/httplib_should_decode_url.c
+++ b/src/httplib_should_decode_url.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_should_keep_alive.c b/src/httplib_should_keep_alive.c
index da1d1216..e0ebc793 100644
--- a/src/httplib_should_keep_alive.c
+++ b/src/httplib_should_keep_alive.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_skip.c b/src/httplib_skip.c
index 8025d352..f391b5eb 100644
--- a/src/httplib_skip.c
+++ b/src/httplib_skip.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_skip_quoted.c b/src/httplib_skip_quoted.c
index d2c2722b..213546c0 100644
--- a/src/httplib_skip_quoted.c
+++ b/src/httplib_skip_quoted.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_snprintf.c b/src/httplib_snprintf.c
index 95ef7260..5a9f74d0 100644
--- a/src/httplib_snprintf.c
+++ b/src/httplib_snprintf.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_sockaddr_to_string.c b/src/httplib_sockaddr_to_string.c
index 758bb8a4..8a2b5f71 100644
--- a/src/httplib_sockaddr_to_string.c
+++ b/src/httplib_sockaddr_to_string.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_spawn_process.c b/src/httplib_spawn_process.c
index 0ee4a860..ad40644b 100644
--- a/src/httplib_spawn_process.c
+++ b/src/httplib_spawn_process.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if defined(_WIN32)
diff --git a/src/httplib_ssi.c b/src/httplib_ssi.c
index 8f9cf61b..edefe35f 100644
--- a/src/httplib_ssi.c
+++ b/src/httplib_ssi.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_ssl_error.c b/src/httplib_ssl_error.c
index f1cf2ed2..46990dc2 100644
--- a/src/httplib_ssl_error.c
+++ b/src/httplib_ssl_error.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_ssl_get_client_cert_info.c b/src/httplib_ssl_get_client_cert_info.c
index 9b572d87..8c96b16a 100644
--- a/src/httplib_ssl_get_client_cert_info.c
+++ b/src/httplib_ssl_get_client_cert_info.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_ssl_get_protocol.c b/src/httplib_ssl_get_protocol.c
index 64959e84..9e74e3f5 100644
--- a/src/httplib_ssl_get_protocol.c
+++ b/src/httplib_ssl_get_protocol.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_ssl_id_callback.c b/src/httplib_ssl_id_callback.c
index 4d2ab233..1da43721 100644
--- a/src/httplib_ssl_id_callback.c
+++ b/src/httplib_ssl_id_callback.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_ssl_locking_callback.c b/src/httplib_ssl_locking_callback.c
index 2e8028f7..b7477b7a 100644
--- a/src/httplib_ssl_locking_callback.c
+++ b/src/httplib_ssl_locking_callback.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_ssl_use_pem_file.c b/src/httplib_ssl_use_pem_file.c
index 1c6febad..7737032d 100644
--- a/src/httplib_ssl_use_pem_file.c
+++ b/src/httplib_ssl_use_pem_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_sslize.c b/src/httplib_sslize.c
index b75cf74a..34297c67 100644
--- a/src/httplib_sslize.c
+++ b/src/httplib_sslize.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_start.c b/src/httplib_start.c
index e4615186..cd6a8e7e 100644
--- a/src/httplib_start.c
+++ b/src/httplib_start.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_start_thread.c b/src/httplib_start_thread.c
index 5659ba4b..f519fcf1 100644
--- a/src/httplib_start_thread.c
+++ b/src/httplib_start_thread.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if defined(_WIN32)
diff --git a/src/httplib_start_thread_with_id.c b/src/httplib_start_thread_with_id.c
index 761fce13..fe2a365e 100644
--- a/src/httplib_start_thread_with_id.c
+++ b/src/httplib_start_thread_with_id.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_stat.c b/src/httplib_stat.c
index a62bc7aa..ba99a6fc 100644
--- a/src/httplib_stat.c
+++ b/src/httplib_stat.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 #if defined(_WIN32)
diff --git a/src/httplib_stop.c b/src/httplib_stop.c
index 3dad7614..36845fd7 100644
--- a/src/httplib_stop.c
+++ b/src/httplib_stop.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_store_body.c b/src/httplib_store_body.c
index 66fc409f..a2775eb5 100644
--- a/src/httplib_store_body.c
+++ b/src/httplib_store_body.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_strcasecmp.c b/src/httplib_strcasecmp.c
index 69a85bbe..64df0730 100644
--- a/src/httplib_strcasecmp.c
+++ b/src/httplib_strcasecmp.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_strcasestr.c b/src/httplib_strcasestr.c
index 05806bfa..b235b9b5 100644
--- a/src/httplib_strcasestr.c
+++ b/src/httplib_strcasestr.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_strdup.c b/src/httplib_strdup.c
index 71211e9f..b795cdef 100644
--- a/src/httplib_strdup.c
+++ b/src/httplib_strdup.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_strlcpy.c b/src/httplib_strlcpy.c
index 3b9b0f91..4db0322f 100644
--- a/src/httplib_strlcpy.c
+++ b/src/httplib_strlcpy.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_strncasecmp.c b/src/httplib_strncasecmp.c
index 88701f55..28cf09c0 100644
--- a/src/httplib_strncasecmp.c
+++ b/src/httplib_strncasecmp.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 int mg_strncasecmp( const char *s1, const char *s2, size_t len ) {
diff --git a/src/httplib_strndup.c b/src/httplib_strndup.c
index 67a69d35..46c639c3 100644
--- a/src/httplib_strndup.c
+++ b/src/httplib_strndup.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 char * XX_httplib_strndup( const char *ptr, size_t len ) {
diff --git a/src/httplib_substitute_index_file.c b/src/httplib_substitute_index_file.c
index b6b58c7b..fb2913cc 100644
--- a/src/httplib_substitute_index_file.c
+++ b/src/httplib_substitute_index_file.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_suggest_connection_header.c b/src/httplib_suggest_connection_header.c
index 45ef41b0..49272e27 100644
--- a/src/httplib_suggest_connection_header.c
+++ b/src/httplib_suggest_connection_header.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_timer.c b/src/httplib_timer.c
index f77cad15..78905753 100644
--- a/src/httplib_timer.c
+++ b/src/httplib_timer.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_tls_dtor.c b/src/httplib_tls_dtor.c
index 09a8660e..25639ea4 100644
--- a/src/httplib_tls_dtor.c
+++ b/src/httplib_tls_dtor.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_uninitialize_ssl.c b/src/httplib_uninitialize_ssl.c
index c5b28823..0019bc76 100644
--- a/src/httplib_uninitialize_ssl.c
+++ b/src/httplib_uninitialize_ssl.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_url_decode.c b/src/httplib_url_decode.c
index 98879354..cb8ad6fe 100644
--- a/src/httplib_url_decode.c
+++ b/src/httplib_url_decode.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_url_encode.c b/src/httplib_url_encode.c
index bcd6f326..c185bb68 100644
--- a/src/httplib_url_encode.c
+++ b/src/httplib_url_encode.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_version.c b/src/httplib_version.c
index 7f1d9a71..3a7f5bd3 100644
--- a/src/httplib_version.c
+++ b/src/httplib_version.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_vprintf.c b/src/httplib_vprintf.c
index 6446319f..6a3d75fb 100644
--- a/src/httplib_vprintf.c
+++ b/src/httplib_vprintf.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_vsnprintf.c b/src/httplib_vsnprintf.c
index ca7d5de4..8e5aede3 100644
--- a/src/httplib_vsnprintf.c
+++ b/src/httplib_vsnprintf.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_websocket_client_thread.c b/src/httplib_websocket_client_thread.c
index fbe38af3..4ff0cc40 100644
--- a/src/httplib_websocket_client_thread.c
+++ b/src/httplib_websocket_client_thread.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_websocket_client_write.c b/src/httplib_websocket_client_write.c
index b81fcb89..e5a64466 100644
--- a/src/httplib_websocket_client_write.c
+++ b/src/httplib_websocket_client_write.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_websocket_write.c b/src/httplib_websocket_write.c
index a3013b4c..9aa39755 100644
--- a/src/httplib_websocket_write.c
+++ b/src/httplib_websocket_write.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_websocket_write_exec.c b/src/httplib_websocket_write_exec.c
index bb7b8360..f85e266c 100644
--- a/src/httplib_websocket_write_exec.c
+++ b/src/httplib_websocket_write_exec.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/httplib_worker_thread.c b/src/httplib_worker_thread.c
index 66f6aeaf..e9a6f647 100644
--- a/src/httplib_worker_thread.c
+++ b/src/httplib_worker_thread.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/httplib_write.c b/src/httplib_write.c
index af43d896..b0fb151a 100644
--- a/src/httplib_write.c
+++ b/src/httplib_write.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/osx_clock_gettime.c b/src/osx_clock_gettime.c
index 2126e4e7..3b3eb35d 100644
--- a/src/osx_clock_gettime.c
+++ b/src/osx_clock_gettime.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 #ifdef __MACH__
 
diff --git a/src/win32_clock_gettime.c b/src/win32_clock_gettime.c
index 6048a24c..31b3c6f3 100644
--- a/src/win32_clock_gettime.c
+++ b/src/win32_clock_gettime.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/win32_pthread_cond_broadcast.c b/src/win32_pthread_cond_broadcast.c
index 1d8225ca..bea7a861 100644
--- a/src/win32_pthread_cond_broadcast.c
+++ b/src/win32_pthread_cond_broadcast.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_cond_destroy.c b/src/win32_pthread_cond_destroy.c
index b8fc7290..d22e97ea 100644
--- a/src/win32_pthread_cond_destroy.c
+++ b/src/win32_pthread_cond_destroy.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_cond_init.c b/src/win32_pthread_cond_init.c
index 5df1058a..54c2f100 100644
--- a/src/win32_pthread_cond_init.c
+++ b/src/win32_pthread_cond_init.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_cond_signal.c b/src/win32_pthread_cond_signal.c
index 5524725b..e48ebd26 100644
--- a/src/win32_pthread_cond_signal.c
+++ b/src/win32_pthread_cond_signal.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_cond_timedwait.c b/src/win32_pthread_cond_timedwait.c
index 92c37f85..89068523 100644
--- a/src/win32_pthread_cond_timedwait.c
+++ b/src/win32_pthread_cond_timedwait.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_cond_wait.c b/src/win32_pthread_cond_wait.c
index 98acabe8..52399a51 100644
--- a/src/win32_pthread_cond_wait.c
+++ b/src/win32_pthread_cond_wait.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_getspecific.c b/src/win32_pthread_getspecific.c
index 15bf4afd..8f269676 100644
--- a/src/win32_pthread_getspecific.c
+++ b/src/win32_pthread_getspecific.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_key_create.c b/src/win32_pthread_key_create.c
index 15afa779..1ea228de 100644
--- a/src/win32_pthread_key_create.c
+++ b/src/win32_pthread_key_create.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_key_delete.c b/src/win32_pthread_key_delete.c
index d22e1374..cca3cb15 100644
--- a/src/win32_pthread_key_delete.c
+++ b/src/win32_pthread_key_delete.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_mutex_destroy.c b/src/win32_pthread_mutex_destroy.c
index b2642b82..1cd65e04 100644
--- a/src/win32_pthread_mutex_destroy.c
+++ b/src/win32_pthread_mutex_destroy.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_mutex_init.c b/src/win32_pthread_mutex_init.c
index eb24727a..b29679a6 100644
--- a/src/win32_pthread_mutex_init.c
+++ b/src/win32_pthread_mutex_init.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_mutex_lock.c b/src/win32_pthread_mutex_lock.c
index 8016c2e6..3edabcc9 100644
--- a/src/win32_pthread_mutex_lock.c
+++ b/src/win32_pthread_mutex_lock.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_mutex_trylock.c b/src/win32_pthread_mutex_trylock.c
index 56322900..3aa58fea 100644
--- a/src/win32_pthread_mutex_trylock.c
+++ b/src/win32_pthread_mutex_trylock.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_mutex_unlock.c b/src/win32_pthread_mutex_unlock.c
index ebec2c03..892af8de 100644
--- a/src/win32_pthread_mutex_unlock.c
+++ b/src/win32_pthread_mutex_unlock.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_self.c b/src/win32_pthread_self.c
index 28cb90c7..f8fdb093 100644
--- a/src/win32_pthread_self.c
+++ b/src/win32_pthread_self.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/win32_pthread_setspecific.c b/src/win32_pthread_setspecific.c
index 62993b8e..f04c1f7e 100644
--- a/src/win32_pthread_setspecific.c
+++ b/src/win32_pthread_setspecific.c
@@ -24,8 +24,7 @@
 
 
 
-#include "libhttp-private.h"
-
+#include "httplib_main.h"
 #include "httplib_pthread.h"
 
 
diff --git a/src/wince_gmtime.c b/src/wince_gmtime.c
index e9ca6b7f..db411b36 100644
--- a/src/wince_gmtime.c
+++ b/src/wince_gmtime.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/wince_gmtime_s.c b/src/wince_gmtime_s.c
index 00f8fac7..a83d2757 100644
--- a/src/wince_gmtime_s.c
+++ b/src/wince_gmtime_s.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/wince_localtime.c b/src/wince_localtime.c
index a960052c..0391dd3e 100644
--- a/src/wince_localtime.c
+++ b/src/wince_localtime.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/wince_localtime_s.c b/src/wince_localtime_s.c
index 9c713773..e6e60b2d 100644
--- a/src/wince_localtime_s.c
+++ b/src/wince_localtime_s.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/wince_rename.c b/src/wince_rename.c
index 42692e2d..90b823a7 100644
--- a/src/wince_rename.c
+++ b/src/wince_rename.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/wince_stat.c b/src/wince_stat.c
index 24879675..720f6f05 100644
--- a/src/wince_stat.c
+++ b/src/wince_stat.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/wince_strftime.c b/src/wince_strftime.c
index 61fb0c32..17871a0e 100644
--- a/src/wince_strftime.c
+++ b/src/wince_strftime.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"
 
 
 
diff --git a/src/wince_time.c b/src/wince_time.c
index 851f7959..064c0af3 100644
--- a/src/wince_time.c
+++ b/src/wince_time.c
@@ -24,7 +24,7 @@
 
 
 
-#include "libhttp-private.h"
+#include "httplib_main.h"