Reorganize source tree

105 files changed, 328 insertions, 216 deletions

diff --git a/libsoup/soup-auth-basic.c b/libsoup/auth/soup-auth-basic.c
index 5f1e7186..5f1e7186 100644
--- a/libsoup/soup-auth-basic.c
+++ b/libsoup/auth/soup-auth-basic.c
diff --git a/libsoup/soup-auth-basic.h b/libsoup/auth/soup-auth-basic.h
index b7936871..b7936871 100644
--- a/libsoup/soup-auth-basic.h
+++ b/libsoup/auth/soup-auth-basic.h
diff --git a/libsoup/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c
index e8ba9903..e8ba9903 100644
--- a/libsoup/soup-auth-digest.c
+++ b/libsoup/auth/soup-auth-digest.c
diff --git a/libsoup/soup-auth-digest.h b/libsoup/auth/soup-auth-digest.h
index 59fd748e..59fd748e 100644
--- a/libsoup/soup-auth-digest.h
+++ b/libsoup/auth/soup-auth-digest.h
diff --git a/libsoup/soup-auth-domain-basic.c b/libsoup/auth/soup-auth-domain-basic.c
index e15f37f3..e15f37f3 100644
--- a/libsoup/soup-auth-domain-basic.c
+++ b/libsoup/auth/soup-auth-domain-basic.c
diff --git a/libsoup/soup-auth-domain-basic.h b/libsoup/auth/soup-auth-domain-basic.h
index 87d129b3..79ee6163 100644
--- a/libsoup/soup-auth-domain-basic.h
+++ b/libsoup/auth/soup-auth-domain-basic.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_AUTH_DOMAIN_BASIC_H__
 #define __SOUP_AUTH_DOMAIN_BASIC_H__ 1
 
-#include <libsoup/soup-auth-domain.h>
+#include "soup-auth-domain.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-auth-domain-digest.c b/libsoup/auth/soup-auth-domain-digest.c
index b69b5829..b69b5829 100644
--- a/libsoup/soup-auth-domain-digest.c
+++ b/libsoup/auth/soup-auth-domain-digest.c
diff --git a/libsoup/soup-auth-domain-digest.h b/libsoup/auth/soup-auth-domain-digest.h
index 8dee9fda..5fbe6c94 100644
--- a/libsoup/soup-auth-domain-digest.h
+++ b/libsoup/auth/soup-auth-domain-digest.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_AUTH_DOMAIN_DIGEST_H__
 #define __SOUP_AUTH_DOMAIN_DIGEST_H__ 1
 
-#include <libsoup/soup-auth-domain.h>
+#include "soup-auth-domain.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-auth-domain.c b/libsoup/auth/soup-auth-domain.c
index 8785c474..8785c474 100644
--- a/libsoup/soup-auth-domain.c
+++ b/libsoup/auth/soup-auth-domain.c
diff --git a/libsoup/soup-auth-domain.h b/libsoup/auth/soup-auth-domain.h
index 15653502..0fdbbb29 100644
--- a/libsoup/soup-auth-domain.h
+++ b/libsoup/auth/soup-auth-domain.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_AUTH_DOMAIN_H__
 #define __SOUP_AUTH_DOMAIN_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-auth-manager.c b/libsoup/auth/soup-auth-manager.c
index 3b9e2b6b..3b9e2b6b 100644
--- a/libsoup/soup-auth-manager.c
+++ b/libsoup/auth/soup-auth-manager.c
diff --git a/libsoup/soup-auth-manager.h b/libsoup/auth/soup-auth-manager.h
index cf38936a..cf38936a 100644
--- a/libsoup/soup-auth-manager.h
+++ b/libsoup/auth/soup-auth-manager.h
diff --git a/libsoup/soup-auth-negotiate.c b/libsoup/auth/soup-auth-negotiate.c
index 1fdf142d..1fdf142d 100644
--- a/libsoup/soup-auth-negotiate.c
+++ b/libsoup/auth/soup-auth-negotiate.c
diff --git a/libsoup/soup-auth-negotiate.h b/libsoup/auth/soup-auth-negotiate.h
index 5c3916bf..5c3916bf 100644
--- a/libsoup/soup-auth-negotiate.h
+++ b/libsoup/auth/soup-auth-negotiate.h
diff --git a/libsoup/soup-auth-ntlm.c b/libsoup/auth/soup-auth-ntlm.c
index 2d078461..2d078461 100644
--- a/libsoup/soup-auth-ntlm.c
+++ b/libsoup/auth/soup-auth-ntlm.c
diff --git a/libsoup/soup-auth-ntlm.h b/libsoup/auth/soup-auth-ntlm.h
index ef07353b..ef07353b 100644
--- a/libsoup/soup-auth-ntlm.h
+++ b/libsoup/auth/soup-auth-ntlm.h
diff --git a/libsoup/soup-auth.c b/libsoup/auth/soup-auth.c
index 2ba75e23..2ba75e23 100644
--- a/libsoup/soup-auth.c
+++ b/libsoup/auth/soup-auth.c
diff --git a/libsoup/soup-auth.h b/libsoup/auth/soup-auth.h
index 523ba766..987946f9 100644
--- a/libsoup/soup-auth.h
+++ b/libsoup/auth/soup-auth.h
@@ -6,8 +6,8 @@
 #ifndef __SOUP_AUTH_H__
 #define __SOUP_AUTH_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-headers.h>
+#include "soup-types.h"
+#include "soup-headers.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-connection-auth.c b/libsoup/auth/soup-connection-auth.c
index f55cfe6b..f55cfe6b 100644
--- a/libsoup/soup-connection-auth.c
+++ b/libsoup/auth/soup-connection-auth.c
diff --git a/libsoup/soup-connection-auth.h b/libsoup/auth/soup-connection-auth.h
index 576ff614..b7ef16fe 100644
--- a/libsoup/soup-connection-auth.h
+++ b/libsoup/auth/soup-connection-auth.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_CONNECTION_AUTH_H__
 #define __SOUP_CONNECTION_AUTH_H__ 1
 
