Do not include the header exclusion guards in the introspection

76 files changed, 228 insertions, 228 deletions

diff --git a/libsoup/soup-address.h b/libsoup/soup-address.h
index af178de5..52c1b8b3 100644
--- a/libsoup/soup-address.h
+++ b/libsoup/soup-address.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_ADDRESS_H
-#define SOUP_ADDRESS_H
+#ifndef __SOUP_ADDRESS_H__
+#define __SOUP_ADDRESS_H__
 
 #include <sys/types.h>
 
@@ -107,4 +107,4 @@ gboolean         soup_address_equal_by_ip        (gconstpointer        addr1,
 
 G_END_DECLS
 
-#endif /* SOUP_ADDRESS_H */
+#endif /* __SOUP_ADDRESS_H__ */
diff --git a/libsoup/soup-auth-basic.h b/libsoup/soup-auth-basic.h
index 639bf031..b7936871 100644
--- a/libsoup/soup-auth-basic.h
+++ b/libsoup/soup-auth-basic.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_AUTH_BASIC_H
-#define SOUP_AUTH_BASIC_H 1
+#ifndef __SOUP_AUTH_BASIC_H__
+#define __SOUP_AUTH_BASIC_H__ 1
 
 #include "soup-auth.h"
 
@@ -24,4 +24,4 @@ typedef struct {
 
 } SoupAuthBasicClass;
 
-#endif /*SOUP_AUTH_BASIC_H*/
+#endif /* __SOUP_AUTH_BASIC_H__ */
diff --git a/libsoup/soup-auth-digest.h b/libsoup/soup-auth-digest.h
index 0165f74b..59fd748e 100644
--- a/libsoup/soup-auth-digest.h
+++ b/libsoup/soup-auth-digest.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_AUTH_DIGEST_H
-#define SOUP_AUTH_DIGEST_H 1
+#ifndef __SOUP_AUTH_DIGEST_H__
+#define __SOUP_AUTH_DIGEST_H__ 1
 
 #include "soup-auth.h"
 
@@ -61,4 +61,4 @@ void soup_auth_digest_compute_response (const char              *method,
 					int                      nc,
 					char                     response[33]);
 
-#endif /*SOUP_AUTH_DIGEST_H*/
+#endif /* __SOUP_AUTH_DIGEST_H__ */
diff --git a/libsoup/soup-auth-domain-basic.h b/libsoup/soup-auth-domain-basic.h
index f1caeb2a..87d129b3 100644
--- a/libsoup/soup-auth-domain-basic.h
+++ b/libsoup/soup-auth-domain-basic.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2007 Novell, Inc.
  */
 
-#ifndef SOUP_AUTH_DOMAIN_BASIC_H
-#define SOUP_AUTH_DOMAIN_BASIC_H 1
+#ifndef __SOUP_AUTH_DOMAIN_BASIC_H__
+#define __SOUP_AUTH_DOMAIN_BASIC_H__ 1
 
 #include <libsoup/soup-auth-domain.h>
 
@@ -56,4 +56,4 @@ void      soup_auth_domain_basic_set_auth_callback  (SoupAuthDomain *domain,
 
 G_END_DECLS
 
-#endif /* SOUP_AUTH_DOMAIN_BASIC_H */
+#endif /* __SOUP_AUTH_DOMAIN_BASIC_H__ */
diff --git a/libsoup/soup-auth-domain-digest.h b/libsoup/soup-auth-domain-digest.h
index 8940a18f..8dee9fda 100644
--- a/libsoup/soup-auth-domain-digest.h
+++ b/libsoup/soup-auth-domain-digest.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2007 Novell, Inc.
  */
 
-#ifndef SOUP_AUTH_DOMAIN_DIGEST_H
-#define SOUP_AUTH_DOMAIN_DIGEST_H 1
+#ifndef __SOUP_AUTH_DOMAIN_DIGEST_H__
+#define __SOUP_AUTH_DOMAIN_DIGEST_H__ 1
 
 #include <libsoup/soup-auth-domain.h>
 
@@ -60,4 +60,4 @@ char   *soup_auth_domain_digest_encode_password    (const char     *username,
 
 G_END_DECLS
 
-#endif /* SOUP_AUTH_DOMAIN_DIGEST_H */
+#endif /* __SOUP_AUTH_DOMAIN_DIGEST_H__ */
diff --git a/libsoup/soup-auth-domain.h b/libsoup/soup-auth-domain.h
index 2bec0961..15653502 100644
--- a/libsoup/soup-auth-domain.h
+++ b/libsoup/soup-auth-domain.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2007 Novell, Inc.
  */
 
-#ifndef SOUP_AUTH_DOMAIN_H
-#define SOUP_AUTH_DOMAIN_H 1
+#ifndef __SOUP_AUTH_DOMAIN_H__
+#define __SOUP_AUTH_DOMAIN_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -107,4 +107,4 @@ gboolean    soup_auth_domain_try_generic_auth_callback (SoupAuthDomain *domain,
 
 G_END_DECLS
 
-#endif /* SOUP_AUTH_DOMAIN_H */
+#endif /* __SOUP_AUTH_DOMAIN_H__ */
diff --git a/libsoup/soup-auth-manager.h b/libsoup/soup-auth-manager.h
index c935d994..cf38936a 100644
--- a/libsoup/soup-auth-manager.h
+++ b/libsoup/soup-auth-manager.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2007 Red Hat, Inc.
  */
 
-#ifndef SOUP_AUTH_MANAGER_H
-#define SOUP_AUTH_MANAGER_H 1
+#ifndef __SOUP_AUTH_MANAGER_H__
+#define __SOUP_AUTH_MANAGER_H__ 1
 
 #include "soup-types.h"
 #include "soup-auth.h"
@@ -46,4 +46,4 @@ void soup_auth_manager_clear_cached_credentials (SoupAuthManager *manager);
 
 G_END_DECLS
 
-#endif /* SOUP_AUTH_MANAGER_H */
+#endif /* __SOUP_AUTH_MANAGER_H__ */
diff --git a/libsoup/soup-auth-negotiate.h b/libsoup/soup-auth-negotiate.h
index e9766449..5c3916bf 100644
--- a/libsoup/soup-auth-negotiate.h
+++ b/libsoup/soup-auth-negotiate.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2016 Red Hat, Inc.
  */
 
-#ifndef SOUP_AUTH_NEGOTIATE_H
-#define SOUP_AUTH_NEGOTIATE_H 1
+#ifndef __SOUP_AUTH_NEGOTIATE_H__
+#define __SOUP_AUTH_NEGOTIATE_H__ 1
 
 #include "soup-connection-auth.h"
 
@@ -25,4 +25,4 @@ typedef struct {
 
 } SoupAuthNegotiateClass;
 
-#endif /* SOUP_AUTH_NEGOTIATE_H */
+#endif /* __SOUP_AUTH_NEGOTIATE_H__ */
diff --git a/libsoup/soup-auth-ntlm.h b/libsoup/soup-auth-ntlm.h
index 43c40856..ef07353b 100644
--- a/libsoup/soup-auth-ntlm.h
+++ b/libsoup/soup-auth-ntlm.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2007 Red Hat, Inc.
  */
 
-#ifndef SOUP_AUTH_NTLM_H
-#define SOUP_AUTH_NTLM_H 1
+#ifndef __SOUP_AUTH_NTLM_H__
+#define __SOUP_AUTH_NTLM_H__ 1
 
 #include "soup-connection-auth.h"
 
@@ -24,4 +24,4 @@ typedef struct {
 
 } SoupAuthNTLMClass;
 
-#endif /* SOUP_AUTH_NTLM_H */
+#endif /* __SOUP_AUTH_NTLM_H__ */
diff --git a/libsoup/soup-auth.h b/libsoup/soup-auth.h
index 0defcc65..86a829b4 100644
--- a/libsoup/soup-auth.h
+++ b/libsoup/soup-auth.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2001-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_AUTH_H
-#define SOUP_AUTH_H 1
+#ifndef __SOUP_AUTH_H__
+#define __SOUP_AUTH_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-headers.h>
@@ -146,4 +146,4 @@ gboolean    soup_auth_negotiate_supported   (void);
 
 G_END_DECLS
 
-#endif /* SOUP_AUTH_H */
+#endif /* __SOUP_AUTH_H__ */
diff --git a/libsoup/soup-autocleanups.h b/libsoup/soup-autocleanups.h
index 910abe7d..1895eb0c 100644
--- a/libsoup/soup-autocleanups.h
+++ b/libsoup/soup-autocleanups.h
@@ -19,8 +19,8 @@
 #error "Only <libsoup/soup.h> can be included directly."
 #endif
 
-#ifndef SOUP_AUTOCLEANUPS_H
-#define SOUP_AUTOCLEANUPS_H
+#ifndef __SOUP_AUTOCLEANUPS_H__
+#define __SOUP_AUTOCLEANUPS_H__
 
 #if SOUP_VERSION_MAX_ALLOWED >= SOUP_VERSION_2_52
 #ifndef __GI_SCANNER__
@@ -65,4 +65,4 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupXMLRPCParams, soup_xmlrpc_params_free)
 #endif
 #endif
 
-#endif /* SOUP_AUTOCLEANUPS_H */
+#endif /* __SOUP_AUTOCLEANUPS_H__ */
diff --git a/libsoup/soup-body-input-stream.h b/libsoup/soup-body-input-stream.h
index 7732e5e5..bd04e5fe 100644
--- a/libsoup/soup-body-input-stream.h
+++ b/libsoup/soup-body-input-stream.h
@@ -3,8 +3,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef SOUP_BODY_INPUT_STREAM_H
-#define SOUP_BODY_INPUT_STREAM_H 1
+#ifndef __SOUP_BODY_INPUT_STREAM_H__
+#define __SOUP_BODY_INPUT_STREAM_H__ 1
 
 #include "soup-types.h"
 #include "soup-filter-input-stream.h"
@@ -45,4 +45,4 @@ GInputStream *soup_body_input_stream_new (GInputStream *base_stream,
 
 G_END_DECLS
 
-#endif /* SOUP_BODY_INPUT_STREAM_H */
+#endif /* __SOUP_BODY_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-body-output-stream.h b/libsoup/soup-body-output-stream.h
index 8bd8970d..c817cc74 100644
--- a/libsoup/soup-body-output-stream.h
+++ b/libsoup/soup-body-output-stream.h
@@ -3,8 +3,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef SOUP_BODY_OUTPUT_STREAM_H
-#define SOUP_BODY_OUTPUT_STREAM_H 1
+#ifndef __SOUP_BODY_OUTPUT_STREAM_H__
+#define __SOUP_BODY_OUTPUT_STREAM_H__ 1
 
 #include "soup-types.h"
 #include "soup-message-headers.h"
@@ -44,4 +44,4 @@ GOutputStream *soup_body_output_stream_new (GOutputStream *base_stream,
 
 G_END_DECLS
 
-#endif /* SOUP_BODY_OUTPUT_STREAM_H */
+#endif /* __SOUP_BODY_OUTPUT_STREAM_H__ */
diff --git a/libsoup/soup-cache-client-input-stream.h b/libsoup/soup-cache-client-input-stream.h
index 17f83599..2c9da06e 100644
--- a/libsoup/soup-cache-client-input-stream.h
+++ b/libsoup/soup-cache-client-input-stream.h
@@ -3,8 +3,8 @@
  * Copyright 2015 Igalia S.L.
  */
 
-#ifndef SOUP_CACHE_CLIENT_INPUT_STREAM_H
-#define SOUP_CACHE_CLIENT_INPUT_STREAM_H 1
+#ifndef __SOUP_CACHE_CLIENT_INPUT_STREAM_H__
+#define __SOUP_CACHE_CLIENT_INPUT_STREAM_H__ 1
 
 #include "soup-types.h"
 
@@ -33,4 +33,4 @@ GInputStream *soup_cache_client_input_stream_new (GInputStream *base_stream);
 
 G_END_DECLS
 
-#endif /* SOUP_CACHE_CLIENT_INPUT_STREAM_H */
+#endif /* __SOUP_CACHE_CLIENT_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-cache-private.h b/libsoup/soup-cache-private.h
index e17fc0de..20b10c35 100644
--- a/libsoup/soup-cache-private.h
+++ b/libsoup/soup-cache-private.h
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SOUP_CACHE_PRIVATE_H
-#define SOUP_CACHE_PRIVATE_H 1
+#ifndef __SOUP_CACHE_PRIVATE_H__
+#define __SOUP_CACHE_PRIVATE_H__ 1
 
 #include "soup-cache.h"
 #include <libsoup/soup-message.h>
@@ -43,4 +43,4 @@ void               soup_cache_update_from_conditional_request (SoupCache   *cach
 
 G_END_DECLS
 
-#endif /* SOUP_CACHE_PRIVATE_H */
+#endif /* __SOUP_CACHE_PRIVATE_H__ */
diff --git a/libsoup/soup-cache.h b/libsoup/soup-cache.h
index ce19b5e1..6ad74702 100644
--- a/libsoup/soup-cache.h
+++ b/libsoup/soup-cache.h
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SOUP_CACHE_H
-#define SOUP_CACHE_H 1
+#ifndef __SOUP_CACHE_H__
+#define __SOUP_CACHE_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <gio/gio.h>
@@ -98,5 +98,5 @@ guint      soup_cache_get_max_size (SoupCache     *cache);
 
 G_END_DECLS
 
-#endif /* SOUP_CACHE_H */
+#endif /* __SOUP_CACHE_H__ */
 
diff --git a/libsoup/soup-client-input-stream.h b/libsoup/soup-client-input-stream.h
index 098c6073..c007047a 100644
--- a/libsoup/soup-client-input-stream.h
+++ b/libsoup/soup-client-input-stream.h
@@ -3,8 +3,8 @@
  * Copyright 2010-2012 Red Hat, Inc.
  */
 
-#ifndef SOUP_CLIENT_INPUT_STREAM_H
-#define SOUP_CLIENT_INPUT_STREAM_H 1
+#ifndef __SOUP_CLIENT_INPUT_STREAM_H__
+#define __SOUP_CLIENT_INPUT_STREAM_H__ 1
 
 #include "soup-types.h"
 #include "soup-filter-input-stream.h"
@@ -43,4 +43,4 @@ GInputStream *soup_client_input_stream_new (GInputStream *base_stream,
 
 G_END_DECLS
 
-#endif /* SOUP_CLIENT_INPUT_STREAM_H */
+#endif /* __SOUP_CLIENT_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-connection-auth.h b/libsoup/soup-connection-auth.h
index c5fbe7bd..576ff614 100644
--- a/libsoup/soup-connection-auth.h
+++ b/libsoup/soup-connection-auth.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2010 Red Hat, Inc.
  */
 
-#ifndef SOUP_CONNECTION_AUTH_H
-#define SOUP_CONNECTION_AUTH_H 1
+#ifndef __SOUP_CONNECTION_AUTH_H__
+#define __SOUP_CONNECTION_AUTH_H__ 1
 
 #include <libsoup/soup-auth.h>
 
@@ -52,4 +52,4 @@ gpointer	soup_connection_auth_get_connection_state_for_message
 						 SoupMessage *message);
 G_END_DECLS
 
-#endif /* SOUP_CONNECTION_AUTH_H */
+#endif /* __SOUP_CONNECTION_AUTH_H__ */
diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h
index fe817de4..45e80b2c 100644
--- a/libsoup/soup-connection.h
+++ b/libsoup/soup-connection.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_CONNECTION_H
-#define SOUP_CONNECTION_H 1
+#ifndef __SOUP_CONNECTION_H__
+#define __SOUP_CONNECTION_H__ 1
 
 #include "soup-types.h"
 #include "soup-message-private.h"
@@ -82,4 +82,4 @@ void            soup_connection_send_request   (SoupConnection          *conn,
 
 G_END_DECLS
 
-#endif /* SOUP_CONNECTION_H */
+#endif /* __SOUP_CONNECTION_H__ */
diff --git a/libsoup/soup-content-decoder.h b/libsoup/soup-content-decoder.h
index 471f8138..12695390 100644
--- a/libsoup/soup-content-decoder.h
+++ b/libsoup/soup-content-decoder.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2009 Red Hat, Inc.
  */
 
-#ifndef SOUP_CONTENT_DECODER_H
-#define SOUP_CONTENT_DECODER_H 1
+#ifndef __SOUP_CONTENT_DECODER_H__
+#define __SOUP_CONTENT_DECODER_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-message-body.h>
@@ -42,4 +42,4 @@ GType soup_content_decoder_get_type (void);
 
 G_END_DECLS
 
-#endif /* SOUP_CONTENT_DECODER_H */
+#endif /* __SOUP_CONTENT_DECODER_H__ */
diff --git a/libsoup/soup-content-processor.h b/libsoup/soup-content-processor.h
index 8ee04b2f..c68dec95 100644
--- a/libsoup/soup-content-processor.h
+++ b/libsoup/soup-content-processor.h
@@ -4,8 +4,8 @@
  */
 
 
-#ifndef SOUP_CONTENT_PROCESSOR_H
-#define SOUP_CONTENT_PROCESSOR_H 1
+#ifndef __SOUP_CONTENT_PROCESSOR_H__
+#define __SOUP_CONTENT_PROCESSOR_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <gio/gio.h>
@@ -53,4 +53,4 @@ SoupProcessingStage soup_content_processor_get_processing_stage (SoupContentProc
 
 G_END_DECLS
 
-#endif /* SOUP_CONTENT_PROCESSOR_H */
+#endif /* __SOUP_CONTENT_PROCESSOR_H__ */
diff --git a/libsoup/soup-content-sniffer-stream.h b/libsoup/soup-content-sniffer-stream.h
index ab230f3e..ede77dd4 100644
--- a/libsoup/soup-content-sniffer-stream.h
+++ b/libsoup/soup-content-sniffer-stream.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2010 Red Hat, Inc.
  */
 
-#ifndef SOUP_CONTENT_SNIFFER_STREAM_H
-#define SOUP_CONTENT_SNIFFER_STREAM_H 1
+#ifndef __SOUP_CONTENT_SNIFFER_STREAM_H__
+#define __SOUP_CONTENT_SNIFFER_STREAM_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-content-sniffer.h>
@@ -46,4 +46,4 @@ const char   *soup_content_sniffer_stream_sniff    (SoupContentSnifferStream  *s
 
 G_END_DECLS
 
-#endif /* SOUP_CONTENT_SNIFFER_STREAM_H */
+#endif /* __SOUP_CONTENT_SNIFFER_STREAM_H__ */
diff --git a/libsoup/soup-content-sniffer.h b/libsoup/soup-content-sniffer.h
index eb1e4bd8..908e0cab 100644
--- a/libsoup/soup-content-sniffer.h
+++ b/libsoup/soup-content-sniffer.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2009 Gustavo Noronha Silva.
  */
 
-#ifndef SOUP_CONTENT_SNIFFER_H
-#define SOUP_CONTENT_SNIFFER_H 1
+#ifndef __SOUP_CONTENT_SNIFFER_H__
+#define __SOUP_CONTENT_SNIFFER_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-message-body.h>
@@ -59,4 +59,4 @@ gsize               soup_content_sniffer_get_buffer_size (SoupContentSniffer  *s
 
 G_END_DECLS
 
-#endif /* SOUP_CONTENT_SNIFFER_H */
+#endif /* __SOUP_CONTENT_SNIFFER_H__ */
diff --git a/libsoup/soup-converter-wrapper.h b/libsoup/soup-converter-wrapper.h
index 62ed9da4..eb75a556 100644
--- a/libsoup/soup-converter-wrapper.h
+++ b/libsoup/soup-converter-wrapper.h
@@ -3,8 +3,8 @@
  * Copyright 2011 Red Hat, Inc.
  */
 
-#ifndef SOUP_CONVERTER_WRAPPER_H
-#define SOUP_CONVERTER_WRAPPER_H 1
+#ifndef __SOUP_CONVERTER_WRAPPER_H__
+#define __SOUP_CONVERTER_WRAPPER_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -42,4 +42,4 @@ GConverter *soup_converter_wrapper_new (GConverter  *base_converter,
 
 G_END_DECLS
 
-#endif /* SOUP_CONVERTER_WRAPPER_H */
+#endif /* __SOUP_CONVERTER_WRAPPER_H__ */
diff --git a/libsoup/soup-cookie-jar-db.h b/libsoup/soup-cookie-jar-db.h
index 1a989015..90c402b1 100644
--- a/libsoup/soup-cookie-jar-db.h
+++ b/libsoup/soup-cookie-jar-db.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Diego Escalante Urrelo
  */
 
-#ifndef SOUP_COOKIE_JAR_DB_H
-#define SOUP_COOKIE_JAR_DB_H 1
+#ifndef __SOUP_COOKIE_JAR_DB_H__
+#define __SOUP_COOKIE_JAR_DB_H__ 1
 
 #include <libsoup/soup-cookie-jar.h>
 
@@ -43,4 +43,4 @@ SoupCookieJar *soup_cookie_jar_db_new (const char *filename,
 
 G_END_DECLS
 
-#endif /* SOUP_COOKIE_JAR_DB_H */
+#endif /* __SOUP_COOKIE_JAR_DB_H__ */
diff --git a/libsoup/soup-cookie-jar-sqlite.h b/libsoup/soup-cookie-jar-sqlite.h
index adc27868..7f0099ee 100644
--- a/libsoup/soup-cookie-jar-sqlite.h
+++ b/libsoup/soup-cookie-jar-sqlite.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Diego Escalante Urrelo
  */
 
-#ifndef SOUP_COOKIE_JAR_SQLITE_H
-#define SOUP_COOKIE_JAR_SQLITE_H 1
+#ifndef __SOUP_COOKIE_JAR_SQLITE_H__
+#define __SOUP_COOKIE_JAR_SQLITE_H__ 1
 
 #include <libsoup/soup-cookie-jar-db.h>
 
@@ -40,4 +40,4 @@ SoupCookieJar *soup_cookie_jar_sqlite_new (const char *filename,
 
 G_END_DECLS
 
-#endif /* SOUP_COOKIE_JAR_SQLITE_H */
+#endif /* __SOUP_COOKIE_JAR_SQLITE_H__ */
diff --git a/libsoup/soup-cookie-jar-text.h b/libsoup/soup-cookie-jar-text.h
index 83b8f280..c33e14b7 100644
--- a/libsoup/soup-cookie-jar-text.h
+++ b/libsoup/soup-cookie-jar-text.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_COOKIE_JAR_TEXT_H
-#define SOUP_COOKIE_JAR_TEXT_H 1
+#ifndef __SOUP_COOKIE_JAR_TEXT_H__
+#define __SOUP_COOKIE_JAR_TEXT_H__ 1
 
 #include <libsoup/soup-cookie-jar.h>
 
@@ -43,4 +43,4 @@ SoupCookieJar *soup_cookie_jar_text_new (const char *filename,
 
 G_END_DECLS
 
-#endif /* SOUP_COOKIE_JAR_TEXT_H */
+#endif /* __SOUP_COOKIE_JAR_TEXT_H__ */
diff --git a/libsoup/soup-cookie-jar.h b/libsoup/soup-cookie-jar.h
index e77f8ab3..d9c6850e 100644
--- a/libsoup/soup-cookie-jar.h
+++ b/libsoup/soup-cookie-jar.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_COOKIE_JAR_H
-#define SOUP_COOKIE_JAR_H 1
+#ifndef __SOUP_COOKIE_JAR_H__
+#define __SOUP_COOKIE_JAR_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -96,4 +96,4 @@ void                      soup_cookie_jar_save                        (SoupCooki
 
 G_END_DECLS
 
-#endif /* SOUP_COOKIE_JAR_H */
+#endif /* __SOUP_COOKIE_JAR_H__ */
diff --git a/libsoup/soup-cookie.h b/libsoup/soup-cookie.h
index 96242913..21973a49 100644
--- a/libsoup/soup-cookie.h
+++ b/libsoup/soup-cookie.h
@@ -3,8 +3,8 @@
  * Copyright 2007, 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_COOKIE_H
-#define SOUP_COOKIE_H 1
+#ifndef __SOUP_COOKIE_H__
+#define __SOUP_COOKIE_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -119,4 +119,4 @@ gboolean    soup_cookie_domain_matches          (SoupCookie  *cookie,
 
 G_END_DECLS
 
-#endif /* SOUP_COOKIE_H */
+#endif /* __SOUP_COOKIE_H__ */
diff --git a/libsoup/soup-date.h b/libsoup/soup-date.h
index c6414c16..7dbbc87d 100644
--- a/libsoup/soup-date.h
+++ b/libsoup/soup-date.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2007 Red Hat, Inc.
  */
 
-#ifndef SOUP_DATE_H
-#define SOUP_DATE_H 1
+#ifndef __SOUP_DATE_H__
+#define __SOUP_DATE_H__ 1
 
 #include <time.h>
 #include <libsoup/soup-types.h>
@@ -89,4 +89,4 @@ void      soup_date_free            (SoupDate       *date);
 
 G_END_DECLS
 
-#endif /* SOUP_DATE_H */
+#endif /* __SOUP_DATE_H__ */
diff --git a/libsoup/soup-directory-input-stream.h b/libsoup/soup-directory-input-stream.h
index ae2b4baf..c7a41897 100644
--- a/libsoup/soup-directory-input-stream.h
+++ b/libsoup/soup-directory-input-stream.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SOUP_DIRECTORY_INPUT_STREAM_H
-#define SOUP_DIRECTORY_INPUT_STREAM_H 1
+#ifndef __SOUP_DIRECTORY_INPUT_STREAM_H__
+#define __SOUP_DIRECTORY_INPUT_STREAM_H__ 1
 
 #include <gio/gio.h>
 #include <libsoup/soup-types.h>
@@ -59,4 +59,4 @@ GInputStream *soup_directory_input_stream_new      (GFileEnumerator *enumerator,
 
 G_END_DECLS
 
-#endif /* SOUP_DIRECTORY_INPUT_STREAM_H */
+#endif /* __SOUP_DIRECTORY_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-filter-input-stream.h b/libsoup/soup-filter-input-stream.h
index 276b60f7..bd7277b8 100644
--- a/libsoup/soup-filter-input-stream.h
+++ b/libsoup/soup-filter-input-stream.h
@@ -3,8 +3,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef SOUP_FILTER_INPUT_STREAM_H
-#define SOUP_FILTER_INPUT_STREAM_H 1
+#ifndef __SOUP_FILTER_INPUT_STREAM_H__
+#define __SOUP_FILTER_INPUT_STREAM_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -54,4 +54,4 @@ gssize        soup_filter_input_stream_read_until (SoupFilterInputStream  *fstre
 
 G_END_DECLS
 
-#endif /* SOUP_FILTER_INPUT_STREAM_H */
+#endif /* __SOUP_FILTER_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-form.h b/libsoup/soup-form.h
index a0df0344..0b9c27cc 100644
--- a/libsoup/soup-form.h
+++ b/libsoup/soup-form.h
@@ -3,8 +3,8 @@
  * Copyright 2008 Red Hat, Inc.
  */
 
-#ifndef  SOUP_FORM_H
-#define  SOUP_FORM_H 1
+#ifndef  __SOUP_FORM_H__
+#define  __SOUP_FORM_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-multipart.h>
@@ -60,4 +60,4 @@ SoupMessage *soup_form_request_new_from_multipart (const char     *uri,
 
 G_END_DECLS
 
-#endif /* SOUP_FORM_H */
+#endif /* __SOUP_FORM_H__ */
diff --git a/libsoup/soup-gnome-features.h b/libsoup/soup-gnome-features.h
index 18f37dea..031491c4 100644
--- a/libsoup/soup-gnome-features.h
+++ b/libsoup/soup-gnome-features.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_GNOME_FEATURES_H
-#define SOUP_GNOME_FEATURES_H 1
+#ifndef __SOUP_GNOME_FEATURES_H__
+#define __SOUP_GNOME_FEATURES_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -27,4 +27,4 @@ GType soup_password_manager_gnome_get_type (void);
 
 G_END_DECLS
 
-#endif /* SOUP_GNOME_FEATURES_H */
+#endif /* __SOUP_GNOME_FEATURES_H__ */
diff --git a/libsoup/soup-gnome.h b/libsoup/soup-gnome.h
index a2134a4c..da0fe934 100644
--- a/libsoup/soup-gnome.h
+++ b/libsoup/soup-gnome.h
@@ -3,12 +3,12 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_GNOME_H
-#define SOUP_GNOME_H 1
+#ifndef __SOUP_GNOME_H__
+#define __SOUP_GNOME_H__ 1
 
 #include <libsoup/soup.h>
 
 #include <libsoup/soup-cookie-jar-sqlite.h>
 #include <libsoup/soup-gnome-features.h>
 
-#endif /* SOUP_GNOME_H */
+#endif /* __SOUP_GNOME_H__ */
diff --git a/libsoup/soup-headers.h b/libsoup/soup-headers.h
index d1f34618..79f92a7b 100644
--- a/libsoup/soup-headers.h
+++ b/libsoup/soup-headers.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2001-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_HEADERS_H
-#define SOUP_HEADERS_H 1
+#ifndef __SOUP_HEADERS_H__
+#define __SOUP_HEADERS_H__ 1
 
 #include <glib.h>
 #include <libsoup/soup-message.h>
@@ -71,4 +71,4 @@ void        soup_header_g_string_append_param_quoted (GString    *string,
 
 G_END_DECLS
 
-#endif /*SOUP_HEADERS_H*/
+#endif /* __SOUP_HEADERS_H__ */
diff --git a/libsoup/soup-logger.h b/libsoup/soup-logger.h
index df4a347f..9e36775c 100644
--- a/libsoup/soup-logger.h
+++ b/libsoup/soup-logger.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_LOGGER_H
-#define SOUP_LOGGER_H 1
+#ifndef __SOUP_LOGGER_H__
+#define __SOUP_LOGGER_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -89,4 +89,4 @@ void        soup_logger_set_printer         (SoupLogger        *logger,
 
 G_END_DECLS
 
-#endif /* SOUP_LOGGER_H */
+#endif /* __SOUP_LOGGER_H__ */
diff --git a/libsoup/soup-message-body.h b/libsoup/soup-message-body.h
index fc6c200b..42721c2f 100644
--- a/libsoup/soup-message-body.h
+++ b/libsoup/soup-message-body.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_MESSAGE_BODY_H
-#define SOUP_MESSAGE_BODY_H 1
+#ifndef __SOUP_MESSAGE_BODY_H__
+#define __SOUP_MESSAGE_BODY_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -111,4 +111,4 @@ void             soup_message_body_free          (SoupMessageBody *body);
 
 G_END_DECLS
 
-#endif /* SOUP_MESSAGE_BODY_H */
+#endif /* __SOUP_MESSAGE_BODY_H__ */
diff --git a/libsoup/soup-message-headers.h b/libsoup/soup-message-headers.h
index 829e3522..f430c97e 100644
--- a/libsoup/soup-message-headers.h
+++ b/libsoup/soup-message-headers.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2005 Novell, Inc.
  */
 
-#ifndef SOUP_MESSAGE_HEADERS_H
-#define SOUP_MESSAGE_HEADERS_H 1
+#ifndef __SOUP_MESSAGE_HEADERS_H__
+#define __SOUP_MESSAGE_HEADERS_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -178,4 +178,4 @@ void     soup_message_headers_set_content_disposition (SoupMessageHeaders  *hdrs
 
 G_END_DECLS
 
-#endif /* SOUP_MESSAGE_HEADERS_H */
+#endif /* __SOUP_MESSAGE_HEADERS_H__ */
diff --git a/libsoup/soup-message-private.h b/libsoup/soup-message-private.h
index 71adac7d..2f3d58a7 100644
--- a/libsoup/soup-message-private.h
+++ b/libsoup/soup-message-private.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_MESSAGE_PRIVATE_H
-#define SOUP_MESSAGE_PRIVATE_H 1
+#ifndef __SOUP_MESSAGE_PRIVATE_H__
+#define __SOUP_MESSAGE_PRIVATE_H__ 1
 
 #include "soup-message.h"
 #include "soup-auth.h"
@@ -161,4 +161,4 @@ SoupConnection *soup_message_get_connection (SoupMessage    *msg);
 void            soup_message_set_connection (SoupMessage    *msg,
 					     SoupConnection *conn);
 
-#endif /* SOUP_MESSAGE_PRIVATE_H */
+#endif /* __SOUP_MESSAGE_PRIVATE_H__ */
diff --git a/libsoup/soup-message-queue.h b/libsoup/soup-message-queue.h
index 275ea38d..2b33a451 100644
--- a/libsoup/soup-message-queue.h
+++ b/libsoup/soup-message-queue.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_MESSAGE_QUEUE_H
-#define SOUP_MESSAGE_QUEUE_H 1
+#ifndef __SOUP_MESSAGE_QUEUE_H__
+#define __SOUP_MESSAGE_QUEUE_H__ 1
 
 #include "soup-connection.h"
 #include "soup-message.h"
@@ -86,4 +86,4 @@ void soup_message_queue_item_unref          (SoupMessageQueueItem *item);
 
 G_END_DECLS
 
-#endif /* SOUP_MESSAGE_QUEUE_H */
+#endif /* __SOUP_MESSAGE_QUEUE_H__ */
diff --git a/libsoup/soup-message.h b/libsoup/soup-message.h
index cab2bad3..93778961 100644
--- a/libsoup/soup-message.h
+++ b/libsoup/soup-message.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_MESSAGE_H
-#define SOUP_MESSAGE_H 1
+#ifndef __SOUP_MESSAGE_H__
+#define __SOUP_MESSAGE_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-message-body.h>
@@ -256,4 +256,4 @@ void soup_message_finished            (SoupMessage *msg);
 
 G_END_DECLS
 
-#endif /*SOUP_MESSAGE_H*/
+#endif /* __SOUP_MESSAGE_H__ */
diff --git a/libsoup/soup-method.h b/libsoup/soup-method.h
index cec59e3c..a5ef9fd3 100644
--- a/libsoup/soup-method.h
+++ b/libsoup/soup-method.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_METHOD_H
-#define SOUP_METHOD_H 1
+#ifndef __SOUP_METHOD_H__
+#define __SOUP_METHOD_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-misc.h>
@@ -77,4 +77,4 @@ SOUP_VAR gpointer _SOUP_METHOD_UNLOCK;
 
 G_END_DECLS
 
-#endif /* SOUP_METHOD_H */
+#endif /* __SOUP_METHOD_H__ */
diff --git a/libsoup/soup-misc-private.h b/libsoup/soup-misc-private.h
index 7fe31a16..d8416f23 100644
--- a/libsoup/soup-misc-private.h
+++ b/libsoup/soup-misc-private.h
@@ -4,8 +4,8 @@
  * Copyright 2011 Red Hat, Inc.
  */
 
-#ifndef SOUP_MISC_PRIVATE_H
-#define SOUP_MISC_PRIVATE_H 1
+#ifndef __SOUP_MISC_PRIVATE_H__
+#define __SOUP_MISC_PRIVATE_H__ 1
 
 #include "soup-message-headers.h"
 
@@ -46,4 +46,4 @@ SoupAddress *soup_address_new_from_gsockaddr (GSocketAddress *addr);
 gboolean           soup_host_matches_host    (const gchar *host,
 					      const gchar *compare_with);
 
-#endif /* SOUP_MISC_PRIVATE_H */
+#endif /* __SOUP_MISC_PRIVATE_H__ */
diff --git a/libsoup/soup-misc.h b/libsoup/soup-misc.h
index ecb09a86..fe66b281 100644
--- a/libsoup/soup-misc.h
+++ b/libsoup/soup-misc.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_MISC_H
-#define SOUP_MISC_H 1
+#ifndef __SOUP_MISC_H__
+#define __SOUP_MISC_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -74,4 +74,4 @@ typedef enum {
 
 G_END_DECLS
 
-#endif /* SOUP_MISC_H */
+#endif /* __SOUP_MISC_H__ */
diff --git a/libsoup/soup-multipart-input-stream.h b/libsoup/soup-multipart-input-stream.h
index 8b735063..bbbac668 100644
--- a/libsoup/soup-multipart-input-stream.h
+++ b/libsoup/soup-multipart-input-stream.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2012 Collabora Ltd.
  */
 
-#ifndef SOUP_MULTIPART_INPUT_STREAM_H
-#define SOUP_MULTIPART_INPUT_STREAM_H 1
+#ifndef __SOUP_MULTIPART_INPUT_STREAM_H__
+#define __SOUP_MULTIPART_INPUT_STREAM_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-message-headers.h>
@@ -63,4 +63,4 @@ SoupMessageHeaders       *soup_multipart_input_stream_get_headers      (SoupMult
 
 G_END_DECLS
 
-#endif /* SOUP_MULTIPART_INPUT_STREAM_H */
+#endif /* __SOUP_MULTIPART_INPUT_STREAM_H__ */
diff --git a/libsoup/soup-multipart.h b/libsoup/soup-multipart.h
index ddd1b360..aa790cb8 100644
--- a/libsoup/soup-multipart.h
+++ b/libsoup/soup-multipart.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_MULTIPART_H
-#define SOUP_MULTIPART_H 1
+#ifndef __SOUP_MULTIPART_H__
+#define __SOUP_MULTIPART_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-message-body.h>
@@ -58,4 +58,4 @@ void     soup_multipart_free               (SoupMultipart       *multipart);
 
 G_END_DECLS
 
-#endif /* SOUP_MULTIPART_H */
+#endif /* __SOUP_MULTIPART_H__ */
diff --git a/libsoup/soup-password-manager-gnome.h b/libsoup/soup-password-manager-gnome.h
index 290e3ec8..4a937c75 100644
--- a/libsoup/soup-password-manager-gnome.h
+++ b/libsoup/soup-password-manager-gnome.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_PASSWORD_MANAGER_GNOME_H
-#define SOUP_PASSWORD_MANAGER_GNOME_H 1
+#ifndef __SOUP_PASSWORD_MANAGER_GNOME_H__
+#define __SOUP_PASSWORD_MANAGER_GNOME_H__ 1
 
 #include "soup-password-manager.h"
 #include "soup-gnome-features.h"
@@ -25,4 +25,4 @@ typedef struct {
 
 } SoupPasswordManagerGNOMEClass;
 
-#endif /* SOUP_PASSWORD_MANAGER_GNOME_H */
+#endif /* __SOUP_PASSWORD_MANAGER_GNOME_H__ */
diff --git a/libsoup/soup-password-manager.h b/libsoup/soup-password-manager.h
index aa5faf55..343f53c4 100644
--- a/libsoup/soup-password-manager.h
+++ b/libsoup/soup-password-manager.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_PASSWORD_MANAGER_H
-#define SOUP_PASSWORD_MANAGER_H 1
+#ifndef __SOUP_PASSWORD_MANAGER_H__
+#define __SOUP_PASSWORD_MANAGER_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -61,4 +61,4 @@ void  soup_password_manager_get_passwords_sync  (SoupPasswordManager  *password_
 						 SoupAuth             *auth,
 						 GCancellable         *cancellable);
 
-#endif /* SOUP_PASSWORD_MANAGER_H */
+#endif /* __SOUP_PASSWORD_MANAGER_H__ */
diff --git a/libsoup/soup-path-map.h b/libsoup/soup-path-map.h
index f5a8ba83..6b17bedd 100644
--- a/libsoup/soup-path-map.h
+++ b/libsoup/soup-path-map.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2007 Novell, Inc.
  */
 
-#ifndef SOUP_PATH_MAP_H
-#define SOUP_PATH_MAP_H 1
+#ifndef __SOUP_PATH_MAP_H__
+#define __SOUP_PATH_MAP_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -23,4 +23,4 @@ gpointer     soup_path_map_lookup (SoupPathMap    *map,
 				   const char     *path);
 
 
-#endif /* SOUP_PATH_MAP_H */
+#endif /* __SOUP_PATH_MAP_H__ */
diff --git a/libsoup/soup-portability.h b/libsoup/soup-portability.h
index 1814efbd..a52ad4a3 100644
--- a/libsoup/soup-portability.h
+++ b/libsoup/soup-portability.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2005, Novell, Inc.
  */
 
-#ifndef SOUP_PORTABILITY_H
-#define SOUP_PORTABILITY_H
+#ifndef __SOUP_PORTABILITY_H__
+#define __SOUP_PORTABILITY_H__
 
 #include <libsoup/soup-types.h>
 
@@ -23,4 +23,4 @@
 
 #endif
 
-#endif /* SOUP_PORTABILITY_H */
+#endif /* __SOUP_PORTABILITY_H__ */
diff --git a/libsoup/soup-proxy-resolver-default.h b/libsoup/soup-proxy-resolver-default.h
index 4bc6c744..a140ff6f 100644
--- a/libsoup/soup-proxy-resolver-default.h
+++ b/libsoup/soup-proxy-resolver-default.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2011 Collabora Ltd.
  */
 
-#ifndef SOUP_PROXY_RESOLVER_DEFAULT_H
-#define SOUP_PROXY_RESOLVER_DEFAULT_H 1
+#ifndef __SOUP_PROXY_RESOLVER_DEFAULT_H__
+#define __SOUP_PROXY_RESOLVER_DEFAULT_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -28,4 +28,4 @@ SOUP_AVAILABLE_IN_2_4
 GType soup_proxy_resolver_default_get_type (void);
 #define SOUP_TYPE_PROXY_RESOLVER_DEFAULT (soup_proxy_resolver_default_get_type ())
 
-#endif /*SOUP_PROXY_RESOLVER_DEFAULT_H*/
+#endif /* __SOUP_PROXY_RESOLVER_DEFAULT_H__ */
diff --git a/libsoup/soup-proxy-resolver-gnome.h b/libsoup/soup-proxy-resolver-gnome.h
index 809e9dd5..484cc1a3 100644
--- a/libsoup/soup-proxy-resolver-gnome.h
+++ b/libsoup/soup-proxy-resolver-gnome.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_PROXY_RESOLVER_GNOME_H
-#define SOUP_PROXY_RESOLVER_GNOME_H 1
+#ifndef __SOUP_PROXY_RESOLVER_GNOME_H__
+#define __SOUP_PROXY_RESOLVER_GNOME_H__ 1
 
 #include "soup-gnome-features.h"
 #include "soup-proxy-resolver-default.h"
@@ -22,4 +22,4 @@
 typedef SoupProxyResolverDefault SoupProxyResolverGNOME;
 typedef SoupProxyResolverDefaultClass SoupProxyResolverGNOMEClass;
 
-#endif /*SOUP_PROXY_RESOLVER_GNOME_H*/
+#endif /* __SOUP_PROXY_RESOLVER_GNOME_H__ */
diff --git a/libsoup/soup-proxy-resolver-wrapper.h b/libsoup/soup-proxy-resolver-wrapper.h
index d16b57c9..102b6c9a 100644
--- a/libsoup/soup-proxy-resolver-wrapper.h
+++ b/libsoup/soup-proxy-resolver-wrapper.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_PROXY_RESOLVER_WRAPPER_H
-#define SOUP_PROXY_RESOLVER_WRAPPER_H 1
+#ifndef __SOUP_PROXY_RESOLVER_WRAPPER_H__
+#define __SOUP_PROXY_RESOLVER_WRAPPER_H__ 1
 
 #include "soup-proxy-uri-resolver.h"
 #include "soup-uri.h"
@@ -31,4 +31,4 @@ GType soup_proxy_resolver_wrapper_get_type (void);
 
 GProxyResolver *soup_proxy_resolver_wrapper_new (SoupProxyURIResolver *soup_resolver);
 
-#endif /* SOUP_PROXY_RESOLVER_WRAPPER_H */
+#endif /* __SOUP_PROXY_RESOLVER_WRAPPER_H__ */
diff --git a/libsoup/soup-proxy-uri-resolver.h b/libsoup/soup-proxy-uri-resolver.h
index e203125b..fa78ea63 100644
--- a/libsoup/soup-proxy-uri-resolver.h
+++ b/libsoup/soup-proxy-uri-resolver.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2009 Red Hat, Inc.
  */
 
-#ifndef SOUP_PROXY_URI_RESOLVER_H
-#define SOUP_PROXY_URI_RESOLVER_H 1
+#ifndef __SOUP_PROXY_URI_RESOLVER_H__
+#define __SOUP_PROXY_URI_RESOLVER_H__ 1
 
 #include <libsoup/soup-proxy-resolver.h>
 
@@ -64,4 +64,4 @@ guint soup_proxy_uri_resolver_get_proxy_uri_sync  (SoupProxyURIResolver  *proxy_
 
 G_END_DECLS
 
-#endif /*SOUP_PROXY_URI_RESOLVER_H*/
+#endif /* __SOUP_PROXY_URI_RESOLVER_H__ */
diff --git a/libsoup/soup-request-data.h b/libsoup/soup-request-data.h
index 929c5908..154a904a 100644
--- a/libsoup/soup-request-data.h
+++ b/libsoup/soup-request-data.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SOUP_REQUEST_DATA_H
-#define SOUP_REQUEST_DATA_H 1
+#ifndef __SOUP_REQUEST_DATA_H__
+#define __SOUP_REQUEST_DATA_H__ 1
 
 #include "soup-request.h"
 
@@ -50,4 +50,4 @@ GType soup_request_data_get_type (void);
 
 G_END_DECLS
 
-#endif /* SOUP_REQUEST_DATA_H */
+#endif /* __SOUP_REQUEST_DATA_H__ */
diff --git a/libsoup/soup-request-file.h b/libsoup/soup-request-file.h
index df2cbab1..cc70c9f4 100644
--- a/libsoup/soup-request-file.h
+++ b/libsoup/soup-request-file.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SOUP_REQUEST_FILE_H
-#define SOUP_REQUEST_FILE_H 1
+#ifndef __SOUP_REQUEST_FILE_H__
+#define __SOUP_REQUEST_FILE_H__ 1
 
 #include "soup-request.h"
 
@@ -53,4 +53,4 @@ GFile *soup_request_file_get_file (SoupRequestFile *file);
 
 G_END_DECLS
 
-#endif /* SOUP_REQUEST_FILE_H */
+#endif /* __SOUP_REQUEST_FILE_H__ */
diff --git a/libsoup/soup-request-http.h b/libsoup/soup-request-http.h
index 271a8052..3a32febd 100644
--- a/libsoup/soup-request-http.h
+++ b/libsoup/soup-request-http.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SOUP_REQUEST_HTTP_H
-#define SOUP_REQUEST_HTTP_H 1
+#ifndef __SOUP_REQUEST_HTTP_H__
+#define __SOUP_REQUEST_HTTP_H__ 1
 
 #include "soup-request.h"
 
@@ -53,4 +53,4 @@ SoupMessage *soup_request_http_get_message (SoupRequestHTTP *http);
 
 G_END_DECLS
 
-#endif /* SOUP_REQUEST_HTTP_H */
+#endif /* __SOUP_REQUEST_HTTP_H__ */
diff --git a/libsoup/soup-request.h b/libsoup/soup-request.h
index 84ad6d6b..cc0eec0d 100644
--- a/libsoup/soup-request.h
+++ b/libsoup/soup-request.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SOUP_REQUEST_H
-#define SOUP_REQUEST_H 1
+#ifndef __SOUP_REQUEST_H__
+#define __SOUP_REQUEST_H__ 1
 
 #include <gio/gio.h>
 
@@ -100,4 +100,4 @@ const char   *soup_request_get_content_type   (SoupRequest          *request);
 
 G_END_DECLS
 
-#endif /* SOUP_REQUEST_H */
+#endif /* __SOUP_REQUEST_H__ */
diff --git a/libsoup/soup-requester.h b/libsoup/soup-requester.h
index 06355131..b0701b1a 100644
--- a/libsoup/soup-requester.h
+++ b/libsoup/soup-requester.h
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SOUP_REQUESTER_H
-#define SOUP_REQUESTER_H 1
+#ifndef __SOUP_REQUESTER_H__
+#define __SOUP_REQUESTER_H__ 1
 
 #ifdef LIBSOUP_USE_UNSTABLE_REQUEST_API
 
@@ -81,4 +81,4 @@ G_END_DECLS
 
 #endif /* LIBSOUP_USE_UNSTABLE_REQUEST_API */
 
-#endif /* SOUP_REQUESTER_H */
+#endif /* __SOUP_REQUESTER_H__ */
diff --git a/libsoup/soup-server.h b/libsoup/soup-server.h
index 63294870..f04e9eb1 100644
--- a/libsoup/soup-server.h
+++ b/libsoup/soup-server.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_SERVER_H
-#define SOUP_SERVER_H 1
+#ifndef __SOUP_SERVER_H__
+#define __SOUP_SERVER_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-uri.h>
@@ -228,4 +228,4 @@ SoupSocket   *soup_client_context_get_socket  (SoupClientContext *client);
 
 G_END_DECLS
 
-#endif /* SOUP_SERVER_H */
+#endif /* __SOUP_SERVER_H__ */
diff --git a/libsoup/soup-session-async.h b/libsoup/soup-session-async.h
index d5a450ec..32803c89 100644
--- a/libsoup/soup-session-async.h
+++ b/libsoup/soup-session-async.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_SESSION_ASYNC_H
-#define SOUP_SESSION_ASYNC_H 1
+#ifndef __SOUP_SESSION_ASYNC_H__
+#define __SOUP_SESSION_ASYNC_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-session.h>
@@ -57,4 +57,4 @@ SoupSession *soup_session_async_new_with_options (const char *optname1,
 
 G_END_DECLS
 
-#endif /* SOUP_SESSION_ASYNC_H */
+#endif /* __SOUP_SESSION_ASYNC_H__ */
diff --git a/libsoup/soup-session-feature.h b/libsoup/soup-session-feature.h
index 962c8e11..e145e3f4 100644
--- a/libsoup/soup-session-feature.h
+++ b/libsoup/soup-session-feature.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#ifndef SOUP_SESSION_FEATURE_H
-#define SOUP_SESSION_FEATURE_H 1
+#ifndef __SOUP_SESSION_FEATURE_H__
+#define __SOUP_SESSION_FEATURE_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -68,4 +68,4 @@ gboolean soup_session_feature_has_feature    (SoupSessionFeature *feature,
 
 G_END_DECLS
 
-#endif /* SOUP_SESSION_FEATURE_H */
+#endif /* __SOUP_SESSION_FEATURE_H__ */
diff --git a/libsoup/soup-session-private.h b/libsoup/soup-session-private.h
index dc4d300b..62478562 100644
--- a/libsoup/soup-session-private.h
+++ b/libsoup/soup-session-private.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_SESSION_PRIVATE_H
-#define SOUP_SESSION_PRIVATE_H 1
+#ifndef __SOUP_SESSION_PRIVATE_H__
+#define __SOUP_SESSION_PRIVATE_H__ 1
 
 #include "soup-session.h"
 #include "soup-message-private.h"
@@ -45,4 +45,4 @@ void                  soup_session_process_queue_item   (SoupSession          *s
 
 G_END_DECLS
 
-#endif /* SOUP_SESSION_PRIVATE_H */
+#endif /* __SOUP_SESSION_PRIVATE_H__ */
diff --git a/libsoup/soup-session-sync.h b/libsoup/soup-session-sync.h
index 56c340c0..691a97f8 100644
--- a/libsoup/soup-session-sync.h
+++ b/libsoup/soup-session-sync.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_SESSION_SYNC_H
-#define SOUP_SESSION_SYNC_H 1
+#ifndef __SOUP_SESSION_SYNC_H__
+#define __SOUP_SESSION_SYNC_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-session.h>
@@ -57,4 +57,4 @@ SoupSession *soup_session_sync_new_with_options (const char *optname1,
 
 G_END_DECLS
 
-#endif /* SOUP_SESSION_SYNC_H */
+#endif /* __SOUP_SESSION_SYNC_H__ */
diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index 24e90b29..46e4e154 100644
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_SESSION_H
-#define SOUP_SESSION_H 1
+#ifndef __SOUP_SESSION_H__
+#define __SOUP_SESSION_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-address.h>
@@ -254,4 +254,4 @@ GIOStream *soup_session_connect_finish (SoupSession                       *sessi
 
 G_END_DECLS
 
-#endif /* SOUP_SESSION_H */
+#endif /* __SOUP_SESSION_H__ */
diff --git a/libsoup/soup-socket-private.h b/libsoup/soup-socket-private.h
index 8677884b..582d6124 100644
--- a/libsoup/soup-socket-private.h
+++ b/libsoup/soup-socket-private.h
@@ -3,8 +3,8 @@
  * Copyright 2011-2014 Red Hat, Inc.
  */
 
-#ifndef SOUP_SOCKET_PRIVATE_H
-#define SOUP_SOCKET_PRIVATE_H 1
+#ifndef __SOUP_SOCKET_PRIVATE_H__
+#define __SOUP_SOCKET_PRIVATE_H__ 1
 
 #include "soup-socket.h"
 
@@ -88,4 +88,4 @@ void                  soup_socket_properties_unref (SoupSocketProperties *props)
 void soup_socket_properties_push_async_context (SoupSocketProperties *props);
 void soup_socket_properties_pop_async_context  (SoupSocketProperties *props);
 
-#endif /* SOUP_SOCKET_PRIVATE_H */
+#endif /* __SOUP_SOCKET_PRIVATE_H__ */
diff --git a/libsoup/soup-socket.h b/libsoup/soup-socket.h
index 993d1c66..98d06939 100644
--- a/libsoup/soup-socket.h
+++ b/libsoup/soup-socket.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_SOCKET_H
-#define SOUP_SOCKET_H 1
+#ifndef __SOUP_SOCKET_H__
+#define __SOUP_SOCKET_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -133,4 +133,4 @@ SoupSocketIOStatus  soup_socket_write      (SoupSocket         *sock,
 
 G_END_DECLS
 
-#endif /* SOUP_SOCKET_H */
+#endif /* __SOUP_SOCKET_H__ */
diff --git a/libsoup/soup-status.h b/libsoup/soup-status.h
index 28d481db..38beab44 100644
--- a/libsoup/soup-status.h
+++ b/libsoup/soup-status.h
@@ -5,8 +5,8 @@
  * Copyright (C) 2001-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_STATUS_H
-#define SOUP_STATUS_H 1
+#ifndef __SOUP_STATUS_H__
+#define __SOUP_STATUS_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -182,4 +182,4 @@ typedef enum {
 
 G_END_DECLS
 
-#endif /* SOUP_STATUS_H */
+#endif /* __SOUP_STATUS_H__ */
diff --git a/libsoup/soup-types.h b/libsoup/soup-types.h
index e020de7d..37a47ece 100644
--- a/libsoup/soup-types.h
+++ b/libsoup/soup-types.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2003, Ximian, Inc.
  */
 
-#ifndef SOUP_TYPES_H
-#define SOUP_TYPES_H 1
+#ifndef __SOUP_TYPES_H__
+#define __SOUP_TYPES_H__ 1
 
 #include <gio/gio.h>
 
@@ -39,4 +39,4 @@ typedef struct _SoupMessageQueueItem  SoupMessageQueueItem;
 
 G_END_DECLS
 
-#endif
+#endif /* __SOUP_TYPES_H__ */
diff --git a/libsoup/soup-uri.h b/libsoup/soup-uri.h
index b9360c64..8015e4f1 100644
--- a/libsoup/soup-uri.h
+++ b/libsoup/soup-uri.h
@@ -5,8 +5,8 @@
  */
 
 
-#ifndef  SOUP_URI_H
-#define  SOUP_URI_H 1
+#ifndef __SOUP_URI_H__
+#define __SOUP_URI_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-misc.h>
@@ -139,4 +139,4 @@ gboolean    soup_uri_host_equal            (gconstpointer v1,
 
 G_END_DECLS
 
-#endif /*SOUP_URI_H*/
+#endif /* __SOUP_URI_H__ */
diff --git a/libsoup/soup-value-utils.h b/libsoup/soup-value-utils.h
index 7910beff..9fa19c35 100644
--- a/libsoup/soup-value-utils.h
+++ b/libsoup/soup-value-utils.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2007 Red Hat, Inc.
  */
 
-#ifndef SOUP_VALUE_UTILS_H
-#define SOUP_VALUE_UTILS_H 1
+#ifndef __SOUP_VALUE_UTILS_H__
+#define __SOUP_VALUE_UTILS_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <gobject/gvaluecollector.h>
@@ -111,4 +111,4 @@ GType        soup_byte_array_get_type       (void);
 
 G_END_DECLS
 
-#endif /* SOUP_VALUE_UTILS_H */
+#endif /* __SOUP_VALUE_UTILS_H__ */
diff --git a/libsoup/soup-version.h.in b/libsoup/soup-version.h.in
index 0af245be..0ec2b9eb 100644
--- a/libsoup/soup-version.h.in
+++ b/libsoup/soup-version.h.in
@@ -5,8 +5,8 @@
  * Copyright (C) 2012 Igalia S.L.
  */
 
-#ifndef SOUP_VERSION_H
-#define SOUP_VERSION_H
+#ifndef __SOUP_VERSION_H__
+#define __SOUP_VERSION_H__
 
 #include <glib.h>
 
@@ -390,4 +390,4 @@ gboolean soup_check_version     (guint major,
 
 G_END_DECLS
 
-#endif /* SOUP_VERSION_H */
+#endif /* __SOUP_VERSION_H__ */
diff --git a/libsoup/soup-xmlrpc-old.h b/libsoup/soup-xmlrpc-old.h
index 1f486eff..cf446f04 100644
--- a/libsoup/soup-xmlrpc-old.h
+++ b/libsoup/soup-xmlrpc-old.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2007 Red Hat, Inc.
  */
 
-#ifndef SOUP_XMLRPC_OLD_H
-#define SOUP_XMLRPC_OLD_H 1
+#ifndef __SOUP_XMLRPC_OLD_H__
+#define __SOUP_XMLRPC_OLD_H__ 1
 
 #include <libsoup/soup-types.h>
 
@@ -65,4 +65,4 @@ void         soup_xmlrpc_set_fault               (SoupMessage  *msg,
 
 G_END_DECLS
 
-#endif /* SOUP_XMLRPC_OLD_H */
+#endif /* __SOUP_XMLRPC_OLD_H__ */
diff --git a/libsoup/soup-xmlrpc.h b/libsoup/soup-xmlrpc.h
index 1c4634f2..a424fdef 100644
--- a/libsoup/soup-xmlrpc.h
+++ b/libsoup/soup-xmlrpc.h
@@ -3,8 +3,8 @@
  * Copyright 2015 - Collabora Ltd.
  */
 
-#ifndef SOUP_XMLRPC_H
-#define SOUP_XMLRPC_H 1
+#ifndef __SOUP_XMLRPC_H__
+#define __SOUP_XMLRPC_H__ 1
 
 #include <libsoup/soup-types.h>
 #include <libsoup/soup-xmlrpc-old.h>
@@ -94,4 +94,4 @@ typedef enum {
 
 G_END_DECLS
 
-#endif /* SOUP_XMLRPC_H */
+#endif /* __SOUP_XMLRPC_H__ */
diff --git a/libsoup/soup.h b/libsoup/soup.h
index c13d932d..4a3ac2ef 100644
--- a/libsoup/soup.h
+++ b/libsoup/soup.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2000-2003, Ximian, Inc.
  */
 
-#ifndef SOUP_H
-#define SOUP_H 1
+#ifndef __SOUP_H__
+#define __SOUP_H__ 1
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,4 +66,4 @@ extern "C" {
 }
 #endif
 
-#endif /* SOUP_H */
+#endif /* __SOUP_H__ */