gcr: Don't include main headers in individual components

 * Just include what we need, this helps keep rebuild times down
   and makes interdependencies clear.

diff --git a/gcr/gcr-callback-output-stream.h b/gcr/gcr-callback-output-stream.h
index 51d618e..a8db5df 100644 (file)
--- a/gcr/gcr-callback-output-stream.h
+++ b/gcr/gcr-callback-output-stream.h
@@ -24,7 +24,6 @@
 #ifndef GCR_CALLBACK_OUTPUT_STREAM_H
 #define GCR_CALLBACK_OUTPUT_STREAM_H
 
-#include "gcr-base.h"
 #include "gcr-collection.h"
 
 #include <glib-object.h>

diff --git a/gcr/gcr-certificate-chain.c b/gcr/gcr-certificate-chain.c
index 78a8832..9d8258a 100644 (file)
--- a/gcr/gcr-certificate-chain.c
+++ b/gcr/gcr-certificate-chain.c
@@ -28,6 +28,7 @@
 #include "gcr-certificate.h"
 #define DEBUG_FLAG GCR_DEBUG_CERTIFICATE_CHAIN
 #include "gcr-debug.h"
+#include "gcr-enum-types-base.h"
 #include "gcr-pkcs11-certificate.h"
 #include "gcr-simple-certificate.h"
 #include "gcr-trust.h"

diff --git a/gcr/gcr-gnupg-collection.h b/gcr/gcr-gnupg-collection.h
index a626cef..a2b631e 100644 (file)
--- a/gcr/gcr-gnupg-collection.h
+++ b/gcr/gcr-gnupg-collection.h
@@ -24,7 +24,6 @@
 #ifndef GCR_GNUPG_COLLECTION_H
 #define GCR_GNUPG_COLLECTION_H
 
-#include "gcr-base.h"
 #include "gcr-collection.h"
 
 #include <glib-object.h>

diff --git a/gcr/gcr-gnupg-process.h b/gcr/gcr-gnupg-process.h
index 61e4894..da86dc3 100644 (file)
--- a/gcr/gcr-gnupg-process.h
+++ b/gcr/gcr-gnupg-process.h
@@ -24,9 +24,9 @@
 #ifndef GCR_GNUPG_PROCESS_H
 #define GCR_GNUPG_PROCESS_H
 
-#include "gcr-base.h"
 #include "gcr-record.h"
 
+#include <gio/gio.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS

