14 files changed, 17 insertions, 14 deletions
diff --git a/libsoup/meson.build b/libsoup/meson.build
index b1fca819..9780fb0d 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -16,9 +16,6 @@ soup_sources = [
   'auth/soup-auth-digest.c',
   'auth/soup-auth-ntlm.c',
   'auth/soup-auth-negotiate.c',
-  'auth/soup-auth-domain.c',
-  'auth/soup-auth-domain-basic.c',
-  'auth/soup-auth-domain-digest.c',
   'auth/soup-auth-manager.c',
   'auth/soup-connection-auth.c',
 
@@ -41,6 +38,13 @@ soup_sources = [
   'hsts/soup-hsts-enforcer-db.c',
   'hsts/soup-hsts-policy.c',
 
+  'server/soup-auth-domain.c',
+  'server/soup-auth-domain-basic.c',
+  'server/soup-auth-domain-digest.c',
+  'server/soup-message-server-io.c',
+  'server/soup-path-map.c',
+  'server/soup-server.c',
+
   'websocket/soup-websocket.c',
   'websocket/soup-websocket-connection.c',
   'websocket/soup-websocket-extension.c',
@@ -65,17 +69,14 @@ soup_sources = [
   'soup-message-headers.c',
   'soup-message-io.c',
   'soup-message-queue.c',
-  'soup-message-server-io.c',
   'soup-method.c',
   'soup-misc.c',
   'soup-multipart.c',
   'soup-multipart-input-stream.c',
-  'soup-path-map.c',
   'soup-request.c',
   'soup-request-data.c',
   'soup-request-file.c',
   'soup-request-http.c',
-  'soup-server.c',
   'soup-session.c',
   'soup-session-feature.c',
   'soup-socket.c',
@@ -94,9 +95,6 @@ soup_introspection_headers = [
   'auth/soup-auth.h',
   'auth/soup-auth-basic.h',
   'auth/soup-auth-digest.h',
-  'auth/soup-auth-domain.h',
-  'auth/soup-auth-domain-basic.h',
-  'auth/soup-auth-domain-digest.h',
   'auth/soup-auth-manager.h',
   'auth/soup-auth-negotiate.h',
   'auth/soup-auth-ntlm.h',
@@ -116,6 +114,11 @@ soup_introspection_headers = [
   'hsts/soup-hsts-enforcer-db.h',
   'hsts/soup-hsts-policy.h',
 
+  'server/soup-auth-domain.h',
+  'server/soup-auth-domain-basic.h',
+  'server/soup-auth-domain-digest.h',
+  'server/soup-server.h',
+
   'websocket/soup-websocket.h',
   'websocket/soup-websocket-connection.h',
   'websocket/soup-websocket-extension.h',
@@ -136,7 +139,6 @@ soup_introspection_headers = [
   'soup-request-data.h',
   'soup-request-file.h',
   'soup-request-http.h',
-  'soup-server.h',
   'soup-session.h',
   'soup-session-feature.h',
   'soup-status.h',
@@ -201,6 +203,7 @@ libsoup_includes = [
     'auth',
     'cookies',
     'hsts',
+    'server',
     'websocket',
     '.'
   ]),
diff --git a/libsoup/auth/soup-auth-domain-basic.c b/libsoup/server/soup-auth-domain-basic.c
index 9a850050..9a850050 100644
--- a/libsoup/auth/soup-auth-domain-basic.c
+++ b/libsoup/server/soup-auth-domain-basic.c
diff --git a/libsoup/auth/soup-auth-domain-basic.h b/libsoup/server/soup-auth-domain-basic.h
index a260e891..a260e891 100644
--- a/libsoup/auth/soup-auth-domain-basic.h
+++ b/libsoup/server/soup-auth-domain-basic.h
diff --git a/libsoup/auth/soup-auth-domain-digest.c b/libsoup/server/soup-auth-domain-digest.c
index ae9fa266..ae9fa266 100644
--- a/libsoup/auth/soup-auth-domain-digest.c
+++ b/libsoup/server/soup-auth-domain-digest.c
diff --git a/libsoup/auth/soup-auth-domain-digest.h b/libsoup/server/soup-auth-domain-digest.h
index 523497ce..523497ce 100644
--- a/libsoup/auth/soup-auth-domain-digest.h
+++ b/libsoup/server/soup-auth-domain-digest.h
diff --git a/libsoup/auth/soup-auth-domain.c b/libsoup/server/soup-auth-domain.c
index 8785c474..8785c474 100644
--- a/libsoup/auth/soup-auth-domain.c
+++ b/libsoup/server/soup-auth-domain.c
diff --git a/libsoup/auth/soup-auth-domain.h b/libsoup/server/soup-auth-domain.h
index 397dc53b..397dc53b 100644
--- a/libsoup/auth/soup-auth-domain.h
+++ b/libsoup/server/soup-auth-domain.h
diff --git a/libsoup/soup-message-server-io.c b/libsoup/server/soup-message-server-io.c
index acd1490c..acd1490c 100644
--- a/libsoup/soup-message-server-io.c
+++ b/libsoup/server/soup-message-server-io.c
diff --git a/libsoup/soup-path-map.c b/libsoup/server/soup-path-map.c
index 6be8eb67..6be8eb67 100644
--- a/libsoup/soup-path-map.c
+++ b/libsoup/server/soup-path-map.c
diff --git a/libsoup/soup-path-map.h b/libsoup/server/soup-path-map.h
index 8c3b3367..8c3b3367 100644
--- a/libsoup/soup-path-map.h
+++ b/libsoup/server/soup-path-map.h
diff --git a/libsoup/soup-server-private.h b/libsoup/server/soup-server-private.h
index 15430e73..15430e73 100644
--- a/libsoup/soup-server-private.h
+++ b/libsoup/server/soup-server-private.h
diff --git a/libsoup/soup-server.c b/libsoup/server/soup-server.c
index aa5f2203..aa5f2203 100644
--- a/libsoup/soup-server.c
+++ b/libsoup/server/soup-server.c
diff --git a/libsoup/soup-server.h b/libsoup/server/soup-server.h
index eb9a13b7..eb9a13b7 100644
--- a/libsoup/soup-server.h
+++ b/libsoup/server/soup-server.h
diff --git a/libsoup/soup.h b/libsoup/soup.h
index 4e4d4a62..36485dc2 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -15,9 +15,6 @@ extern "C" {
 #include "auth/soup-auth.h"
 #include "auth/soup-auth-basic.h"
 #include "auth/soup-auth-digest.h"
-#include "auth/soup-auth-domain.h"
-#include "auth/soup-auth-domain-basic.h"
-#include "auth/soup-auth-domain-digest.h"
 #include "auth/soup-auth-manager.h"
 #include "auth/soup-auth-negotiate.h"
 #include "auth/soup-auth-ntlm.h"
@@ -44,7 +41,10 @@ extern "C" {
 #include "soup-request-data.h"
 #include "soup-request-file.h"
 #include "soup-request-http.h"
-#include "soup-server.h"
+#include "server/soup-auth-domain.h"
+#include "server/soup-auth-domain-basic.h"
+#include "server/soup-auth-domain-digest.h"
+#include "server/soup-server.h"
 #include "soup-session.h"
 #include "soup-session-feature.h"
 #include "soup-socket.h"