diff --git a/src/backend/postgres/PostgresBackend.h b/src/backend/postgres/PostgresBackend.h
index 7ed2da3297..244df3008d 100644
--- a/src/backend/postgres/PostgresBackend.h
+++ b/src/backend/postgres/PostgresBackend.h
@@ -123,23 +123,4 @@ AccountGroup * pgendGetTopGroup (PGBackend *be);
 void pgendDisable (PGBackend *be);
 void pgendEnable (PGBackend *be);
 
-void pgendStoreOneTransactionOnly (PGBackend *be, Transaction *ptr, sqlBuild_QType update);
-
-void pgendPutOneAccountOnly (PGBackend *be, Account *ptr);
-void pgendPutOneCommodityOnly (PGBackend *be, gnc_commodity *ptr);
-void pgendPutOnePriceOnly (PGBackend *be, GNCPrice *ptr);
-void pgendPutOneSplitOnly (PGBackend *be, Split *ptr);
-void pgendPutOneTransactionOnly (PGBackend *be, Transaction *ptr);
-
-int pgendAccountCompareVersion (PGBackend *be, Account *ptr);
-int pgendPriceCompareVersion (PGBackend *be, GNCPrice *ptr);
-int pgendTransactionCompareVersion (PGBackend *be, Transaction *ptr);
-
-void pgendStoreAuditAccount (PGBackend *be, Account *ptr, sqlBuild_QType update);
-void pgendStoreAuditPrice (PGBackend *be, GNCPrice *ptr, sqlBuild_QType update);
-void pgendStoreAuditSplit (PGBackend *be, Split *ptr, sqlBuild_QType update);
-void pgendStoreAuditTransaction (PGBackend *be, Transaction *ptr, sqlBuild_QType update);
-
-int pgendTransactionGetDeletedVersion (PGBackend *be, Transaction *ptr);
-
 #endif /* POSTGRES_BACKEND_H */
diff --git a/src/backend/postgres/account.c b/src/backend/postgres/account.c
index 176ac72c61..37473a6a2e 100644
--- a/src/backend/postgres/account.c
+++ b/src/backend/postgres/account.c
@@ -41,6 +41,7 @@
 #include "guid.h"
 
 #include "account.h"
+#include "base-autogen.h"
 #include "kvp-sql.h"
 #include "PostgresBackend.h"
 #include "price.h"
diff --git a/src/backend/postgres/gncquery.c b/src/backend/postgres/gncquery.c
index c64c14be27..0dae0c0cf9 100644
--- a/src/backend/postgres/gncquery.c
+++ b/src/backend/postgres/gncquery.c
@@ -757,7 +757,7 @@ sqlQuery_kvp_build (sqlQuery *sq, KVPPredicateData *kpd)
  */
 
 const char *
-sqlQuery_build (sqlQuery *sq, Query *q, GNCBook *book)
+sqlQuery_build (sqlQuery *sq, Query *q)
 {
    GList *il, *jl, *qterms, *andterms;
    QueryTerm *qt;
@@ -772,7 +772,7 @@ sqlQuery_build (sqlQuery *sq, Query *q, GNCBook *book)
    gboolean need_entry = FALSE;
    sort_type_t sorter;
 
-   if (!sq || !q || !book) return NULL;
+   if (!sq || !q) return NULL;
 
    /* Determine whether the query will need to reference certain
     * tables. See note above for details. */
diff --git a/src/backend/postgres/gncquery.h b/src/backend/postgres/gncquery.h
index 2afc3d1477..522f281e1a 100644
--- a/src/backend/postgres/gncquery.h
+++ b/src/backend/postgres/gncquery.h
@@ -53,7 +53,7 @@ sqlQuery *sqlQuery_new(void);
 void sql_Query_destroy (sqlQuery *);
 
 /* convert a gnc query to an sql query */
-const char *sqlQuery_build (sqlQuery *, Query *, GNCBook *);
+const char *sqlQuery_build (sqlQuery *, Query *);
 
 
 #endif  /* GNC_QUERY_H */
diff --git a/src/backend/postgres/price.c b/src/backend/postgres/price.c
index c6fcaab535..6dc52596df 100644
--- a/src/backend/postgres/price.c
+++ b/src/backend/postgres/price.c
@@ -39,6 +39,7 @@
 #include "guid.h"
 
 #include "PostgresBackend.h"
+#include "base-autogen.h"
 #include "escape.h"
 #include "price.h"
 #include "putil.h"
diff --git a/src/backend/postgres/test/test-db.c b/src/backend/postgres/test/test-db.c
index e00f891658..96a59d8d53 100644
--- a/src/backend/postgres/test/test-db.c
+++ b/src/backend/postgres/test/test-db.c
@@ -486,7 +486,7 @@ test_raw_query (GNCSession *session, Query *q)
   be = (PGBackend *) gnc_session_get_backend(session);
 
   sq = sqlQuery_new();
-  sql_query_string = sqlQuery_build (sq, q, gnc_session_get_book(session));
+  sql_query_string = sqlQuery_build (sq, q);
 
   result = PQexec (be->connection, sql_query_string);
 
diff --git a/src/backend/postgres/txn.c b/src/backend/postgres/txn.c
index 86e38a61c2..44165ad940 100644
--- a/src/backend/postgres/txn.c
+++ b/src/backend/postgres/txn.c
@@ -45,6 +45,7 @@
  
 #include "PostgresBackend.h"
 #include "account.h"
+#include "base-autogen.h"
 #include "checkpoint.h"
 #include "kvp-sql.h"
 #include "price.h"