Update soup.h removing private headers

18 files changed, 21 insertions, 7 deletions

diff --git a/libsoup/auth/soup-auth-manager.c b/libsoup/auth/soup-auth-manager.c
index 26be2ead..b20d73f0 100644
--- a/libsoup/auth/soup-auth-manager.c
+++ b/libsoup/auth/soup-auth-manager.c
@@ -17,6 +17,7 @@
 #include "soup-message-private.h"
 #include "soup-path-map.h"
 #include "soup-session-private.h"
+#include "soup-uri-utils-private.h"
 
 /**
  * SECTION:soup-auth-manager
diff --git a/libsoup/auth/soup-auth.c b/libsoup/auth/soup-auth.c
index 2667895b..c4c87dc5 100644
--- a/libsoup/auth/soup-auth.c
+++ b/libsoup/auth/soup-auth.c
@@ -15,6 +15,7 @@
 #include "soup.h"
 #include "soup-connection-auth.h"
 #include "soup-message-private.h"
+#include "soup-uri-utils-private.h"
 
 /**
  * SECTION:soup-auth
diff --git a/libsoup/cookies/soup-cookie-jar.c b/libsoup/cookies/soup-cookie-jar.c
index 3d09dab2..5231e548 100644
--- a/libsoup/cookies/soup-cookie-jar.c
+++ b/libsoup/cookies/soup-cookie-jar.c
@@ -16,6 +16,7 @@
 #include "soup-message-private.h"
 #include "soup-misc.h"
 #include "soup.h"
+#include "soup-uri-utils-private.h"
 
 /**
  * SECTION:soup-cookie-jar
diff --git a/libsoup/cookies/soup-cookie.c b/libsoup/cookies/soup-cookie.c
index 859150bb..19936dc4 100644
--- a/libsoup/cookies/soup-cookie.c
+++ b/libsoup/cookies/soup-cookie.c
@@ -15,6 +15,7 @@
 #include "soup-cookie.h"
 #include "soup-date-utils-private.h"
 #include "soup-misc.h"
+#include "soup-uri-utils-private.h"
 #include "soup.h"
 
 /**
diff --git a/libsoup/hsts/soup-hsts-enforcer.c b/libsoup/hsts/soup-hsts-enforcer.c
index 5a297bca..de3feba1 100644
--- a/libsoup/hsts/soup-hsts-enforcer.c
+++ b/libsoup/hsts/soup-hsts-enforcer.c
@@ -14,6 +14,7 @@
 #include "soup-misc.h"
 #include "soup.h"
 #include "soup-session-private.h"
+#include "soup-uri-utils-private.h"
 
 /**
  * SECTION:soup-hsts-enforcer
diff --git a/libsoup/include/soup-installed.h b/libsoup/include/soup-installed.h
index 2714a5ab..c90696ec 100644
--- a/libsoup/include/soup-installed.h
+++ b/libsoup/include/soup-installed.h
@@ -13,9 +13,6 @@ extern "C" {
 #define __SOUP_H_INSIDE__
 
 #include <libsoup/soup-auth.h>
-#include <libsoup/soup-auth-domain.h>
-#include <libsoup/soup-auth-domain-basic.h>
-#include <libsoup/soup-auth-domain-digest.h>
 #include <libsoup/soup-auth-manager.h>
 #include <libsoup/soup-cache.h>
 #include <libsoup/soup-content-decoder.h>
@@ -36,7 +33,12 @@ extern "C" {
 #include <libsoup/soup-method.h>
 #include <libsoup/soup-multipart.h>
 #include <libsoup/soup-multipart-input-stream.h>
+#include <libsoup/soup-auth-domain.h>
+#include <libsoup/soup-auth-domain-basic.h>
+#include <libsoup/soup-auth-domain-digest.h>
 #include <libsoup/soup-server.h>
+#include <libsoup/soup-server-message.h>
+#include <libsoup/soup-session.h>
 #include <libsoup/soup-session-feature.h>
 #include <libsoup/soup-status.h>
 #include <libsoup/soup-tld.h>
diff --git a/libsoup/server/soup-auth-domain-digest.c b/libsoup/server/soup-auth-domain-digest.c
index 29ef583c..5ecf4045 100644
--- a/libsoup/server/soup-auth-domain-digest.c
+++ b/libsoup/server/soup-auth-domain-digest.c
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 
 #include "soup-auth-domain-digest.h"
+#include "soup-uri-utils-private.h"
 #include "soup.h"
 #include "auth/soup-auth-digest-private.h"
 
diff --git a/libsoup/server/soup-server-message.c b/libsoup/server/soup-server-message.c
index 03b68724..8f2423b5 100644
--- a/libsoup/server/soup-server-message.c
+++ b/libsoup/server/soup-server-message.c
@@ -15,6 +15,7 @@
 #include "soup-connection.h"
 #include "soup-server-message-private.h"
 #include "soup-socket.h"
+#include "soup-uri-utils-private.h"
 
 /**
  * SECTION:soup-server-message
diff --git a/libsoup/server/soup-server.c b/libsoup/server/soup-server.c
index 0fe41740..3c1bad86 100644
--- a/libsoup/server/soup-server.c
+++ b/libsoup/server/soup-server.c
@@ -20,6 +20,7 @@
 #include "soup-misc.h"
 #include "soup-path-map.h"
 #include "soup-socket.h"
+#include "soup-uri-utils-private.h"
 #include "websocket/soup-websocket.h"
 #include "websocket/soup-websocket-connection.h"
 #include "websocket/soup-websocket-extension-deflate.h"
diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c
index fab6f130..064f3d35 100644
--- a/libsoup/soup-message-io.c
+++ b/libsoup/soup-message-io.c
@@ -26,6 +26,7 @@
 #include "soup-message-private.h"
 #include "soup-message-queue.h"
 #include "soup-misc.h"
+#include "soup-uri-utils-private.h"
 
 struct _SoupClientMessageIOData {
 	SoupMessageIOData base;
diff --git a/libsoup/soup-message.c b/libsoup/soup-message.c
index a302f236..6adcabb1 100644
--- a/libsoup/soup-message.c
+++ b/libsoup/soup-message.c
@@ -15,6 +15,7 @@
 #include "soup.h"
 #include "soup-connection.h"
 #include "soup-message-private.h"
+#include "soup-uri-utils-private.h"
 
 /**
  * SECTION:soup-message
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 296f9d06..ac9a3411 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -22,6 +22,7 @@
 #include "soup-message-queue.h"
 #include "soup-session-private.h"
 #include "soup-socket-properties.h"
+#include "soup-uri-utils-private.h"
 #include "websocket/soup-websocket.h"
 #include "websocket/soup-websocket-connection.h"
 #include "websocket/soup-websocket-extension-manager-private.h"
diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index 84ba9e31..e3ea56a3 100644
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -7,7 +7,7 @@
 
 #include "soup-types.h"
 #include "soup-message.h"
-#include "websocket/soup-websocket-connection.h"
+#include "soup-websocket-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-uri-utils.c b/libsoup/soup-uri-utils.c
index fe596a0b..de4a162a 100644
--- a/libsoup/soup-uri-utils.c
+++ b/libsoup/soup-uri-utils.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "soup-uri-utils.h"
+#include "soup-uri-utils-private.h"
 #include "soup.h"
 #include "soup-misc.h"
 
diff --git a/libsoup/soup.h b/libsoup/soup.h
index d813163b..39fe16ab 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -40,11 +40,9 @@ extern "C" {
 #include "server/soup-server-message.h"
 #include "soup-session.h"
 #include "soup-session-feature.h"
-#include "soup-socket.h"
 #include "soup-status.h"
 #include "soup-tld.h"
 #include "soup-uri-utils.h"
-#include "soup-uri-utils-private.h"
 #include "soup-version.h"
 #include "websocket/soup-websocket.h"
 #include "websocket/soup-websocket-connection.h"
diff --git a/tests/hsts-db-test.c b/tests/hsts-db-test.c
index 655c6d73..54b3bcb8 100644
--- a/tests/hsts-db-test.c
+++ b/tests/hsts-db-test.c
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include "test-utils.h"
+#include "soup-uri-utils-private.h"
 
 #define DB_FILE "hsts-db.sqlite"
 
diff --git a/tests/hsts-test.c b/tests/hsts-test.c
index b8d7e9e2..a0276c77 100644
--- a/tests/hsts-test.c
+++ b/tests/hsts-test.c
@@ -5,6 +5,7 @@
  */
 
 #include "test-utils.h"
+#include "soup-uri-utils-private.h"
 
 GUri *http_uri;
 GUri *https_uri;
diff --git a/tests/server-test.c b/tests/server-test.c
index 38fc2721..9f3f019d 100644
--- a/tests/server-test.c
+++ b/tests/server-test.c
@@ -4,6 +4,7 @@
  */
 
 #include "test-utils.h"
+#include "soup-uri-utils-private.h"
 
 #include <gio/gnetworking.h>