[couchdb-glib: 8/21] More build fixes - we'll compile by next commit - wooppeee!

[Mikkel Kamstrup Erlandsen <kamstrup src gnome org>]

commit 54de06fff4576045ea72a1134b9e99f3c3a02f6b
Author: Mikkel Kamstrup Erlandsen <mikkel kamstrup gmail com>
Date:   Mon Oct 5 00:21:31 2009 +0200

    More build fixes - we'll compile by next commit - wooppeee!

 couchdb-glib/couchdb-document-info.c |    2 ++
 couchdb-glib/couchdb-document-info.h |    5 ++---
 couchdb-glib/couchdb-glib.h          |    5 ++++-
 couchdb-glib/couchdb-struct-field.c  |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/couchdb-glib/couchdb-document-info.c b/couchdb-glib/couchdb-document-info.c
index 7568dd2..eac5c10 100644
--- a/couchdb-glib/couchdb-document-info.c
+++ b/couchdb-glib/couchdb-document-info.c
@@ -21,6 +21,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include "couchdb-document-info.h"
+
 struct _CouchDBDocumentInfo {
 	gint ref_count;
 
diff --git a/couchdb-glib/couchdb-document-info.h b/couchdb-glib/couchdb-document-info.h
index fc9b2b4..e112090 100644
--- a/couchdb-glib/couchdb-document-info.h
+++ b/couchdb-glib/couchdb-document-info.h
@@ -26,7 +26,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "couchdb-database-info.h"
 
 G_BEGIN_DECLS
 
@@ -37,8 +36,8 @@ typedef struct _CouchDBDocumentInfo CouchDBDocumentInfo;
 
 GType                couchdb_document_info_get_type (void);
 CouchDBDocumentInfo *couchdb_document_info_new (const char *docid, const char *revision);
-CouchDBDatabaseInfo *couchdb_document_info_ref (CouchDBDatabaseInfo *dbinfo);
-void                 couchdb_document_info_unref (CouchDBDatabaseInfo *dbinfo);
+CouchDBDocumentInfo *couchdb_document_info_ref (CouchDBDocumentInfo *dbinfo);
+void                 couchdb_document_info_unref (CouchDBDocumentInfo *dbinfo);
 
 const char          *couchdb_document_info_get_docid (CouchDBDocumentInfo *doc_info);
 const char          *couchdb_document_info_get_revision (CouchDBDocumentInfo *doc_info);
diff --git a/couchdb-glib/couchdb-glib.h b/couchdb-glib/couchdb-glib.h
index d813468..f042f00 100644
--- a/couchdb-glib/couchdb-glib.h
+++ b/couchdb-glib/couchdb-glib.h
@@ -24,9 +24,12 @@
 #ifndef __COUCHDB_GLIB_H__
 #define __COUCHDB_GLIB_H__
 
+#include <couchdb-types.h>
 #include <couchdb.h>
+#include <couchdb-database-info.h>
 #include <couchdb-document.h>
-#include <couchdb-database.h>
+#include <couchdb-document-contact.h>
+#include <couchdb-document-info.h>
 #include <couchdb-struct-field.h>
 
 #endif /* __COUCHDB_GLIB_H__ */
diff --git a/couchdb-glib/couchdb-struct-field.c b/couchdb-glib/couchdb-struct-field.c
index 21f7bd9..37273f8 100644
--- a/couchdb-glib/couchdb-struct-field.c
+++ b/couchdb-glib/couchdb-struct-field.c
@@ -284,7 +284,7 @@ couchdb_struct_field_to_string (CouchDBStructField *sf)
 JsonObject *
 couchdb_struct_field_get_json_object (CouchDBStructField *sf)
 {
-	return_val_if_fail (sf != NULL, NULL);
+	g_return_val_if_fail (sf != NULL, NULL);
 	
 	return sf->json_object;
 }