1 files changed, 5 insertions, 55 deletions
diff --git a/utils/http.h b/utils/http.h
index f15a10218..173604fb4 100644
--- a/utils/http.h
+++ b/utils/http.h
@@ -23,63 +23,13 @@
 #ifndef NETSURF_UTILS_HTTP_H_
 #define NETSURF_UTILS_HTTP_H_
 
-#include "utils/errors.h"
-
-typedef struct http_parameter http_parameter;
-
-/**
- * Parse an HTTP Content-Type header value
- *
- * \param header_value  Header value to parse
- * \param media_type    Pointer to location to receive media type
- * \param parameters    Pointer to location to receive parameter list
- * \return NSERROR_OK on success,
- *         NSERROR_NOMEM on memory exhaustion
- */
-nserror http_parse_content_type(const char *header_value, char **media_type, 
-		http_parameter **parameters);
-
-/**
- * Parse an HTTP Content-Disposition header value
- *
- * \param header_value      Header value to parse
- * \param disposition_type  Pointer to location to receive disposition type
- * \param parameters        Pointer to location to receive parameter list
- * \return NSERROR_OK on success,
- *         NSERROR_NOMEM on memory exhaustion
- */
-nserror http_parse_content_disposition(const char *header_value,
-		char **disposition_type, http_parameter **parameters);
+#include <libwapcaplet/libwapcaplet.h>
 
-/**
- * Find a named item in an HTTP parameter list
- *
- * \param list   List to search
- * \param name   Name of item to search for
- * \param value  Pointer to location to receive value
- * \return NSERROR_OK on success,
- *         NSERROR_NOT_FOUND if requested item does not exist
- */
-nserror http_parameter_list_find_item(const http_parameter *list,
-		const char *name, const char **value);
-
-/**
- * Iterate over a parameter list
- *
- * \param cur    Pointer to current iteration position, list head to start
- * \param name   Pointer to location to receive item name
- * \param value  Pointer to location to receive item value
- * \return Pointer to next iteration position, or NULL for end of iteration
- */
-const http_parameter *http_parameter_list_iterate(const http_parameter *cur,
-		const char **name, const char **value);
+#include "utils/errors.h"
 
-/**
- * Destroy a list of HTTP parameters
- *
- * \param list  List to destroy
- */
-void http_parameter_list_destroy(http_parameter *list);
+#include "utils/http/content-disposition.h"
+#include "utils/http/content-type.h"
+#include "utils/http/www-authenticate.h"
 
 #endif