Include foo-enumtypes.h from each foo.h

I think it's reasonable to assume that importing the header which gives
you WockyXmppError should also give you WOCKY_TYPE_XMPP_ERROR.

19 files changed, 10 insertions, 12 deletions

diff --git a/wocky/wocky-auth-registry.h b/wocky/wocky-auth-registry.h
index 38f197f..1d81f8e 100644
--- a/wocky/wocky-auth-registry.h
+++ b/wocky/wocky-auth-registry.h
@@ -6,6 +6,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 #include "wocky-auth-handler.h"
+#include "wocky-auth-registry-enumtypes.h"
 
 G_BEGIN_DECLS
 
diff --git a/wocky/wocky-connector.c b/wocky/wocky-connector.c
index 244f94b..f2f5aa5 100644
--- a/wocky/wocky-connector.c
+++ b/wocky/wocky-connector.c
@@ -109,7 +109,6 @@
 #include "wocky-namespaces.h"
 #include "wocky-xmpp-connection.h"
 #include "wocky-xmpp-error.h"
-#include "wocky-xmpp-error-enumtypes.h"
 #include "wocky-signals-marshal.h"
 #include "wocky-utils.h"
 
diff --git a/wocky/wocky-connector.h b/wocky/wocky-connector.h
index c678ee8..ee466bc 100644
--- a/wocky/wocky-connector.h
+++ b/wocky/wocky-connector.h
@@ -23,12 +23,12 @@
 
 #include <glib-object.h>
 
+#include "wocky-connector-enumtypes.h"
 #include "wocky-sasl-auth.h"
 #include "wocky-xmpp-connection.h"
 #include "wocky-stanza.h"
 
 #include "wocky-tls.h"
-#include "wocky-tls-enumtypes.h"
 #include "wocky-tls-handler.h"
 
 G_BEGIN_DECLS
diff --git a/wocky/wocky-data-form.c b/wocky/wocky-data-form.c
index 3830265..5b4fe65 100644
--- a/wocky/wocky-data-form.c
+++ b/wocky/wocky-data-form.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#include "wocky-data-form-enumtypes.h"
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
 
diff --git a/wocky/wocky-data-form.h b/wocky/wocky-data-form.h
index 16e46df..44aa19f 100644
--- a/wocky/wocky-data-form.h
+++ b/wocky/wocky-data-form.h
@@ -23,6 +23,7 @@
 
 #include <glib-object.h>
 
+#include "wocky-data-form-enumtypes.h"
 #include "wocky-node.h"
 
 G_BEGIN_DECLS
diff --git a/wocky/wocky-jabber-auth.c b/wocky/wocky-jabber-auth.c
index 5783e58..6af74f4 100644
--- a/wocky/wocky-jabber-auth.c
+++ b/wocky/wocky-jabber-auth.c
@@ -27,7 +27,6 @@
 #include "wocky-signals-marshal.h"
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
-#include "wocky-xmpp-error-enumtypes.h"
 
 #define DEBUG_FLAG DEBUG_AUTH
 #include "wocky-debug.h"
diff --git a/wocky/wocky-muc.c b/wocky/wocky-muc.c
index 86a55cc..e6a187c 100644
--- a/wocky/wocky-muc.c
+++ b/wocky/wocky-muc.c
@@ -25,8 +25,6 @@
 #include "wocky-debug.h"
 
 #include "wocky-muc.h"
-#include "wocky-muc-enumtypes.h"
-#include "wocky-xmpp-error-enumtypes.h"
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
 #include "wocky-signals-marshal.h"
diff --git a/wocky/wocky-muc.h b/wocky/wocky-muc.h
index d056df9..546baa1 100644
--- a/wocky/wocky-muc.h
+++ b/wocky/wocky-muc.h
@@ -22,6 +22,7 @@
 
 #include <glib-object.h>
 
+#include "wocky-muc-enumtypes.h"
 #include "wocky-namespaces.h"
 #include "wocky-porter.h"
 
diff --git a/wocky/wocky-openssl.c b/wocky/wocky-openssl.c
index 320af7a..c89c92a 100644
--- a/wocky/wocky-openssl.c
+++ b/wocky/wocky-openssl.c
@@ -62,7 +62,6 @@
 #define DEBUG_ASYNC_DETAIL_LEVEL 6
 
 #include "wocky-debug.h"
-#include "wocky-tls-enumtypes.h"
 #include "wocky-utils.h"
 
 #include <openssl/ssl.h>
diff --git a/wocky/wocky-pubsub-node.c b/wocky/wocky-pubsub-node.c
index 5228e14..50bda12 100644
--- a/wocky/wocky-pubsub-node.c
+++ b/wocky/wocky-pubsub-node.c
@@ -19,7 +19,6 @@
 
 #include "wocky-pubsub-node.h"
 #include "wocky-pubsub-node-protected.h"