-#include <libsoup/soup-auth.h>
+#include "soup-auth.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-cache-client-input-stream.c b/libsoup/cache/soup-cache-client-input-stream.c
index 11bb2602..11bb2602 100644
--- a/libsoup/soup-cache-client-input-stream.c
+++ b/libsoup/cache/soup-cache-client-input-stream.c
diff --git a/libsoup/soup-cache-client-input-stream.h b/libsoup/cache/soup-cache-client-input-stream.h
index 2c9da06e..2c9da06e 100644
--- a/libsoup/soup-cache-client-input-stream.h
+++ b/libsoup/cache/soup-cache-client-input-stream.h
diff --git a/libsoup/soup-cache-input-stream.c b/libsoup/cache/soup-cache-input-stream.c
index e93b43fd..e93b43fd 100644
--- a/libsoup/soup-cache-input-stream.c
+++ b/libsoup/cache/soup-cache-input-stream.c
diff --git a/libsoup/soup-cache-input-stream.h b/libsoup/cache/soup-cache-input-stream.h
index 92b1d7b6..92b1d7b6 100644
--- a/libsoup/soup-cache-input-stream.h
+++ b/libsoup/cache/soup-cache-input-stream.h
diff --git a/libsoup/soup-cache-private.h b/libsoup/cache/soup-cache-private.h
index 20b10c35..9760def9 100644
--- a/libsoup/soup-cache-private.h
+++ b/libsoup/cache/soup-cache-private.h
@@ -23,8 +23,8 @@
 #ifndef __SOUP_CACHE_PRIVATE_H__
 #define __SOUP_CACHE_PRIVATE_H__ 1
 
-#include "soup-cache.h"
-#include <libsoup/soup-message.h>
+#include "cache/soup-cache.h"
+#include "soup-message.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-cache.c b/libsoup/cache/soup-cache.c
index f03999c4..3656bba7 100644
--- a/libsoup/soup-cache.c
+++ b/libsoup/cache/soup-cache.c
@@ -37,10 +37,11 @@
 #include "soup-cache-client-input-stream.h"
 #include "soup-cache-input-stream.h"
 #include "soup-cache-private.h"
-#include "soup-content-processor.h"
+#include "content-sniffer/soup-content-processor.h"
 #include "soup-message-private.h"
 #include "soup.h"
 #include "soup-message-private.h"