diff --git a/gcr/gcr-icons.c b/gcr/gcr-icons.c
index e375d00..2a9da4e 100644 (file)
--- a/gcr/gcr-icons.c
+++ b/gcr/gcr-icons.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include "gcr-base.h"
 #include "gcr-icons.h"
 
 /**

diff --git a/gcr/gcr-import-button.c b/gcr/gcr-import-button.c
index b25f20c..1e1c809 100644 (file)
--- a/gcr/gcr-import-button.c
+++ b/gcr/gcr-import-button.c
@@ -25,6 +25,7 @@
 
 #include "gcr-import-button.h"
 #include "gcr-internal.h"
+#include "gcr-library.h"
 #include "gcr-marshal.h"
 #include "gcr-parser.h"
 #include "gcr-pkcs11-import-interaction.h"

diff --git a/gcr/gcr-import-button.h b/gcr/gcr-import-button.h
index 6c839fc..41ed222 100644 (file)
--- a/gcr/gcr-import-button.h
+++ b/gcr/gcr-import-button.h
@@ -24,7 +24,7 @@
 #ifndef __GCR_IMPORT_BUTTON_H__
 #define __GCR_IMPORT_BUTTON_H__
 
-#include "gcr.h"
+#include "gcr-importer.h"
 
 #include <gtk/gtk.h>
 

diff --git a/gcr/gcr-library.c b/gcr/gcr-library.c
index 5766bdd..6f4c3ab 100644 (file)
--- a/gcr/gcr-library.c
+++ b/gcr/gcr-library.c
@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include "gcr-base.h"
 #define DEBUG_FLAG GCR_DEBUG_LIBRARY
 #include "gcr-debug.h"
+#include "gcr-deprecated-base.h"
 #include "gcr-internal.h"
 #include "gcr-library.h"
 #include "gcr-types.h"

diff --git a/gcr/gcr-pkcs11-import-dialog.c b/gcr/gcr-pkcs11-import-dialog.c
index e33d624..cd71482 100644 (file)
--- a/gcr/gcr-pkcs11-import-dialog.c
+++ b/gcr/gcr-pkcs11-import-dialog.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include "gcr-dialog-util.h"
+#include "gcr-icons.h"
 #include "gcr-pkcs11-import-dialog.h"
 
 #include "egg/egg-entry-buffer.h"

diff --git a/gcr/gcr-pkcs11-import-dialog.h b/gcr/gcr-pkcs11-import-dialog.h
index 38a1dd4..5c7da89 100644 (file)
--- a/gcr/gcr-pkcs11-import-dialog.h
+++ b/gcr/gcr-pkcs11-import-dialog.h
@@ -25,7 +25,7 @@
 #ifndef __GCR_PKCS11_IMPORT_DIALOG_H__
 #define __GCR_PKCS11_IMPORT_DIALOG_H__
 
-#include "gcr.h"
+#include <gck/gck.h>
 
 #include <gtk/gtk.h>
 

diff --git a/gcr/gcr-pkcs11-import-interaction.h b/gcr/gcr-pkcs11-import-interaction.h
index 97027ba..1ddc30f 100644 (file)
--- a/gcr/gcr-pkcs11-import-interaction.h
+++ b/gcr/gcr-pkcs11-import-interaction.h
@@ -24,8 +24,6 @@
 #ifndef __GCR_PKCS11_IMPORT_INTERACTION_H__
 #define __GCR_PKCS11_IMPORT_INTERACTION_H__
 
-#include "gcr.h"
-
 #include "gcr-pkcs11-import-dialog.h"
 
 G_BEGIN_DECLS

diff --git a/gcr/gcr-secret-exchange.h b/gcr/gcr-secret-exchange.h
index 5608f63..28b45b9 100644 (file)
--- a/gcr/gcr-secret-exchange.h
+++ b/gcr/gcr-secret-exchange.h
@@ -24,7 +24,7 @@
 #ifndef __GCR_SECRET_EXCHANGE_H__
 #define __GCR_SECRET_EXCHANGE_H__
 
-#include "gcr-base.h"
+#include <gck/gck.h>
 
 #include <glib-object.h>
 

diff --git a/gcr/gcr-simple-certificate.h b/gcr/gcr-simple-certificate.h
index c363a86..3346f92 100644 (file)
--- a/gcr/gcr-simple-certificate.h
+++ b/gcr/gcr-simple-certificate.h
@@ -26,8 +26,6 @@
 #ifndef __GCR_SIMPLE_CERTIFICATE_H__
 #define __GCR_SIMPLE_CERTIFICATE_H__
 
-#include "gcr-base.h"
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS

diff --git a/gcr/gcr-simple-collection.h b/gcr/gcr-simple-collection.h
index e78c48c..151da2a 100644 (file)
--- a/gcr/gcr-simple-collection.h
+++ b/gcr/gcr-simple-collection.h
@@ -22,7 +22,6 @@
 #ifndef __GCR_SIMPLE_COLLECTION_H__
 #define __GCR_SIMPLE_COLLECTION_H__
 
-#include "gcr-base.h"
 #include "gcr-collection.h"
 
 #include <glib-object.h>

diff --git a/gcr/gcr-single-collection.h b/gcr/gcr-single-collection.h
index 9bd598f..328474e 100644 (file)
--- a/gcr/gcr-single-collection.h
+++ b/gcr/gcr-single-collection.h
@@ -24,7 +24,6 @@
 #ifndef __GCR_SINGLE_COLLECTION_H__
 #define __GCR_SINGLE_COLLECTION_H__
 
-#include "gcr-base.h"
 #include "gcr-collection.h"
 
 #include <glib-object.h>

diff --git a/gcr/gcr-trust.c b/gcr/gcr-trust.c
index 4959cb6..b28b28c 100644 (file)
--- a/gcr/gcr-trust.c
+++ b/gcr/gcr-trust.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include "gcr-base.h"
 #define DEBUG_FLAG GCR_DEBUG_TRUST
 #include "gcr-debug.h"
 #include "gcr-types.h"

diff --git a/gcr/gcr-trust.h b/gcr/gcr-trust.h
index 79db47f..078bd3b 100644 (file)
--- a/gcr/gcr-trust.h
+++ b/gcr/gcr-trust.h
@@ -26,6 +26,7 @@
 #ifndef __GCR_TRUST_H__
 #define __GCR_TRUST_H__
 
+#include "gcr-certificate.h"
 #include "gcr-types.h"
 
 G_BEGIN_DECLS

diff --git a/gcr/gcr-union-collection.h b/gcr/gcr-union-collection.h
index 15c207f..f558ba9 100644 (file)
--- a/gcr/gcr-union-collection.h
+++ b/gcr/gcr-union-collection.h
@@ -24,7 +24,6 @@
 #ifndef __GCR_UNION_COLLECTION_H__
 #define __GCR_UNION_COLLECTION_H__
 
-#include "gcr-base.h"
 #include "gcr-collection.h"
 
 #include <glib-object.h>