-#include "wocky-pubsub-node-enumtypes.h"
 
 #include "wocky-namespaces.h"
 #include "wocky-porter.h"
diff --git a/wocky/wocky-pubsub-node.h b/wocky/wocky-pubsub-node.h
index 1444780..4c03915 100644
--- a/wocky/wocky-pubsub-node.h
+++ b/wocky/wocky-pubsub-node.h
@@ -23,6 +23,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
+#include "wocky-pubsub-node-enumtypes.h"
 #include "wocky-types.h"
 #include "wocky-session.h"
 #include "wocky-pubsub-service.h"
diff --git a/wocky/wocky-pubsub-service.c b/wocky/wocky-pubsub-service.c
index 869ae03..92f7f10 100644
--- a/wocky/wocky-pubsub-service.c
+++ b/wocky/wocky-pubsub-service.c
@@ -18,7 +18,6 @@
  */
 
 #include "wocky-pubsub-service.h"
-#include "wocky-pubsub-service-enumtypes.h"
 #include "wocky-pubsub-service-protected.h"
 
 #include "wocky-porter.h"
diff --git a/wocky/wocky-pubsub-service.h b/wocky/wocky-pubsub-service.h
index 0928ee5..4824430 100644
--- a/wocky/wocky-pubsub-service.h
+++ b/wocky/wocky-pubsub-service.h
@@ -23,6 +23,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
+#include "wocky-pubsub-service-enumtypes.h"
 #include "wocky-stanza.h"
 #include "wocky-session.h"
 #include "wocky-types.h"
diff --git a/wocky/wocky-sasl-auth.c b/wocky/wocky-sasl-auth.c
index 6528d15..3acf7e1 100644
--- a/wocky/wocky-sasl-auth.c
+++ b/wocky/wocky-sasl-auth.c
@@ -28,7 +28,6 @@
 #include "wocky-signals-marshal.h"
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
-#include "wocky-xmpp-error-enumtypes.h"
 
 #define DEBUG_FLAG DEBUG_AUTH
 #include "wocky-debug.h"
diff --git a/wocky/wocky-tls.c b/wocky/wocky-tls.c
index 069551d..8d837ed 100644
--- a/wocky/wocky-tls.c
+++ b/wocky/wocky-tls.c
@@ -90,7 +90,6 @@
                          GNUTLS_VERIFY_DISABLE_CA_SIGN          )
 
 #include "wocky-debug.h"
-#include "wocky-tls-enumtypes.h"
 #include "wocky-utils.h"
 
 #include <gnutls/gnutls.h>
diff --git a/wocky/wocky-tls.h b/wocky/wocky-tls.h
index 9b08c8a..58497ef 100644
--- a/wocky/wocky-tls.h
+++ b/wocky/wocky-tls.h
@@ -28,6 +28,8 @@
 
 #include <gio/gio.h>
 
+#include "wocky-tls-enumtypes.h"
+
 #define WOCKY_TYPE_TLS_CONNECTION (wocky_tls_connection_get_type ())
 #define WOCKY_TYPE_TLS_SESSION    (wocky_tls_session_get_type ())
 #define WOCKY_TLS_SESSION(inst)   (G_TYPE_CHECK_INSTANCE_CAST ((inst),   \
diff --git a/wocky/wocky-xmpp-error.c b/wocky/wocky-xmpp-error.c
index b8f076a..290e4f4 100644
--- a/wocky/wocky-xmpp-error.c
+++ b/wocky/wocky-xmpp-error.c
@@ -25,7 +25,6 @@
 
 #include "wocky-namespaces.h"
 #include "wocky-utils.h"
-#include "wocky-xmpp-error-enumtypes.h"
 
 /* Definitions of XMPP core stanza errors, as per RFC 3920 §9.3; plus the
  * corresponding legacy error codes as described by XEP-0086.
diff --git a/wocky/wocky-xmpp-error.h b/wocky/wocky-xmpp-error.h
index 28b92d6..bcdf3da 100644
--- a/wocky/wocky-xmpp-error.h
+++ b/wocky/wocky-xmpp-error.h
@@ -24,6 +24,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include "wocky-xmpp-error-enumtypes.h"
 #include "wocky-node.h"
 
 /**
diff --git a/wocky/wocky-xmpp-reader.h b/wocky/wocky-xmpp-reader.h
index 8e0b518..56cbb32 100644
--- a/wocky/wocky-xmpp-reader.h
+++ b/wocky/wocky-xmpp-reader.h
@@ -22,6 +22,7 @@
 #define __WOCKY_XMPP_READER_H__
 
 #include <glib-object.h>
+#include "wocky-xmpp-reader-enumtypes.h"
 #include "wocky-stanza.h"
 
 G_BEGIN_DECLS