+#include "soup-misc.h"
 
 /**
  * SECTION:soup-cache
diff --git a/libsoup/soup-cache.h b/libsoup/cache/soup-cache.h
index 6ad74702..9386f283 100644
--- a/libsoup/soup-cache.h
+++ b/libsoup/cache/soup-cache.h
@@ -23,8 +23,7 @@
 #ifndef __SOUP_CACHE_H__
 #define __SOUP_CACHE_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <gio/gio.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-brotli-decompressor.c b/libsoup/content-sniffer/soup-brotli-decompressor.c
index 4c089477..4c089477 100644
--- a/libsoup/soup-brotli-decompressor.c
+++ b/libsoup/content-sniffer/soup-brotli-decompressor.c
diff --git a/libsoup/soup-brotli-decompressor.h b/libsoup/content-sniffer/soup-brotli-decompressor.h
index 6f09f689..6f09f689 100644
--- a/libsoup/soup-brotli-decompressor.h
+++ b/libsoup/content-sniffer/soup-brotli-decompressor.h
diff --git a/libsoup/soup-content-decoder.c b/libsoup/content-sniffer/soup-content-decoder.c
index 811af454..a9b9e768 100644
--- a/libsoup/soup-content-decoder.c
+++ b/libsoup/content-sniffer/soup-content-decoder.c
@@ -11,8 +11,9 @@
 
 #include "soup-content-decoder.h"
 #include "soup-converter-wrapper.h"
-#include "soup.h"
+#include "soup-session-feature.h"
 #include "soup-message-private.h"
+#include "soup-headers.h"
 #ifdef WITH_BROTLI
 #include "soup-brotli-decompressor.h"
 #endif
diff --git a/libsoup/soup-content-decoder.h b/libsoup/content-sniffer/soup-content-decoder.h
index 12695390..c27042ee 100644
--- a/libsoup/soup-content-decoder.h
+++ b/libsoup/content-sniffer/soup-content-decoder.h
@@ -6,8 +6,8 @@
 #ifndef __SOUP_CONTENT_DECODER_H__
 #define __SOUP_CONTENT_DECODER_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-message-body.h>
+#include "soup-types.h"
+#include "soup-message-body.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-content-processor.c b/libsoup/content-sniffer/soup-content-processor.c
index ca1bd169..ca1bd169 100644
--- a/libsoup/soup-content-processor.c
+++ b/libsoup/content-sniffer/soup-content-processor.c
diff --git a/libsoup/soup-content-processor.h b/libsoup/content-sniffer/soup-content-processor.h
index c68dec95..ab92788e 100644
--- a/libsoup/soup-content-processor.h
+++ b/libsoup/content-sniffer/soup-content-processor.h
@@ -7,8 +7,7 @@
 #ifndef __SOUP_CONTENT_PROCESSOR_H__
 #define __SOUP_CONTENT_PROCESSOR_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <gio/gio.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-content-sniffer-stream.c b/libsoup/content-sniffer/soup-content-sniffer-stream.c
index f1ed6a1d..f1ed6a1d 100644
--- a/libsoup/soup-content-sniffer-stream.c
+++ b/libsoup/content-sniffer/soup-content-sniffer-stream.c
diff --git a/libsoup/soup-content-sniffer-stream.h b/libsoup/content-sniffer/soup-content-sniffer-stream.h
index ede77dd4..de3e9c96 100644
--- a/libsoup/soup-content-sniffer-stream.h
+++ b/libsoup/content-sniffer/soup-content-sniffer-stream.h
@@ -6,8 +6,8 @@
 #ifndef __SOUP_CONTENT_SNIFFER_STREAM_H__
 #define __SOUP_CONTENT_SNIFFER_STREAM_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-content-sniffer.h>
+#include "soup-types.h"
+#include "content-sniffer/soup-content-sniffer.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-content-sniffer.c b/libsoup/content-sniffer/soup-content-sniffer.c
index 967ec614..14ff38ae 100644
--- a/libsoup/soup-content-sniffer.c
+++ b/libsoup/content-sniffer/soup-content-sniffer.c
@@ -16,7 +16,7 @@
 #include <string.h>
 
 #include "soup-content-sniffer.h"
-#include "soup.h"
+#include "soup-session-feature.h"
 #include "soup-content-processor.h"
 #include "soup-content-sniffer-stream.h"
 #include "soup-message-private.h"
diff --git a/libsoup/soup-content-sniffer.h b/libsoup/content-sniffer/soup-content-sniffer.h
index 908e0cab..7c86f668 100644
--- a/libsoup/soup-content-sniffer.h
+++ b/libsoup/content-sniffer/soup-content-sniffer.h
@@ -6,8 +6,8 @@
 #ifndef __SOUP_CONTENT_SNIFFER_H__
 #define __SOUP_CONTENT_SNIFFER_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-message-body.h>
+#include "soup-types.h"
+#include "soup-message-body.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-converter-wrapper.c b/libsoup/content-sniffer/soup-converter-wrapper.c
index 133a3ebe..133a3ebe 100644
--- a/libsoup/soup-converter-wrapper.c
+++ b/libsoup/content-sniffer/soup-converter-wrapper.c
diff --git a/libsoup/soup-converter-wrapper.h b/libsoup/content-sniffer/soup-converter-wrapper.h
index eb75a556..9104c5ef 100644
--- a/libsoup/soup-converter-wrapper.h
+++ b/libsoup/content-sniffer/soup-converter-wrapper.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_CONVERTER_WRAPPER_H__
 #define __SOUP_CONVERTER_WRAPPER_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-cookie-jar-db.c b/libsoup/cookies/soup-cookie-jar-db.c
index 3e7a7072..3e7a7072 100644
--- a/libsoup/soup-cookie-jar-db.c
+++ b/libsoup/cookies/soup-cookie-jar-db.c
diff --git a/libsoup/soup-cookie-jar-db.h b/libsoup/cookies/soup-cookie-jar-db.h
index 90c402b1..90a6048d 100644
--- a/libsoup/soup-cookie-jar-db.h
+++ b/libsoup/cookies/soup-cookie-jar-db.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_COOKIE_JAR_DB_H__
 #define __SOUP_COOKIE_JAR_DB_H__ 1
 
-#include <libsoup/soup-cookie-jar.h>
+#include "soup-cookie-jar.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-cookie-jar-text.c b/libsoup/cookies/soup-cookie-jar-text.c
index a187ced9..a187ced9 100644
--- a/libsoup/soup-cookie-jar-text.c
+++ b/libsoup/cookies/soup-cookie-jar-text.c
diff --git a/libsoup/soup-cookie-jar-text.h b/libsoup/cookies/soup-cookie-jar-text.h
index c33e14b7..1566596a 100644
--- a/libsoup/soup-cookie-jar-text.h
+++ b/libsoup/cookies/soup-cookie-jar-text.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_COOKIE_JAR_TEXT_H__
 #define __SOUP_COOKIE_JAR_TEXT_H__ 1
 
-#include <libsoup/soup-cookie-jar.h>
+#include "soup-cookie-jar.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-cookie-jar.c b/libsoup/cookies/soup-cookie-jar.c
index 85d6c63c..85d6c63c 100644
--- a/libsoup/soup-cookie-jar.c
+++ b/libsoup/cookies/soup-cookie-jar.c
diff --git a/libsoup/soup-cookie-jar.h b/libsoup/cookies/soup-cookie-jar.h
index 93c72867..793e503c 100644
--- a/libsoup/soup-cookie-jar.h
+++ b/libsoup/cookies/soup-cookie-jar.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_COOKIE_JAR_H__
 #define __SOUP_COOKIE_JAR_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-cookie.c b/libsoup/cookies/soup-cookie.c
index cf538831..cf538831 100644
--- a/libsoup/soup-cookie.c
+++ b/libsoup/cookies/soup-cookie.c
diff --git a/libsoup/soup-cookie.h b/libsoup/cookies/soup-cookie.h
index c00a153d..275960cc 100644
--- a/libsoup/soup-cookie.h
+++ b/libsoup/cookies/soup-cookie.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_COOKIE_H__
 #define __SOUP_COOKIE_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-hsts-enforcer-db.c b/libsoup/hsts/soup-hsts-enforcer-db.c
index bad688a0..bad688a0 100644
--- a/libsoup/soup-hsts-enforcer-db.c
+++ b/libsoup/hsts/soup-hsts-enforcer-db.c
diff --git a/libsoup/soup-hsts-enforcer-db.h b/libsoup/hsts/soup-hsts-enforcer-db.h
index 82050038..ae93d71f 100644
--- a/libsoup/soup-hsts-enforcer-db.h
+++ b/libsoup/hsts/soup-hsts-enforcer-db.h
@@ -7,7 +7,7 @@
 #ifndef __SOUP_HSTS_ENFORCER_DB_H__
 #define __SOUP_HSTS_ENFORCER_DB_H__ 1
 
-#include <libsoup/soup-hsts-enforcer.h>
+#include "soup-hsts-enforcer.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-hsts-enforcer.c b/libsoup/hsts/soup-hsts-enforcer.c
index 8ed07af9..3d30054e 100644
--- a/libsoup/soup-hsts-enforcer.c
+++ b/libsoup/hsts/soup-hsts-enforcer.c
@@ -11,6 +11,7 @@
 #endif
 
 #include "soup-hsts-enforcer.h"
+#include "soup-misc.h"
 #include "soup.h"
 
 /**
diff --git a/libsoup/soup-hsts-enforcer.h b/libsoup/hsts/soup-hsts-enforcer.h
index c9beaa41..bb80825a 100644
--- a/libsoup/soup-hsts-enforcer.h
+++ b/libsoup/hsts/soup-hsts-enforcer.h
@@ -7,7 +7,7 @@
 #ifndef __SOUP_HSTS_ENFORCER_H__
 #define __SOUP_HSTS_ENFORCER_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-hsts-policy.c b/libsoup/hsts/soup-hsts-policy.c
index 3158143a..3158143a 100644
--- a/libsoup/soup-hsts-policy.c
+++ b/libsoup/hsts/soup-hsts-policy.c
diff --git a/libsoup/soup-hsts-policy.h b/libsoup/hsts/soup-hsts-policy.h
index ecb4c2a1..b86aca02 100644
--- a/libsoup/soup-hsts-policy.h
+++ b/libsoup/hsts/soup-hsts-policy.h
@@ -7,7 +7,7 @@
 #ifndef __SOUP_HSTS_POLICY_H__
 #define __SOUP_HSTS_POLICY_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/include/meson.build b/libsoup/include/meson.build
new file mode 100644
index 00000000..0318aa2b
--- /dev/null
+++ b/libsoup/include/meson.build
@@ -0,0 +1,8 @@
+# This is in a random subdir simply to avoid the built version being accidentally included.
+configure_file (
+  input: 'soup-installed.h',
+  output: 'soup.h',
+  copy: true,
+  install: true,
+  install_dir: get_option('includedir') / 'libsoup',
+)
\ No newline at end of file
diff --git a/libsoup/include/soup-installed.h b/libsoup/include/soup-installed.h
new file mode 100644
index 00000000..b908c389
--- /dev/null
+++ b/libsoup/include/soup-installed.h
@@ -0,0 +1,69 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2000-2003, Ximian, Inc.
+ */
+
+#ifndef __SOUP_H__
+#define __SOUP_H__ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define __SOUP_H_INSIDE__
+
+#include <libsoup/soup-address.h>
+#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>
+#include <libsoup/soup-content-sniffer.h>
+#include <libsoup/soup-cookie.h>
+#include <libsoup/soup-cookie-jar.h>
+#include <libsoup/soup-cookie-jar-db.h>
+#include <libsoup/soup-cookie-jar-text.h>
+#include <libsoup/soup-date.h>
+#include <libsoup/soup-enum-types.h>
+#include <libsoup/soup-form.h>
+#include <libsoup/soup-headers.h>
+#include <libsoup/soup-hsts-enforcer.h>
+#include <libsoup/soup-hsts-enforcer-db.h>
+#include <libsoup/soup-hsts-policy.h>
+#include <libsoup/soup-logger.h>
+#include <libsoup/soup-message.h>
+#include <libsoup/soup-method.h>
+#include <libsoup/soup-misc.h>
+#include <libsoup/soup-multipart.h>
+#include <libsoup/soup-multipart-input-stream.h>
+#include <libsoup/soup-request.h>
+#include <libsoup/soup-request-data.h>
+#include <libsoup/soup-request-file.h>
+#include <libsoup/soup-request-http.h>
+#include <libsoup/soup-server.h>
+#include <libsoup/soup-session-async.h>
+#include <libsoup/soup-session-feature.h>
+#include <libsoup/soup-session-sync.h>
+#include <libsoup/soup-socket.h>
+#include <libsoup/soup-status.h>
+#include <libsoup/soup-tld.h>
+#include <libsoup/soup-uri.h>
+#include <libsoup/soup-version.h>
+#include <libsoup/soup-websocket.h>
+#include <libsoup/soup-websocket-connection.h>
+#include <libsoup/soup-websocket-extension.h>
+#include <libsoup/soup-websocket-extension-deflate.h>
+#include <libsoup/soup-websocket-extension-manager.h>
+#include <libsoup/soup-xmlrpc.h>
+
+#include <libsoup/soup-autocleanups.h>
+
+#undef __SOUP_H_INSIDE__
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SOUP_H__ */
diff --git a/libsoup/meson.build b/libsoup/meson.build
index 7ebd5f99..3f9e6926 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -1,3 +1,5 @@
+subdir('include')
+
 pkg = import('pkgconfig')
 
 resources = gnome.compile_resources('soup-resources',
@@ -8,40 +10,53 @@ resources = gnome.compile_resources('soup-resources',
 
 soup_sources = [
   resources,
+  'auth/soup-auth.c',
+  'auth/soup-auth-basic.c',
+  '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',
+
+  'cache/soup-cache.c',
+  'cache/soup-cache-client-input-stream.c',
+  'cache/soup-cache-input-stream.c',
+
+  'content-sniffer/soup-content-decoder.c',
+  'content-sniffer/soup-content-processor.c',
+  'content-sniffer/soup-content-sniffer.c',
+  'content-sniffer/soup-content-sniffer-stream.c',
+  'content-sniffer/soup-converter-wrapper.c',
+
+  'cookies/soup-cookie.c',
+  'cookies/soup-cookie-jar.c',
+  'cookies/soup-cookie-jar-db.c',
+  'cookies/soup-cookie-jar-text.c',
+
+  'hsts/soup-hsts-enforcer.c',
+  'hsts/soup-hsts-enforcer-db.c',
+  'hsts/soup-hsts-policy.c',
+
+  'websocket/soup-websocket.c',
+  'websocket/soup-websocket-connection.c',
+  'websocket/soup-websocket-extension.c',
+  'websocket/soup-websocket-extension-deflate.c',
+  'websocket/soup-websocket-extension-manager.c',
+
+  'xmlrpc/soup-xmlrpc.c',
+
   'soup-address.c',
-  'soup-auth.c',
-  'soup-auth-basic.c',
-  'soup-auth-digest.c',
-  'soup-auth-ntlm.c',
-  'soup-auth-negotiate.c',
-  'soup-auth-domain.c',
-  'soup-auth-domain-basic.c',
-  'soup-auth-domain-digest.c',
-  'soup-auth-manager.c',
   'soup-body-input-stream.c',
   'soup-body-output-stream.c',
-  'soup-cache.c',
-  'soup-cache-client-input-stream.c',
-  'soup-cache-input-stream.c',
   'soup-client-input-stream.c',
   'soup-connection.c',
-  'soup-connection-auth.c',
-  'soup-content-decoder.c',
-  'soup-content-processor.c',
-  'soup-content-sniffer.c',
-  'soup-content-sniffer-stream.c',
-  'soup-converter-wrapper.c',
-  'soup-cookie.c',
-  'soup-cookie-jar.c',
-  'soup-cookie-jar-db.c',
-  'soup-cookie-jar-text.c',
   'soup-date.c',
   'soup-directory-input-stream.c',
   'soup-filter-input-stream.c',
   'soup-form.c',
-  'soup-hsts-enforcer.c',
-  'soup-hsts-enforcer-db.c',
-  'soup-hsts-policy.c',
   'soup-headers.c',
   'soup-init.c',
   'soup-io-stream.c',
@@ -73,31 +88,30 @@ soup_sources = [
   'soup-tld.c',
   'soup-uri.c',
   'soup-version.c',
-  'soup-websocket.c',
-  'soup-websocket-connection.c',
-  'soup-websocket-extension.c',
-  'soup-websocket-extension-deflate.c',
-  'soup-websocket-extension-manager.c',
-  'soup-xmlrpc.c',
 ]
 
 soup_headers = [
+  'auth/soup-auth-basic.h',
+  'auth/soup-auth-digest.h',
+  'auth/soup-auth-ntlm.h',
+  'auth/soup-auth-negotiate.h',
+  'auth/soup-connection-auth.h',
+
+  'cache/soup-cache-client-input-stream.h',
+  'cache/soup-cache-input-stream.h',
+  'cache/soup-cache-private.h',
+
+  'content-sniffer/soup-content-processor.h',
+  'content-sniffer/soup-content-sniffer-stream.h',
+  'content-sniffer/soup-converter-wrapper.h',
+
+  'websocket/soup-websocket-extension-manager-private.h',
+
   'gconstructor.h',
-  'soup-auth-basic.h',
-  'soup-auth-digest.h',
-  'soup-auth-ntlm.h',
-  'soup-auth-negotiate.h',
   'soup-body-input-stream.h',
   'soup-body-output-stream.h',
-  'soup-cache-client-input-stream.h',
-  'soup-cache-input-stream.h',
-  'soup-cache-private.h',
   'soup-client-input-stream.h',
   'soup-connection.h',
-  'soup-connection-auth.h',
-  'soup-content-processor.h',
-  'soup-content-sniffer-stream.h',
-  'soup-converter-wrapper.h',
   'soup-directory-input-stream.h',
   'soup-filter-input-stream.h',
   'soup-io-stream.h',
@@ -107,30 +121,46 @@ soup_headers = [
   'soup-path-map.h',
   'soup-session-private.h',
   'soup-socket-private.h',
-  'soup-websocket-extension-manager-private.h',
 ]
 
 soup_introspection_headers = [
+  'auth/soup-auth.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',
+  'auth/soup-connection-auth.h', # FIXME: Keep private
+
+  'cache/soup-cache.h',
+
+  'content-sniffer/soup-content-decoder.h',
+  'content-sniffer/soup-content-sniffer.h',
+
+  'cookies/soup-cookie.h',
+  'cookies/soup-cookie-jar.h',
+  'cookies/soup-cookie-jar-db.h',
+  'cookies/soup-cookie-jar-text.h',
+
+  'hsts/soup-hsts-enforcer.h',
+  'hsts/soup-hsts-enforcer-db.h',
+  'hsts/soup-hsts-policy.h',
+
+  'websocket/soup-websocket.h',
+  'websocket/soup-websocket-connection.h',
+  'websocket/soup-websocket-extension.h',
+  'websocket/soup-websocket-extension-deflate.h',
+  'websocket/soup-websocket-extension-manager.h',
+
+  'xmlrpc/soup-xmlrpc.h',
+
   'soup-address.h',
-  'soup-auth.h',
-  'soup-auth-domain.h',
-  'soup-auth-domain-basic.h',
-  'soup-auth-domain-digest.h',
-  'soup-auth-manager.h',
   'soup-autocleanups.h',
-  'soup-cache.h',
-  'soup-content-decoder.h',
-  'soup-content-sniffer.h',
-  'soup-cookie.h',
-  'soup-cookie-jar.h',
-  'soup-cookie-jar-db.h',
-  'soup-cookie-jar-text.h',
+
   'soup-date.h',
   'soup-form.h',
   'soup-headers.h',
-  'soup-hsts-enforcer.h',
-  'soup-hsts-enforcer-db.h',
-  'soup-hsts-policy.h',
   'soup-logger.h',
   'soup-message.h',
   'soup-message-body.h',
@@ -154,21 +184,13 @@ soup_introspection_headers = [
   'soup-tld.h',
   'soup-types.h',
   'soup-uri.h',
-  'soup-websocket.h',
-  'soup-websocket-connection.h',
-  'soup-websocket-extension.h',
-  'soup-websocket-extension-deflate.h',
-  'soup-websocket-extension-manager.h',
-  'soup-xmlrpc.h',
 ]
 
-soup_installed_headers = soup_introspection_headers + [
-  'soup.h'
-]
+soup_installed_headers = soup_introspection_headers
 
 if brotlidec_dep.found()
-  soup_sources += 'soup-brotli-decompressor.c'
-  soup_headers += 'soup-brotli-decompressor.h'
+  soup_sources += 'content-sniffer/soup-brotli-decompressor.c'
+  soup_headers += 'content-sniffer/soup-brotli-decompressor.h'
 endif
 
 
@@ -212,6 +234,17 @@ deps = [
   libz_dep,
 ]
 
+libsoup_includes = [
+  configinc,
+  include_directories([
+    'auth',
+    'cookies',
+    'hsts',
+    'websocket',
+    '.'
+  ]),
+]
+
 libsoup = library('soup-@0@'.format(apiversion),
   soup_sources,
   soup_headers,
@@ -220,7 +253,7 @@ libsoup = library('soup-@0@'.format(apiversion),
   soversion : soversion,
   darwin_versions: darwin_versions,
   c_args : libsoup_c_args,
-  include_directories : configinc,
+  include_directories : libsoup_includes,
   gnu_symbol_visibility: 'hidden',
   install : true,
   dependencies : deps)
@@ -232,7 +265,7 @@ libsoup_static = static_library('soup-static',
     soup_enums,
   ],
   c_args : libsoup_c_args,
-  include_directories : configinc,
+  include_directories : libsoup_includes,
   install : true,
   dependencies : deps,
 )
@@ -246,13 +279,13 @@ pkg.generate(libsoup,
   variables: 'exec_prefix=${prefix}')
 
 libsoup_dep = declare_dependency(link_with : libsoup,
-  include_directories : configinc,
+  include_directories : libsoup_includes,
   sources : soup_enum_h,
   dependencies : [ platform_deps, glib_deps ]
 )
 
 libsoup_static_dep = declare_dependency(link_with : libsoup_static,
-  include_directories : configinc,
+  include_directories : libsoup_includes,
   sources : soup_enum_h,
   dependencies : [ platform_deps, glib_deps ]
 )
diff --git a/libsoup/soup-address.h b/libsoup/soup-address.h
index 52c1b8b3..7c71fda6 100644
--- a/libsoup/soup-address.h
+++ b/libsoup/soup-address.h
@@ -8,7 +8,7 @@
 
 #include <sys/types.h>
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-client-input-stream.c b/libsoup/soup-client-input-stream.c
index e73ec9e6..16abb411 100644
--- a/libsoup/soup-client-input-stream.c
+++ b/libsoup/soup-client-input-stream.c
@@ -12,6 +12,7 @@
 #include "soup-client-input-stream.h"
 #include "soup.h"
 #include "soup-message-private.h"
+#include "soup-misc.h"
 
 struct _SoupClientInputStreamPrivate {
 	SoupMessage  *msg;
diff --git a/libsoup/soup-date.h b/libsoup/soup-date.h
index 8048346f..b0b5b395 100644
--- a/libsoup/soup-date.h
+++ b/libsoup/soup-date.h
@@ -8,7 +8,7 @@
 #define __SOUP_DATE_H__ 1
 
 #include <time.h>
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-directory-input-stream.h b/libsoup/soup-directory-input-stream.h
index c7a41897..4c83e355 100644
--- a/libsoup/soup-directory-input-stream.h
+++ b/libsoup/soup-directory-input-stream.h
@@ -23,8 +23,8 @@
 #define __SOUP_DIRECTORY_INPUT_STREAM_H__ 1
 
 #include <gio/gio.h>
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-message-body.h>
+#include "soup-types.h"
+#include "soup-message-body.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-filter-input-stream.h b/libsoup/soup-filter-input-stream.h
index bd7277b8..fac1efed 100644
--- a/libsoup/soup-filter-input-stream.h
+++ b/libsoup/soup-filter-input-stream.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_FILTER_INPUT_STREAM_H__
 #define __SOUP_FILTER_INPUT_STREAM_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-form.h b/libsoup/soup-form.h
index 164005dc..6774f5d8 100644
--- a/libsoup/soup-form.h
+++ b/libsoup/soup-form.h
@@ -6,8 +6,8 @@
 #ifndef  __SOUP_FORM_H__
 #define  __SOUP_FORM_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-multipart.h>
+#include "soup-types.h"
+#include "soup-multipart.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
index eec28adf..bc68d8bd 100644
--- a/libsoup/soup-headers.c
+++ b/libsoup/soup-headers.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "soup-misc.h"
 #include "soup-headers.h"
 #include "soup.h"
 
diff --git a/libsoup/soup-headers.h b/libsoup/soup-headers.h
index 73515629..7f1a9553 100644
--- a/libsoup/soup-headers.h
+++ b/libsoup/soup-headers.h
@@ -7,7 +7,7 @@
 #define __SOUP_HEADERS_H__ 1
 
 #include <glib.h>
-#include <libsoup/soup-message.h>
+#include "soup-message.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-io-stream.h b/libsoup/soup-io-stream.h
index e18fc8d8..b5169c04 100644
--- a/libsoup/soup-io-stream.h
+++ b/libsoup/soup-io-stream.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_IO_STREAM_H__
 #define __SOUP_IO_STREAM_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-logger.h b/libsoup/soup-logger.h
index 9eaf3032..06c9cef4 100644
--- a/libsoup/soup-logger.h
+++ b/libsoup/soup-logger.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_LOGGER_H__
 #define __SOUP_LOGGER_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-message-body.h b/libsoup/soup-message-body.h
index 42721c2f..60c29333 100644
--- a/libsoup/soup-message-body.h
+++ b/libsoup/soup-message-body.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_MESSAGE_BODY_H__
 #define __SOUP_MESSAGE_BODY_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-message-headers.h b/libsoup/soup-message-headers.h
index 699e9843..a55158fb 100644
--- a/libsoup/soup-message-headers.h
+++ b/libsoup/soup-message-headers.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_MESSAGE_HEADERS_H__
 #define __SOUP_MESSAGE_HEADERS_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c
index a005fa93..b744351e 100644
--- a/libsoup/soup-message-io.c
+++ b/libsoup/soup-message-io.c
@@ -20,8 +20,8 @@
 #include "soup-body-output-stream.h"
 #include "soup-client-input-stream.h"
 #include "soup-connection.h"
-#include "soup-content-processor.h"
-#include "soup-content-sniffer-stream.h"
+#include "content-sniffer/soup-content-processor.h"
+#include "content-sniffer/soup-content-sniffer-stream.h"
 #include "soup-filter-input-stream.h"
 #include "soup-message-private.h"
 #include "soup-message-queue.h"
diff --git a/libsoup/soup-message-private.h b/libsoup/soup-message-private.h
index 193f226b..2adf086e 100644
--- a/libsoup/soup-message-private.h
+++ b/libsoup/soup-message-private.h
@@ -7,9 +7,9 @@
 #define __SOUP_MESSAGE_PRIVATE_H__ 1
 
 #include "soup-message.h"
-#include "soup-auth.h"
-#include "soup-content-processor.h"
-#include "soup-content-sniffer.h"
+#include "auth/soup-auth.h"
+#include "content-sniffer/soup-content-processor.h"
+#include "content-sniffer/soup-content-sniffer.h"
 #include "soup-session.h"
 
 typedef struct {
diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index ed8d605e..bfc2651d 100644
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -6,10 +6,10 @@
 #ifndef __SOUP_MESSAGE_H__
 #define __SOUP_MESSAGE_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-message-body.h>
-#include <libsoup/soup-message-headers.h>
-#include <libsoup/soup-method.h>
+#include "soup-types.h"
+#include "soup-message-body.h"
+#include "soup-message-headers.h"
+#include "soup-method.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-method.h b/libsoup/soup-method.h
index a5ef9fd3..1a6a38c1 100644
--- a/libsoup/soup-method.h
+++ b/libsoup/soup-method.h
@@ -6,8 +6,7 @@
 #ifndef __SOUP_METHOD_H__
 #define __SOUP_METHOD_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-misc.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-misc.h b/libsoup/soup-misc.h
index fe66b281..f2729a1e 100644
--- a/libsoup/soup-misc.h
+++ b/libsoup/soup-misc.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_MISC_H__
 #define __SOUP_MISC_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
@@ -39,8 +39,6 @@ SOUP_AVAILABLE_IN_2_4
 gboolean           soup_str_case_equal       (gconstpointer v1,
 					      gconstpointer v2);
 
-#define _SOUP_ATOMIC_INTERN_STRING(variable, value) ((const char *)(g_atomic_pointer_get (&(variable)) ? (variable) : (g_atomic_pointer_set (&(variable), (gpointer)g_intern_static_string (value)), (variable))))
-
 /* character classes */
 
 SOUP_AVAILABLE_IN_2_4
diff --git a/libsoup/soup-multipart-input-stream.h b/libsoup/soup-multipart-input-stream.h
index bbbac668..e35dfdc3 100644
--- a/libsoup/soup-multipart-input-stream.h
+++ b/libsoup/soup-multipart-input-stream.h
@@ -6,8 +6,8 @@
 #ifndef __SOUP_MULTIPART_INPUT_STREAM_H__
 #define __SOUP_MULTIPART_INPUT_STREAM_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-message-headers.h>
+#include "soup-types.h"
+#include "soup-message-headers.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
index a7e550f1..1844de98 100644
--- a/libsoup/soup-multipart.c
+++ b/libsoup/soup-multipart.c
@@ -12,6 +12,7 @@
 #include <string.h>
 
 #include "soup-multipart.h"
+#include "soup-headers.h"
 #include "soup.h"
 
 /**
diff --git a/libsoup/soup-multipart.h b/libsoup/soup-multipart.h
index aa790cb8..e37aae44 100644
--- a/libsoup/soup-multipart.h
+++ b/libsoup/soup-multipart.h
@@ -6,9 +6,9 @@
 #ifndef __SOUP_MULTIPART_H__
 #define __SOUP_MULTIPART_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-message-body.h>
-#include <libsoup/soup-message-headers.h>
+#include "soup-types.h"
+#include "soup-message-body.h"
+#include "soup-message-headers.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-path-map.h b/libsoup/soup-path-map.h
index 6b17bedd..8c3b3367 100644
--- a/libsoup/soup-path-map.h
+++ b/libsoup/soup-path-map.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_PATH_MAP_H__
 #define __SOUP_PATH_MAP_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 typedef struct SoupPathMap SoupPathMap;
 
diff --git a/libsoup/soup-portability.h b/libsoup/soup-portability.h
index a52ad4a3..51d20478 100644
--- a/libsoup/soup-portability.h
+++ b/libsoup/soup-portability.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_PORTABILITY_H__
 #define __SOUP_PORTABILITY_H__
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 #ifdef G_OS_WIN32
 
diff --git a/libsoup/soup-request.h b/libsoup/soup-request.h
index cc0eec0d..6a6e94fa 100644
--- a/libsoup/soup-request.h
+++ b/libsoup/soup-request.h
@@ -24,7 +24,7 @@
 
 #include <gio/gio.h>
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index 43bcaed3..e25a9872 100644
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -19,9 +19,9 @@
 #include "soup-misc-private.h"
 #include "soup-path-map.h" 
 #include "soup-socket-private.h"
-#include "soup-websocket.h"
-#include "soup-websocket-connection.h"
-#include "soup-websocket-extension-deflate.h"
+#include "websocket/soup-websocket.h"
+#include "websocket/soup-websocket-connection.h"
+#include "websocket/soup-websocket-extension-deflate.h"
 
 /**
  * SECTION:soup-server
diff --git a/libsoup/soup-server.h b/libsoup/soup-server.h
index 5873fee0..c76fa111 100644
--- a/libsoup/soup-server.h
+++ b/libsoup/soup-server.h
@@ -6,9 +6,9 @@
 #ifndef __SOUP_SERVER_H__
 #define __SOUP_SERVER_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-uri.h>
-#include <libsoup/soup-websocket-connection.h>
+#include "soup-types.h"
+#include "soup-uri.h"
+#include "soup-websocket-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-session-async.h b/libsoup/soup-session-async.h
index 32803c89..2a76feca 100644
--- a/libsoup/soup-session-async.h
+++ b/libsoup/soup-session-async.h
@@ -6,8 +6,8 @@
 #ifndef __SOUP_SESSION_ASYNC_H__
 #define __SOUP_SESSION_ASYNC_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-session.h>
+#include "soup-types.h"
+#include "soup-session.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-session-feature.h b/libsoup/soup-session-feature.h
index e145e3f4..dd50a4a4 100644
--- a/libsoup/soup-session-feature.h
+++ b/libsoup/soup-session-feature.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_SESSION_FEATURE_H__
 #define __SOUP_SESSION_FEATURE_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-session-sync.h b/libsoup/soup-session-sync.h
index 691a97f8..360f21bc 100644
--- a/libsoup/soup-session-sync.h
+++ b/libsoup/soup-session-sync.h
@@ -6,8 +6,8 @@
 #ifndef __SOUP_SESSION_SYNC_H__
 #define __SOUP_SESSION_SYNC_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-session.h>
+#include "soup-types.h"
+#include "soup-session.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 74e83ac5..87003176 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -13,17 +13,17 @@
 
 #include "soup-session.h"
 #include "soup.h"
-#include "soup-auth-manager.h"
-#include "soup-cache-private.h"
+#include "auth/soup-auth-manager.h"
+#include "cache/soup-cache-private.h"
 #include "soup-connection.h"
 #include "soup-message-private.h"
 #include "soup-misc-private.h"
 #include "soup-message-queue.h"
 #include "soup-session-private.h"
 #include "soup-socket-private.h"
-#include "soup-websocket.h"
-#include "soup-websocket-connection.h"
-#include "soup-websocket-extension-manager-private.h"
+#include "websocket/soup-websocket.h"
+#include "websocket/soup-websocket-connection.h"
+#include "websocket/soup-websocket-extension-manager-private.h"
 
 #define HOST_KEEP_ALIVE 5 * 60 * 1000 /* 5 min in msecs */
 
diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index f666afcb..dc2e22a6 100644
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -6,10 +6,10 @@
 #ifndef __SOUP_SESSION_H__
 #define __SOUP_SESSION_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-address.h>
-#include <libsoup/soup-message.h>
-#include <libsoup/soup-websocket-connection.h>
+#include "soup-types.h"
+#include "soup-address.h"
+#include "soup-message.h"
+#include "websocket/soup-websocket-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h
index 98d06939..4dfc24dc 100644
--- a/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_SOCKET_H__
 #define __SOUP_SOCKET_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-status.h b/libsoup/soup-status.h
index 9bbe578e..625fe669 100644
--- a/libsoup/soup-status.h
+++ b/libsoup/soup-status.h
@@ -8,7 +8,7 @@
 #ifndef __SOUP_STATUS_H__
 #define __SOUP_STATUS_H__ 1
 
-#include <libsoup/soup-version.h>
+#include "soup-version.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-tld.h b/libsoup/soup-tld.h
index df88b557..cc71933c 100644
--- a/libsoup/soup-tld.h
+++ b/libsoup/soup-tld.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_TLD_H__
 #define __SOUP_TLD_H__
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-types.h b/libsoup/soup-types.h
index 9e3d5788..89e077a6 100644
--- a/libsoup/soup-types.h
+++ b/libsoup/soup-types.h
@@ -8,11 +8,13 @@
 
 #include <gio/gio.h>
 
-#include <libsoup/soup-version.h>
-#include <libsoup/soup-status.h>
+#include "soup-version.h"
+#include "soup-status.h"
 
 G_BEGIN_DECLS
 
+#define _SOUP_ATOMIC_INTERN_STRING(variable, value) ((const char *)(g_atomic_pointer_get (&(variable)) ? (variable) : (g_atomic_pointer_set (&(variable), (gpointer)g_intern_static_string (value)), (variable))))
+
 typedef struct _SoupAddress             SoupAddress;
 typedef struct _SoupAuth                SoupAuth;
 typedef struct _SoupAuthDomain          SoupAuthDomain;
diff --git a/libsoup/soup-uri.h b/libsoup/soup-uri.h
index 8015e4f1..f60f7560 100644
--- a/libsoup/soup-uri.h
+++ b/libsoup/soup-uri.h
@@ -8,8 +8,7 @@
 #ifndef __SOUP_URI_H__
 #define __SOUP_URI_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-misc.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup.h b/libsoup/soup.h
index b908c389..266a3f05 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -12,53 +12,53 @@ extern "C" {
 
 #define __SOUP_H_INSIDE__
 
-#include <libsoup/soup-address.h>
-#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>
-#include <libsoup/soup-content-sniffer.h>
-#include <libsoup/soup-cookie.h>
-#include <libsoup/soup-cookie-jar.h>
-#include <libsoup/soup-cookie-jar-db.h>
-#include <libsoup/soup-cookie-jar-text.h>
-#include <libsoup/soup-date.h>
-#include <libsoup/soup-enum-types.h>
-#include <libsoup/soup-form.h>
-#include <libsoup/soup-headers.h>
-#include <libsoup/soup-hsts-enforcer.h>
-#include <libsoup/soup-hsts-enforcer-db.h>
-#include <libsoup/soup-hsts-policy.h>
-#include <libsoup/soup-logger.h>
-#include <libsoup/soup-message.h>
-#include <libsoup/soup-method.h>
-#include <libsoup/soup-misc.h>
-#include <libsoup/soup-multipart.h>
-#include <libsoup/soup-multipart-input-stream.h>
-#include <libsoup/soup-request.h>
-#include <libsoup/soup-request-data.h>
-#include <libsoup/soup-request-file.h>
-#include <libsoup/soup-request-http.h>
-#include <libsoup/soup-server.h>
-#include <libsoup/soup-session-async.h>
-#include <libsoup/soup-session-feature.h>
-#include <libsoup/soup-session-sync.h>
-#include <libsoup/soup-socket.h>
-#include <libsoup/soup-status.h>
-#include <libsoup/soup-tld.h>
-#include <libsoup/soup-uri.h>
-#include <libsoup/soup-version.h>
-#include <libsoup/soup-websocket.h>
-#include <libsoup/soup-websocket-connection.h>
-#include <libsoup/soup-websocket-extension.h>
-#include <libsoup/soup-websocket-extension-deflate.h>
-#include <libsoup/soup-websocket-extension-manager.h>
-#include <libsoup/soup-xmlrpc.h>
+#include "soup-address.h"
+#include "auth/soup-auth.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 "cache/soup-cache.h"
+#include "content-sniffer/soup-content-decoder.h"
+#include "content-sniffer/soup-content-sniffer.h"
+#include "cookies/soup-cookie.h"
+#include "cookies/soup-cookie-jar.h"
+#include "cookies/soup-cookie-jar-db.h"
+#include "cookies/soup-cookie-jar-text.h"
+#include "soup-date.h"
+#include "soup-enum-types.h"
+#include "soup-form.h"
+#include "soup-headers.h"
+#include "hsts/soup-hsts-enforcer.h"
+#include "hsts/soup-hsts-enforcer-db.h"
+#include "hsts/soup-hsts-policy.h"
+#include "soup-logger.h"
+#include "soup-message.h"
+#include "soup-method.h"
+#include "soup-misc.h"
+#include "soup-multipart.h"
+#include "soup-multipart-input-stream.h"
+#include "soup-request.h"
+#include "soup-request-data.h"
+#include "soup-request-file.h"
+#include "soup-request-http.h"
+#include "soup-server.h"
+#include "soup-session-async.h"
+#include "soup-session-feature.h"
+#include "soup-session-sync.h"
+#include "soup-socket.h"
+#include "soup-status.h"
+#include "soup-tld.h"
+#include "soup-uri.h"
+#include "soup-version.h"
+#include "websocket/soup-websocket.h"
+#include "websocket/soup-websocket-connection.h"
+#include "websocket/soup-websocket-extension.h"
+#include "websocket/soup-websocket-extension-deflate.h"
+#include "websocket/soup-websocket-extension-manager.h"
+#include "xmlrpc/soup-xmlrpc.h"
 
-#include <libsoup/soup-autocleanups.h>
+#include "soup-autocleanups.h"
 
 #undef __SOUP_H_INSIDE__
 
diff --git a/libsoup/soup-websocket-connection.c b/libsoup/websocket/soup-websocket-connection.c
index a4095e1c..a4095e1c 100644
--- a/libsoup/soup-websocket-connection.c
+++ b/libsoup/websocket/soup-websocket-connection.c
diff --git a/libsoup/soup-websocket-connection.h b/libsoup/websocket/soup-websocket-connection.h
index f82d723a..b5e90fb8 100644
--- a/libsoup/soup-websocket-connection.h
+++ b/libsoup/websocket/soup-websocket-connection.h
@@ -21,8 +21,8 @@
 #ifndef __SOUP_WEBSOCKET_CONNECTION_H__
 #define __SOUP_WEBSOCKET_CONNECTION_H__
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-websocket.h>
+#include "soup-types.h"
+#include "soup-websocket.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-websocket-extension-deflate.c b/libsoup/websocket/soup-websocket-extension-deflate.c
index c7864426..c7864426 100644
--- a/libsoup/soup-websocket-extension-deflate.c
+++ b/libsoup/websocket/soup-websocket-extension-deflate.c
diff --git a/libsoup/soup-websocket-extension-deflate.h b/libsoup/websocket/soup-websocket-extension-deflate.h
index e353965d..e353965d 100644
--- a/libsoup/soup-websocket-extension-deflate.h
+++ b/libsoup/websocket/soup-websocket-extension-deflate.h
diff --git a/libsoup/soup-websocket-extension-manager-private.h b/libsoup/websocket/soup-websocket-extension-manager-private.h
index b7ff618d..b7ff618d 100644
--- a/libsoup/soup-websocket-extension-manager-private.h
+++ b/libsoup/websocket/soup-websocket-extension-manager-private.h
diff --git a/libsoup/soup-websocket-extension-manager.c b/libsoup/websocket/soup-websocket-extension-manager.c
index 69c4fd4a..69c4fd4a 100644
--- a/libsoup/soup-websocket-extension-manager.c
+++ b/libsoup/websocket/soup-websocket-extension-manager.c
diff --git a/libsoup/soup-websocket-extension-manager.h b/libsoup/websocket/soup-websocket-extension-manager.h
index 280a5b39..0940a53e 100644
--- a/libsoup/soup-websocket-extension-manager.h
+++ b/libsoup/websocket/soup-websocket-extension-manager.h
@@ -23,7 +23,7 @@
 #ifndef __SOUP_WEBSOCKET_EXTENSION_MANAGER_H__
 #define __SOUP_WEBSOCKET_EXTENSION_MANAGER_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-websocket-extension.c b/libsoup/websocket/soup-websocket-extension.c
index 91ae6951..91ae6951 100644
--- a/libsoup/soup-websocket-extension.c
+++ b/libsoup/websocket/soup-websocket-extension.c
diff --git a/libsoup/soup-websocket-extension.h b/libsoup/websocket/soup-websocket-extension.h
index 4461cfa7..e8f345a0 100644
--- a/libsoup/soup-websocket-extension.h
+++ b/libsoup/websocket/soup-websocket-extension.h
@@ -23,8 +23,8 @@
 #ifndef __SOUP_WEBSOCKET_EXTENSION_H__
 #define __SOUP_WEBSOCKET_EXTENSION_H__ 1
 
-#include <libsoup/soup-types.h>
-#include <libsoup/soup-websocket.h>
+#include "soup-types.h"
+#include "soup-websocket.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-websocket.c b/libsoup/websocket/soup-websocket.c
index 13b56474..13b56474 100644
--- a/libsoup/soup-websocket.c
+++ b/libsoup/websocket/soup-websocket.c
diff --git a/libsoup/soup-websocket.h b/libsoup/websocket/soup-websocket.h
index c5dd31ab..b96dec2b 100644
--- a/libsoup/soup-websocket.h
+++ b/libsoup/websocket/soup-websocket.h
@@ -21,7 +21,7 @@
 #ifndef __SOUP_WEBSOCKET_H__
 #define __SOUP_WEBSOCKET_H__
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libsoup/soup-xmlrpc.c b/libsoup/xmlrpc/soup-xmlrpc.c
index 42dcda9c..42dcda9c 100644
--- a/libsoup/soup-xmlrpc.c
+++ b/libsoup/xmlrpc/soup-xmlrpc.c
diff --git a/libsoup/soup-xmlrpc.h b/libsoup/xmlrpc/soup-xmlrpc.h
index 5cc74b8e..2c76d440 100644
--- a/libsoup/soup-xmlrpc.h
+++ b/libsoup/xmlrpc/soup-xmlrpc.h
@@ -6,7 +6,7 @@
 #ifndef __SOUP_XMLRPC_H__
 #define __SOUP_XMLRPC_H__ 1
 
-#include <libsoup/soup-types.h>
+#include "soup-types.h"
 
 G_BEGIN_DECLS