[Gnucash-changes] r12007 - gnucash/trunk - Use only qof.h in place of other QOF headers

Neil Williams codehelp at cvs.gnucash.org
Mon Nov 21 14:31:51 EST 2005


Author: codehelp
Date: 2005-11-21 14:31:44 -0500 (Mon, 21 Nov 2005)
New Revision: 12007
Trac: http://svn.gnucash.org/trac/changeset/12007

Modified:
   gnucash/trunk/
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/app-utils/gnc-component-manager.h
   gnucash/trunk/src/app-utils/gnc-euro.h
   gnucash/trunk/src/app-utils/gnc-exp-parser.h
   gnucash/trunk/src/app-utils/gnc-ui-util.h
   gnucash/trunk/src/app-utils/guile-util.h
   gnucash/trunk/src/app-utils/option-util.h
   gnucash/trunk/src/backend/dwi/qofmap.h
   gnucash/trunk/src/backend/file/gnc-book-xml-v2.c
   gnucash/trunk/src/backend/file/gnc-recurrence-xml-v2.c
   gnucash/trunk/src/backend/file/gnc-xml.h
   gnucash/trunk/src/backend/file/io-gncbin.h
   gnucash/trunk/src/backend/file/io-gncxml-v1.c
   gnucash/trunk/src/backend/file/io-gncxml-v2.h
   gnucash/trunk/src/backend/file/io-gncxml.h
   gnucash/trunk/src/backend/file/io-utils.h
   gnucash/trunk/src/backend/file/sixtp-dom-generators.h
   gnucash/trunk/src/backend/file/sixtp-dom-parsers.h
   gnucash/trunk/src/backend/file/sixtp-utils.h
   gnucash/trunk/src/backend/file/test/test-dom-converters1.c
   gnucash/trunk/src/backend/file/test/test-file-stuff.h
   gnucash/trunk/src/backend/file/test/test-kvp-frames.c
   gnucash/trunk/src/backend/file/test/test-save-in-lang.c
   gnucash/trunk/src/backend/file/test/test-xml-commodity.c
   gnucash/trunk/src/backend/gnc-backend-api.h
   gnucash/trunk/src/backend/net/NetIO.c
   gnucash/trunk/src/backend/postgres/account.h
   gnucash/trunk/src/backend/postgres/book.h
   gnucash/trunk/src/backend/postgres/builder.c
   gnucash/trunk/src/backend/postgres/builder.h
   gnucash/trunk/src/backend/postgres/checkpoint.c
   gnucash/trunk/src/backend/postgres/checkpoint.h
   gnucash/trunk/src/backend/postgres/escape.c
   gnucash/trunk/src/backend/postgres/events.h
   gnucash/trunk/src/backend/postgres/kvp-sql.c
   gnucash/trunk/src/backend/postgres/kvp-sql.h
   gnucash/trunk/src/backend/postgres/putil.c
   gnucash/trunk/src/backend/postgres/putil.h
   gnucash/trunk/src/backend/postgres/txn.c
   gnucash/trunk/src/backend/postgres/txn.h
   gnucash/trunk/src/backend/postgres/txnmass.h
   gnucash/trunk/src/backend/postgres/upgrade.c
   gnucash/trunk/src/backend/rpc/RpcBackend.c
   gnucash/trunk/src/backend/rpc/RpcServer.c
   gnucash/trunk/src/backend/rpc/RpcUtils.c
   gnucash/trunk/src/backend/rpc/gncRpc.h
   gnucash/trunk/src/backend/rpc/gncRpc_server.c
   gnucash/trunk/src/business/business-core/file/gnc-bill-term-xml-v2.c
   gnucash/trunk/src/business/business-core/file/gnc-owner-xml-v2.h
   gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
   gnucash/trunk/src/business/business-gnome/business-options-gnome.c
   gnucash/trunk/src/business/business-gnome/business-urls.c
   gnucash/trunk/src/business/business-gnome/dialog-billterms.c
   gnucash/trunk/src/business/business-gnome/dialog-customer.c
   gnucash/trunk/src/business/business-gnome/dialog-date-close.c
   gnucash/trunk/src/business/business-gnome/dialog-date-close.h
   gnucash/trunk/src/business/business-gnome/dialog-employee.c
   gnucash/trunk/src/business/business-gnome/dialog-invoice.c
   gnucash/trunk/src/business/business-gnome/dialog-invoice.h
   gnucash/trunk/src/business/business-gnome/dialog-job.c
   gnucash/trunk/src/business/business-gnome/dialog-order.c
   gnucash/trunk/src/business/business-gnome/dialog-payment.c
   gnucash/trunk/src/business/business-gnome/dialog-vendor.c
   gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c
   gnucash/trunk/src/business/business-ledger/gncEntryLedgerP.h
   gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c
   gnucash/trunk/src/engine/GNCId.h
   gnucash/trunk/src/engine/Period.h
   gnucash/trunk/src/engine/QueryCore.h
   gnucash/trunk/src/engine/QueryNew.h
   gnucash/trunk/src/engine/QueryObject.h
   gnucash/trunk/src/engine/SX-book-p.h
   gnucash/trunk/src/engine/TransLog.c
   gnucash/trunk/src/engine/Transaction.c
   gnucash/trunk/src/engine/Transaction.h
   gnucash/trunk/src/engine/TransactionP.h
   gnucash/trunk/src/engine/cap-gains.h
   gnucash/trunk/src/engine/engine-helpers.h
   gnucash/trunk/src/engine/gnc-book.h
   gnucash/trunk/src/engine/gnc-budget.h
   gnucash/trunk/src/engine/gnc-commodity.h
   gnucash/trunk/src/engine/gnc-session-scm.h
   gnucash/trunk/src/engine/gnc-session.h
   gnucash/trunk/src/engine/gncObject.h
   gnucash/trunk/src/engine/gw-engine-spec.scm
   gnucash/trunk/src/engine/gw-kvp-spec.scm
   gnucash/trunk/src/engine/kvp-scm.h
   gnucash/trunk/src/engine/test-core/test-engine-stuff.h
   gnucash/trunk/src/engine/test/test-freq-spec.c
   gnucash/trunk/src/engine/test/test-querynew.c
   gnucash/trunk/src/engine/test/test-recurrence.c
   gnucash/trunk/src/gnome-search/search-date.h
   gnucash/trunk/src/gnome-search/search-numeric.h
   gnucash/trunk/src/gnome-utils/dialog-exchange.h
   gnucash/trunk/src/gnome-utils/dialog-options.c
   gnucash/trunk/src/gnome-utils/druid-utils.c
   gnucash/trunk/src/gnome-utils/gnc-account-sel.c
   gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
   gnucash/trunk/src/gnome-utils/gnc-amount-edit.h
   gnucash/trunk/src/gnome-utils/gnc-date-format.h
   gnucash/trunk/src/gnome-utils/gnc-dialog.c
   gnucash/trunk/src/gnome-utils/gnc-file.h
   gnucash/trunk/src/gnome-utils/gnc-gui-query.c
   gnucash/trunk/src/gnome-utils/gnc-html-graph-gog.c
   gnucash/trunk/src/gnome-utils/gnc-html-guppi.c
   gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c
   gnucash/trunk/src/gnome-utils/gnc-plugin-page.c
   gnucash/trunk/src/gnome-utils/gnc-plugin-page.h
   gnucash/trunk/src/gnome-utils/gnc-plugin.c
   gnucash/trunk/src/gnome-utils/gnc-query-list.c
   gnucash/trunk/src/gnome-utils/gnc-recurrence.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-account-types.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-example-account.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-price.c
   gnucash/trunk/src/gnome-utils/gnc-window.c
   gnucash/trunk/src/gnome-utils/gncmod-gnome-utils.c
   gnucash/trunk/src/gnome-utils/test/test-gnc-dialog.c
   gnucash/trunk/src/gnome/dialog-commodities.c
   gnucash/trunk/src/gnome/dialog-price-editor.c
   gnucash/trunk/src/gnome/dialog-sx-from-trans.c
   gnucash/trunk/src/gnome/dialog-tax-info.c
   gnucash/trunk/src/gnome/druid-acct-period.c
   gnucash/trunk/src/gnome/druid-merge.h
   gnucash/trunk/src/gnome/druid-stock-split.c
   gnucash/trunk/src/gnome/gnc-plugin-budget.c
   gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
   gnucash/trunk/src/gnome/gw-gnc-spec.scm
   gnucash/trunk/src/gnome/reconcile-list.h
   gnucash/trunk/src/gnome/window-main-summarybar.c
   gnucash/trunk/src/import-export/binary-import/druid-commodity.h
   gnucash/trunk/src/import-export/hbci/dialog-daterange.h
   gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c
   gnucash/trunk/src/import-export/hbci/gnc-hbci-kvp.h
   gnucash/trunk/src/import-export/hbci/gnc-hbci-trans-templ.h
   gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c
   gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c
   gnucash/trunk/src/import-export/import-main-matcher.c
   gnucash/trunk/src/import-export/import-match-map.c
   gnucash/trunk/src/import-export/import-match-picker.c
   gnucash/trunk/src/import-export/import-parse.h
   gnucash/trunk/src/import-export/import-utilities.c
   gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c
   gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
   gnucash/trunk/src/import-export/qif/qif-import.h
   gnucash/trunk/src/import-export/qif/qif-objects-p.h
   gnucash/trunk/src/network-utils/gnc-http.c
   gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c
   gnucash/trunk/src/register/ledger-core/split-register-load.c
   gnucash/trunk/src/register/register-core/datecell.h
   gnucash/trunk/src/register/register-core/formulacell.h
   gnucash/trunk/src/register/register-core/pricecell.h
Log:
Use only qof.h in place of other QOF headers


Property changes on: gnucash/trunk
___________________________________________________________________
Name: svn:ignore
   - .deps
.libs
ABOUT-NLS
COPYING
INSTALL
Makefile
Makefile.in
TAGS
TAGS.stamp
aclocal.m4
autom4te.cache
autom4te-2.53.cache
configure
config.cache
config.guess
config.sub
config.log
config.status
config.h
config.h.in
config.rpath
cscope.out
cscope.files
depcomp
etags.files
gnucash-config
install-sh
intltool-modules
intl
libtool
ltconfig
make-gnucash-patch
make-gnucash-potfiles
missing
mkinstalldirs
stamp-h
stamp-h1
stamp-h.in
install-stamp
tags
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
tags
*.tar.gz
*.log
*.patch
*.diff
*.diffs
*.xac.*.xac
autom4te.cache
ltmain.sh
mkinstalldirs
.DS_Store
*.prj
*.pws
.tm_project.cache
   + .deps
.libs
ABOUT-NLS
COPYING
INSTALL
Makefile
Makefile.in
TAGS
TAGS.stamp
aclocal.m4
autom4te.cache
autom4te-2.53.cache
configure
config.cache
config.guess
config.sub
config.log
config.status
config.h
config.h.in
config.rpath
cscope.out
cscope.files
depcomp
etags.files
gnucash-config
install-sh
intltool-modules
intl
libtool
ltconfig
make-gnucash-patch
make-gnucash-potfiles
missing
mkinstalldirs
stamp-h
stamp-h1
stamp-h.in
install-stamp
tags
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
tags
*.tar.gz
*.log
*.patch
*.diff
*.diffs
*.xac.*.xac
autom4te.cache
ltmain.sh
mkinstalldirs
.DS_Store
*.prj
*.prj.bak
*.pws
.tm_project.cache


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/ChangeLog	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1,3 +1,160 @@
+2005-11-21  Neil Williams <linux at codehelp.co.uk>
+
+	Use only qof.h in place of other QOF headers,
+	as per the API, to ease future conversions
+	from libqof1 to libqof2.
+	* src/app-utils/gnc-component-manager.h : 
+	* src/app-utils/gnc-euro.h : 
+	* src/app-utils/gnc-exp-parser.h : 
+	* src/app-utils/gnc-ui-util.h : 
+	* src/app-utils/guile-util.h : 
+	* src/app-utils/option-util.h : 
+	* src/backend/dwi/qofmap.h : 
+	* src/backend/file/gnc-book-xml-v2.c : 
+	* src/backend/file/gnc-recurrence-xml-v2.c : 
+	* src/backend/file/gnc-xml.h : 
+	* src/backend/file/io-gncbin.h : 
+	* src/backend/file/io-gncxml.h : 
+	* src/backend/file/io-gncxml-v1.c : 
+	* src/backend/file/io-gncxml-v2.h : 
+	* src/backend/file/io-utils.h : 
+	* src/backend/file/sixtp-dom-generators.h : 
+	* src/backend/file/sixtp-dom-parsers.h : 
+	* src/backend/file/sixtp-utils.h : 
+	* src/backend/file/test/test-dom-converters1.c : 
+	* src/backend/file/test/test-file-stuff.h : 
+	* src/backend/file/test/test-kvp-frames.c : 
+	* src/backend/file/test/test-save-in-lang.c : 
+	* src/backend/file/test/test-xml-commodity.c : 
+	* src/backend/gnc-backend-api.h : 
+	* src/backend/net/NetIO.c : 
+	* src/backend/postgres/account.h : 
+	* src/backend/postgres/book.h : 
+	* src/backend/postgres/builder.c : 
+	* src/backend/postgres/builder.h : 
+	* src/backend/postgres/checkpoint.c : 
+	* src/backend/postgres/checkpoint.h : 
+	* src/backend/postgres/escape.c : 
+	* src/backend/postgres/events.h : 
+	* src/backend/postgres/kvp-sql.c : 
+	* src/backend/postgres/kvp-sql.h : 
+	* src/backend/postgres/putil.c : 
+	* src/backend/postgres/putil.h : 
+	* src/backend/postgres/txn.c : 
+	* src/backend/postgres/txn.h : 
+	* src/backend/postgres/txnmass.h : 
+	* src/backend/postgres/upgrade.c : 
+	* src/backend/rpc/gncRpc.h : 
+	* src/backend/rpc/gncRpc_server.c : 
+	* src/backend/rpc/RpcBackend.c : 
+	* src/backend/rpc/RpcServer.c : 
+	* src/backend/rpc/RpcUtils.c : 
+	* src/business/business-core/file/gnc-bill-term-xml-v2.c : 
+	* src/business/business-core/file/gnc-owner-xml-v2.h : 
+	* src/business/business-gnome/business-gnome-utils.c : 
+	* src/business/business-gnome/business-options-gnome.c : 
+	* src/business/business-gnome/business-urls.c : 
+	* src/business/business-gnome/dialog-billterms.c : 
+	* src/business/business-gnome/dialog-customer.c : 
+	* src/business/business-gnome/dialog-date-close.c : 
+	* src/business/business-gnome/dialog-date-close.h : 
+	* src/business/business-gnome/dialog-employee.c : 
+	* src/business/business-gnome/dialog-invoice.c : 
+	* src/business/business-gnome/dialog-invoice.h : 
+	* src/business/business-gnome/dialog-job.c : 
+	* src/business/business-gnome/dialog-order.c : 
+	* src/business/business-gnome/dialog-payment.c : 
+	* src/business/business-gnome/dialog-vendor.c : 
+	* src/business/business-ledger/gncEntryLedgerModel.c : 
+	* src/business/business-ledger/gncEntryLedgerP.h : 
+	* src/business/dialog-tax-table/dialog-tax-table.c : 
+	* src/engine/cap-gains.h : 
+	* src/engine/engine-helpers.h : 
+	* src/engine/gnc-book.h : 
+	* src/engine/gnc-budget.h : 
+	* src/engine/gnc-commodity.h : 
+	* src/engine/GNCId.h : 
+	* src/engine/gncObject.h : 
+	* src/engine/gnc-session.h : 
+	* src/engine/gnc-session-scm.h : 
+	* src/engine/gw-engine-spec.scm : 
+	* src/engine/gw-kvp-spec.scm : 
+	* src/engine/kvp-scm.h : 
+	* src/engine/Period.h : 
+	* src/engine/QueryCore.h : 
+	* src/engine/QueryNew.h : 
+	* src/engine/QueryObject.h : 
+	* src/engine/SX-book-p.h : 
+	* src/engine/test-core/test-engine-stuff.h : 
+	* src/engine/test/test-freq-spec.c : 
+	* src/engine/test/test-querynew.c : 
+	* src/engine/test/test-recurrence.c : 
+	* src/engine/Transaction.c : 
+	* src/engine/Transaction.h : 
+	* src/engine/TransactionP.h : 
+	* src/engine/TransLog.c : 
+	* src/gnome/dialog-commodities.c : 
+	* src/gnome/dialog-price-editor.c : 
+	* src/gnome/dialog-sx-from-trans.c : 
+	* src/gnome/dialog-tax-info.c : 
+	* src/gnome/druid-acct-period.c : 
+	* src/gnome/druid-merge.h : 
+	* src/gnome/druid-stock-split.c : 
+	* src/gnome/gnc-plugin-budget.c : 
+	* src/gnome/gnc-plugin-page-budget.c : 
+	* src/gnome/gw-gnc-spec.scm : 
+	* src/gnome/reconcile-list.h : 
+	* src/gnome-search/search-date.h : 
+	* src/gnome-search/search-numeric.h : 
+	* src/gnome-utils/dialog-exchange.h : 
+	* src/gnome-utils/dialog-options.c : 
+	* src/gnome-utils/druid-utils.c : 
+	* src/gnome-utils/gnc-account-sel.c : 
+	* src/gnome-utils/gnc-amount-edit.c : 
+	* src/gnome-utils/gnc-amount-edit.h : 
+	* src/gnome-utils/gnc-date-format.h : 
+	* src/gnome-utils/gnc-dialog.c : 
+	* src/gnome-utils/gnc-file.h : 
+	* src/gnome-utils/gnc-gui-query.c : 
+	* src/gnome-utils/gnc-html-graph-gog.c : 
+	* src/gnome-utils/gnc-html-guppi.c : 
+	* src/gnome-utils/gncmod-gnome-utils.c : 
+	* src/gnome-utils/gnc-plugin.c : 
+	* src/gnome-utils/gnc-plugin-menu-additions.c : 
+	* src/gnome-utils/gnc-plugin-page.c : 
+	* src/gnome-utils/gnc-plugin-page.h : 
+	* src/gnome-utils/gnc-query-list.c : 
+	* src/gnome-utils/gnc-recurrence.c : 
+	* src/gnome-utils/gnc-tree-model-account-types.c : 
+	* src/gnome-utils/gnc-tree-model-commodity.c : 
+	* src/gnome-utils/gnc-tree-model-example-account.c : 
+	* src/gnome-utils/gnc-tree-model-price.c : 
+	* src/gnome-utils/gnc-window.c : 
+	* src/gnome-utils/test/test-gnc-dialog.c : 
+	* src/gnome/window-main-summarybar.c : 
+	* src/import-export/binary-import/druid-commodity.h : 
+	* src/import-export/hbci/dialog-daterange.h : 
+	* src/import-export/hbci/gnc-hbci-gettrans.c : 
+	* src/import-export/hbci/gnc-hbci-kvp.h : 
+	* src/import-export/hbci/gnc-hbci-trans-templ.h : 
+	* src/import-export/hbci/gnc-hbci-utils.c : 
+	* src/import-export/hbci/gnc-plugin-hbci.c : 
+	* src/import-export/import-main-matcher.c : 
+	* src/import-export/import-match-map.c : 
+	* src/import-export/import-match-picker.c : 
+	* src/import-export/import-parse.h : 
+	* src/import-export/import-utilities.c : 
+	* src/import-export/log-replay/gnc-log-replay.c : 
+	* src/import-export/qif-import/druid-qif-import.c : 
+	* src/import-export/qif/qif-import.h : 
+	* src/import-export/qif/qif-objects-p.h : 
+	* src/network-utils/gnc-http.c : 
+	* src/register/ledger-core/dialog-dup-trans.c : 
+	* src/register/ledger-core/split-register-load.c : 
+	* src/register/register-core/datecell.h : 
+	* src/register/register-core/formulacell.h : 
+	* src/register/register-core/pricecell.h : 
+
 2005-11-20  David Hampton  <hampton at employees.org>
 
 	* src/import-export/hbci/gnc-hbci-gettrans.c:

Modified: gnucash/trunk/src/app-utils/gnc-component-manager.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-component-manager.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/app-utils/gnc-component-manager.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -25,7 +25,7 @@
 #include "guile-mappings.h"
 
 #include "GNCId.h"
-#include "gnc-event.h"
+#include "qof.h"
 
 
 #define NO_COMPONENT (-1)

Modified: gnucash/trunk/src/app-utils/gnc-euro.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-euro.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/app-utils/gnc-euro.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -25,7 +25,7 @@
 #include <glib.h>
 
 #include "gnc-commodity.h"
-#include "gnc-numeric.h"
+#include "qof.h"
 
 gboolean    gnc_is_euro_currency (const gnc_commodity * currency);
 gboolean    gnc_is_euro_currency_code (const char *code);

Modified: gnucash/trunk/src/app-utils/gnc-exp-parser.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-exp-parser.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/app-utils/gnc-exp-parser.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 
-#include "gnc-numeric.h"
+#include "qof.h"
 
 /**
  * The errors which can be determined at the gnc-exp-parser level.

Modified: gnucash/trunk/src/app-utils/gnc-ui-util.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -39,8 +39,7 @@
 
 #include "Account.h"
 #include "Group.h"
-#include "qofbook.h"
-#include "qofsession.h"
+#include "qof.h"
 
 
 typedef QofSession * (*QofSessionCB) (void);

Modified: gnucash/trunk/src/app-utils/guile-util.h
===================================================================
--- gnucash/trunk/src/app-utils/guile-util.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/app-utils/guile-util.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -28,8 +28,7 @@
 #include <libguile.h>
 
 #include "gnc-book.h"
-#include "gnc-date.h"
-#include "gnc-numeric.h"
+#include "qof.h"
 #include "Group.h"
 
 

Modified: gnucash/trunk/src/app-utils/option-util.h
===================================================================
--- gnucash/trunk/src/app-utils/option-util.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/app-utils/option-util.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -29,8 +29,7 @@
 #include "guile-mappings.h"
 
 #include "gnc-commodity.h"
-#include "gnc-date.h"
-#include "kvp_frame.h"
+#include "qof.h"
 #include "GNCId.h"
 #include "gnc-ui-common.h"
 

Modified: gnucash/trunk/src/backend/dwi/qofmap.h
===================================================================
--- gnucash/trunk/src/backend/dwi/qofmap.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/dwi/qofmap.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -35,9 +35,7 @@
 #ifndef QOF_MAP_H_
 #define QOF_MAP_H_
 
-#include <qof/qofbook.h>
-#include <qof/qofinstance.h>
-#include <qof/guid.h>
+#include <qof.h>
 #include "database.h"
 
 typedef struct QofMap_s QofMap;

Modified: gnucash/trunk/src/backend/file/gnc-book-xml-v2.c
===================================================================
--- gnucash/trunk/src/backend/file/gnc-book-xml-v2.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/gnc-book-xml-v2.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -44,7 +44,7 @@
 #include "io-utils.h"
 
 #include "sixtp-dom-parsers.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "Group.h"
 
 /* non-static because it's used in io-gncxml-v2.c */

Modified: gnucash/trunk/src/backend/file/gnc-recurrence-xml-v2.c
===================================================================
--- gnucash/trunk/src/backend/file/gnc-recurrence-xml-v2.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/gnc-recurrence-xml-v2.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -29,8 +29,7 @@
 
 #include "gnc-xml.h"
 #include "gnc-xml-helper.h"
-#include "gnc-engine-util.h"
-#include "gnc-trace.h"
+#include "qof.h"
 
 #include "sixtp.h"
 #include "sixtp-utils.h"

Modified: gnucash/trunk/src/backend/file/gnc-xml.h
===================================================================
--- gnucash/trunk/src/backend/file/gnc-xml.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/gnc-xml.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -29,7 +29,6 @@
 
 #include "FreqSpec.h"
 #include "SchedXaction.h"
-#include "qofbook.h"
 #include "gnc-engine.h"
 #include "gnc-pricedb.h"
 #include "gnc-budget.h"

Modified: gnucash/trunk/src/backend/file/io-gncbin.h
===================================================================
--- gnucash/trunk/src/backend/file/io-gncbin.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/io-gncbin.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -26,8 +26,7 @@
 #ifndef IO_GNCBIN_H
 #define IO_GNCBIN_H
 
-#include "qofbackend.h"
-#include "qofbook.h"
+#include "qof.h"
 
 /* @file io-gncbin.h
  * @brief read (old X-Accountant format) binary datafile

Modified: gnucash/trunk/src/backend/file/io-gncxml-v1.c
===================================================================
--- gnucash/trunk/src/backend/file/io-gncxml-v1.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/io-gncxml-v1.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -407,7 +407,7 @@
 }
 
 /* ================================================================== */
-#include "kvp_frame.h"
+#include "qof.h"
 
 /****************************************************************************/
 /* <kvp-frame>

Modified: gnucash/trunk/src/backend/file/io-gncxml-v2.h
===================================================================
--- gnucash/trunk/src/backend/file/io-gncxml-v2.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/io-gncxml-v2.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -33,9 +33,8 @@
 
 #include <glib.h>
 
-#include "qofbook.h"
-#include "gnc-backend-file.h"
 #include "gnc-engine.h"
+#include "gnc-backend-file.h"
 
 #include "sixtp.h"
 

Modified: gnucash/trunk/src/backend/file/io-gncxml.h
===================================================================
--- gnucash/trunk/src/backend/file/io-gncxml.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/io-gncxml.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -34,7 +34,7 @@
 #define IO_GNCXML_H
 
 #include <glib.h>
-#include "qofbook.h"
+#include "qof.h"
 
 /* FIXME: eventually, we probably need to add an error stack
    accessable via gnc_book_get_xml_io_error() a la binfile. */

Modified: gnucash/trunk/src/backend/file/io-utils.h
===================================================================
--- gnucash/trunk/src/backend/file/io-utils.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/io-utils.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -29,7 +29,7 @@
 
 #include "Group.h"
 #include "io-gncxml-v2.h"
-#include "qofbook.h"
+#include "qof.h"
 
 void write_account_group(FILE *out, AccountGroup *grp, sixtp_gdv2 *gd);
 void write_accounts(FILE *out, QofBook *book, sixtp_gdv2 *gd);

Modified: gnucash/trunk/src/backend/file/sixtp-dom-generators.h
===================================================================
--- gnucash/trunk/src/backend/file/sixtp-dom-generators.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/sixtp-dom-generators.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -32,11 +32,8 @@
 
 #include "sixtp-dom-generators.h"
 #include "gnc-commodity.h"
-#include "gnc-date.h"
-#include "gnc-numeric.h"
+#include "qof.h"
 #include "Recurrence.h"
-#include "kvp_frame.h"
-#include "qofid.h"
 
 xmlNodePtr text_to_dom_tree(const char *tag, const char *str);
 xmlNodePtr int_to_dom_tree(const char *tag, gint64 val);

Modified: gnucash/trunk/src/backend/file/sixtp-dom-parsers.h
===================================================================
--- gnucash/trunk/src/backend/file/sixtp-dom-parsers.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/sixtp-dom-parsers.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -32,10 +32,7 @@
 
 #include "FreqSpec.h"
 #include "gnc-commodity.h"
-#include "gnc-date.h"
-#include "kvp_frame.h"
-#include "qofbook.h"
-#include "qofid.h"
+#include "qof.h"
 #include "gnc-budget.h"
 
 GUID* dom_tree_to_guid(xmlNodePtr node);

Modified: gnucash/trunk/src/backend/file/sixtp-utils.h
===================================================================
--- gnucash/trunk/src/backend/file/sixtp-utils.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/sixtp-utils.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -24,7 +24,7 @@
 #ifndef SIXTP_UTILS_H
 #define SIXTP_UTILS_H
 
-#include "gnc-date.h"
+#include "qof.h"
 
 #include "sixtp.h"
 

Modified: gnucash/trunk/src/backend/file/test/test-dom-converters1.c
===================================================================
--- gnucash/trunk/src/backend/file/test/test-dom-converters1.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/test/test-dom-converters1.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -42,7 +42,6 @@
 #include "sixtp-dom-generators.h"
 
 #include "gnc-commodity.h"
-#include "guid.h"
 
 static void
 test_dom_tree_to_commodity_ref(void)

Modified: gnucash/trunk/src/backend/file/test/test-file-stuff.h
===================================================================
--- gnucash/trunk/src/backend/file/test/test-file-stuff.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/test/test-file-stuff.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -10,12 +10,9 @@
 #include <glib.h>
 
 #include "gnc-commodity.h"
-#include "gnc-date.h"
 #include "gnc-engine.h"
 #include "gnc-xml-helper.h"
-#include "guid.h"
 #include "io-gncxml-gen.h"
-#include "kvp_frame.h"
 #include "sixtp.h"
 
 

Modified: gnucash/trunk/src/backend/file/test/test-kvp-frames.c
===================================================================
--- gnucash/trunk/src/backend/file/test/test-kvp-frames.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/test/test-kvp-frames.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -6,7 +6,7 @@
 #include "test-engine-stuff.h"
 #include "test-file-stuff.h"
 
-#include "kvp_frame.h"
+#include "qof.h"
 
 #include "sixtp-dom-generators.h"
 #include "sixtp-dom-parsers.h"

Modified: gnucash/trunk/src/backend/file/test/test-save-in-lang.c
===================================================================
--- gnucash/trunk/src/backend/file/test/test-save-in-lang.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/test/test-save-in-lang.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -14,7 +14,6 @@
 #ifndef HAVE_SETENV
 #include "setenv.h"
 #endif
-#include "qofbook.h"
 #include "gnc-engine.h"
 #include "TransLog.h"
 

Modified: gnucash/trunk/src/backend/file/test/test-xml-commodity.c
===================================================================
--- gnucash/trunk/src/backend/file/test/test-xml-commodity.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/file/test/test-xml-commodity.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -9,7 +9,7 @@
 #include "gnc-module.h"
 #include "gnc-xml-helper.h"
 #include "gnc-xml.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
 #include "sixtp-parsers.h"
 #include "sixtp-utils.h"

Modified: gnucash/trunk/src/backend/gnc-backend-api.h
===================================================================
--- gnucash/trunk/src/backend/gnc-backend-api.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/gnc-backend-api.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -24,7 +24,7 @@
 #ifndef GNC_BACKEND_API_H
 #define GNC_BACKEND_API_H
 
-#include "qofbackend.h"
+#include "qof.h"
 
 QofBackend * gnc_backend_new (void);
 

Modified: gnucash/trunk/src/backend/net/NetIO.c
===================================================================
--- gnucash/trunk/src/backend/net/NetIO.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/net/NetIO.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -47,10 +47,10 @@
 #include "BackendP.h"
 #include "NetIO.h"
 #include "gnc-book.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "io-gncxml.h"
 
-static short module = MOD_BACKEND;
+static QofLogModule log_module = MOD_BACKEND;
 
 typedef struct _xmlend XMLBackend;
 

Modified: gnucash/trunk/src/backend/postgres/account.h
===================================================================
--- gnucash/trunk/src/backend/postgres/account.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/account.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -25,8 +25,7 @@
 #define POSTGRES_ACCOUNT_H
 
 #include "Group.h"
-#include "qofbook.h"
-#include "guid.h"
+#include "qof.h"
 
 #include "PostgresBackend.h"
 

Modified: gnucash/trunk/src/backend/postgres/book.h
===================================================================
--- gnucash/trunk/src/backend/postgres/book.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/book.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -24,9 +24,7 @@
 #ifndef POSTGRES_BOOK_H
 #define POSTGRES_BOOK_H
 
-#include "qofbook.h"
 #include "gnc-engine.h"
-#include "guid.h"
 
 #include "PostgresBackend.h"
 

Modified: gnucash/trunk/src/backend/postgres/builder.c
===================================================================
--- gnucash/trunk/src/backend/postgres/builder.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/builder.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -42,11 +42,10 @@
 #include <glib.h>
 #include <string.h>
 
-#include "gnc-date.h"
+#include "qof.h"
 #include "escape.h"
 #include "builder.h"
 #include "gnc-engine.h"
-#include "gnc-engine-util.h"
 
 static QofLogModule log_module = GNC_MOD_BACKEND; 
 

Modified: gnucash/trunk/src/backend/postgres/builder.h
===================================================================
--- gnucash/trunk/src/backend/postgres/builder.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/builder.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -41,8 +41,7 @@
 #ifndef SQL_BUILDER_H
 #define SQL_BUILDER_H
 
-#include "gnc-date.h"
-#include "guid.h"
+#include "qof.h"
 
 #define SQL_DBL_FMT "%24.18g"
 

Modified: gnucash/trunk/src/backend/postgres/checkpoint.c
===================================================================
--- gnucash/trunk/src/backend/postgres/checkpoint.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/checkpoint.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -44,13 +44,9 @@
 
 #include "Account.h"
 #include "AccountP.h"
-#include "qofbackend.h"
-#include "qofbackend-p.h"
+#include "qof.h"
 #include "Group.h"
 #include "gnc-commodity.h"
-#include "gnc-engine-util.h"
-#include "guid.h"
-#include "qofid.h"
 
 #include "builder.h"
 #include "checkpoint.h"

Modified: gnucash/trunk/src/backend/postgres/checkpoint.h
===================================================================
--- gnucash/trunk/src/backend/postgres/checkpoint.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/checkpoint.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -36,7 +36,7 @@
 
 #include "Account.h"
 #include "Group.h"
-#include "guid.h"
+#include "qof.h"
 #include "Transaction.h"
 
 #include "PostgresBackend.h"

Modified: gnucash/trunk/src/backend/postgres/escape.c
===================================================================
--- gnucash/trunk/src/backend/postgres/escape.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/escape.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -35,7 +35,6 @@
 #include <string.h>
 
 #include "gnc-engine.h"
-#include "gnc-engine-util.h"
 #include "escape.h"
 
 static QofLogModule log_module = GNC_MOD_BACKEND; 

Modified: gnucash/trunk/src/backend/postgres/events.h
===================================================================
--- gnucash/trunk/src/backend/postgres/events.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/events.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -34,7 +34,7 @@
 #ifndef POSTGRES_EVENTS_H
 #define POSTGRES_EVENTS_H
 
-#include "qofbackend.h"
+#include "qof.h"
 #include "PostgresBackend.h"
 
 gboolean pgendEventsPending (QofBackend *);

Modified: gnucash/trunk/src/backend/postgres/kvp-sql.c
===================================================================
--- gnucash/trunk/src/backend/postgres/kvp-sql.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/kvp-sql.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -39,7 +39,6 @@
 
 #include "escape.h"
 #include "gnc-engine.h"
-#include "gnc-engine-util.h"
 #include "kvp-sql.h"
 #include "PostgresBackend.h"
 #include "putil.h"

Modified: gnucash/trunk/src/backend/postgres/kvp-sql.h
===================================================================
--- gnucash/trunk/src/backend/postgres/kvp-sql.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/kvp-sql.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -34,8 +34,7 @@
 #ifndef KVP_SQL_H
 #define KVP_SQL_H
 
-#include "kvp_frame.h"
-#include "guid.h"
+#include "qof.h"
 #include "PostgresBackend.h"
 
 /*

Modified: gnucash/trunk/src/backend/postgres/putil.c
===================================================================
--- gnucash/trunk/src/backend/postgres/putil.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/putil.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -37,9 +37,7 @@
 #include <stdlib.h>  
 #include <string.h>
 
-#include "qofbackend.h"
-#include "qofbackend-p.h"
-#include "gnc-engine-util.h" 
+#include "qof.h"
 #include "PostgresBackend.h"
 
 static QofLogModule log_module = GNC_MOD_BACKEND;

Modified: gnucash/trunk/src/backend/postgres/putil.h
===================================================================
--- gnucash/trunk/src/backend/postgres/putil.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/putil.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -40,11 +40,7 @@
 
 #include <libpq-fe.h>  
 
-#include "qofbackend.h"
-#include "qofbackend-p.h"
-#include "gnc-engine-util.h"
-#include "guid.h"
-#include "qofid.h"
+#include "qof.h"
 
 #include "PostgresBackend.h"
 

Modified: gnucash/trunk/src/backend/postgres/txn.c
===================================================================
--- gnucash/trunk/src/backend/postgres/txn.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/txn.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -38,10 +38,7 @@
 #include "GroupP.h"
 #include "gnc-commodity.h"
 #include "gnc-engine.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
 #include "gnc-pricedb.h"
-#include "guid.h"
 #include "Transaction.h"
 #include "TransactionP.h"
  

Modified: gnucash/trunk/src/backend/postgres/txn.h
===================================================================
--- gnucash/trunk/src/backend/postgres/txn.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/txn.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -37,7 +37,7 @@
 #include <glib.h>
 
 #include "Group.h"
-#include "guid.h"
+#include "qof.h"
 #include "Transaction.h"
 
 #include "PostgresBackend.h"

Modified: gnucash/trunk/src/backend/postgres/txnmass.h
===================================================================
--- gnucash/trunk/src/backend/postgres/txnmass.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/txnmass.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -23,7 +23,7 @@
 #ifndef POSTGRES_TXN_MASS_H
 #define POSTGRES_TXN_MASS_H
 
-#include "qofbook.h"
+#include "qof.h"
 #include "PostgresBackend.h"
 
 void pgendGetMassTransactions (PGBackend *be, QofBook*);

Modified: gnucash/trunk/src/backend/postgres/upgrade.c
===================================================================
--- gnucash/trunk/src/backend/postgres/upgrade.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/postgres/upgrade.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,7 +31,7 @@
 #include <stdlib.h>  
 
 #include "PostgresBackend.h"
-#include "qofbackend.h"
+#include "qof.h"
 #include "upgrade.h"
 
 #include "putil.h"

Modified: gnucash/trunk/src/backend/rpc/RpcBackend.c
===================================================================
--- gnucash/trunk/src/backend/rpc/RpcBackend.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/rpc/RpcBackend.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -47,10 +47,7 @@
 #include "gnc-book.h"
 #include "gnc-commodity.h"
 #include "gnc-engine.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
 #include "gnc-pricedb.h"
-#include "guid.h"
 #include "TransactionP.h"
 
 #include "gncRpc.h"
@@ -95,7 +92,7 @@
 
 static void rpcendInit (RPCBackend *);
 
-static short module = MOD_BACKEND;
+static QofLogModule log_module = MOD_BACKEND;
 
 /*******************************************************************/
 /* Internal helper functions                                       */

Modified: gnucash/trunk/src/backend/rpc/RpcServer.c
===================================================================
--- gnucash/trunk/src/backend/rpc/RpcServer.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/rpc/RpcServer.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,7 +31,7 @@
 
 #include "config.h"
 
-#include "gnc-engine-util.h"
+#include "qof"
 
 #include "RpcServer.h"
 #include "RpcServerP.h"

Modified: gnucash/trunk/src/backend/rpc/RpcUtils.c
===================================================================
--- gnucash/trunk/src/backend/rpc/RpcUtils.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/rpc/RpcUtils.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,7 +31,7 @@
 #include "AccountP.h"
 #include "GroupP.h"
 #include "TransactionP.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
 struct _txnlistinfo {
   gnc_txnlist **end;

Modified: gnucash/trunk/src/backend/rpc/gncRpc.h
===================================================================
--- gnucash/trunk/src/backend/rpc/gncRpc.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/rpc/gncRpc.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -35,7 +35,7 @@
 	int tv_nsec;
 };
 typedef struct gncTimespec gncTimespec;
-#include "kvp_frame.h"
+#include "qof.h"
 
 struct gncNumeric {
 	int64_t num;

Modified: gnucash/trunk/src/backend/rpc/gncRpc_server.c
===================================================================
--- gnucash/trunk/src/backend/rpc/gncRpc_server.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/backend/rpc/gncRpc_server.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -35,9 +35,9 @@
 #include "RpcUtils.h"
 #include "TransactionP.h"
 #include "AccountP.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
-static short module = MOD_BACKEND;
+static QofLogModule log_module = MOD_BACKEND;
 
 static bool_t gncrpc_get_state (struct svc_req *req, TXPRT **xprt,
 				GncRpcSvc **cl)

Modified: gnucash/trunk/src/business/business-core/file/gnc-bill-term-xml-v2.c
===================================================================
--- gnucash/trunk/src/business/business-core/file/gnc-bill-term-xml-v2.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-core/file/gnc-bill-term-xml-v2.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -44,7 +44,7 @@
 #include "gncBillTermP.h"
 #include "gncInvoice.h"
 #include "gnc-bill-term-xml-v2.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
 #include "xml-helpers.h"
 

Modified: gnucash/trunk/src/business/business-core/file/gnc-owner-xml-v2.h
===================================================================
--- gnucash/trunk/src/business/business-core/file/gnc-owner-xml-v2.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-core/file/gnc-owner-xml-v2.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -24,7 +24,7 @@
 #define GNC_OWNER_XML_V2_H
 
 #include "gncOwner.h"
-#include "qofbook.h"
+#include "qof.h"
 
 gboolean   gnc_dom_tree_to_owner (xmlNodePtr node, GncOwner *owner,
 				  QofBook *book);

Modified: gnucash/trunk/src/business/business-gnome/business-gnome-utils.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-gnome-utils.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/business-gnome-utils.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -30,7 +30,7 @@
 #include "Group.h"
 #include "Account.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-component-manager.h"
 
 #include "gncCustomer.h"

Modified: gnucash/trunk/src/business/business-gnome/business-options-gnome.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-options-gnome.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/business-options-gnome.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -30,7 +30,7 @@
 #include <libguile.h>
 
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "option-util.h"
 #include "gnc-general-search.h"
 

Modified: gnucash/trunk/src/business/business-gnome/business-urls.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/business-urls.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/business-urls.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -29,7 +29,7 @@
 
 #include "gnc-html.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
 #include "gncCustomer.h"
 #include "gncJob.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-billterms.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-billterms.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-billterms.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -32,8 +32,7 @@
 #include "gnc-gui-query.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
-#include "gnc-numeric.h"
+#include "qof.h"
 
 #include "gncBillTerm.h"
 #include "dialog-billterms.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-customer.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-customer.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-customer.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -33,7 +33,7 @@
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
 #include "dialog-search.h"
 #include "search-param.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-date-close.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-date-close.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-date-close.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -27,7 +27,7 @@
 #include <glib/gi18n.h>
 
 #include "dialog-utils.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-date-close.h
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-date-close.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-date-close.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -26,7 +26,7 @@
 
 #include "Account.h"
 #include "gnc-book.h"
-#include "gnc-date.h"
+#include "qof.h"
 #include "gncBillTerm.h"
 
 gboolean

Modified: gnucash/trunk/src/business/business-gnome/dialog-employee.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-employee.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-employee.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -33,7 +33,7 @@
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "dialog-search.h"
 #include "search-param.h"
 #include "gnc-account-sel.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-invoice.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-invoice.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -38,7 +38,7 @@
 #include "gnc-gconf-utils.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-date-edit.h"
 #include "gnc-amount-edit.h"
 #include "gnucash-sheet.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-invoice.h
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-invoice.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-invoice.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -27,8 +27,7 @@
 
 typedef struct _invoice_window InvoiceWindow;
 
-#include "qofbook.h"
-#include "qofsession.h"
+#include "qof.h"
 #include "gncInvoice.h"
 #include "gncOwner.h"
 #include "dialog-search.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-job.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-job.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-job.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -30,7 +30,7 @@
 #include "gnc-component-manager.h"
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "dialog-search.h"
 #include "search-param.h"
 

Modified: gnucash/trunk/src/business/business-gnome/dialog-order.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-order.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-order.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,7 +31,7 @@
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnucash-sheet.h"
 #include "dialog-search.h"
 #include "search-param.h"

Modified: gnucash/trunk/src/business/business-gnome/dialog-payment.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-payment.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-payment.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,13 +31,12 @@
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-date-edit.h"
 #include "gnc-amount-edit.h"
 #include "gnc-tree-view-account.h"
 #include "Transaction.h"
 #include "Account.h"
-#include "gnc-numeric.h"
 
 #include "gncInvoice.h"
 

Modified: gnucash/trunk/src/business/business-gnome/dialog-vendor.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-vendor.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-gnome/dialog-vendor.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -32,7 +32,7 @@
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "dialog-search.h"
 #include "search-param.h"
 

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerModel.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -30,7 +30,7 @@
 
 #include "Account.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"	/* for safe_strcmp */
+#include "qof.h"	/* for safe_strcmp */
 
 #include "datecell.h"
 #include "checkboxcell.h"

Modified: gnucash/trunk/src/business/business-ledger/gncEntryLedgerP.h
===================================================================
--- gnucash/trunk/src/business/business-ledger/gncEntryLedgerP.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/business-ledger/gncEntryLedgerP.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -24,7 +24,7 @@
 #ifndef GNC_ENTRY_LEDGERP_H
 #define GNC_ENTRY_LEDGERP_H
 
-#include "guid.h"
+#include "qof.h"
 #include "gnc-book.h"
 #include "table-allgui.h"
 #include "gncEntryLedger.h"

Modified: gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/business/dialog-tax-table/dialog-tax-table.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,10 +31,9 @@
 #include "gnc-ui.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-amount-edit.h"
 #include "gnc-tree-view-account.h"
-#include "gnc-numeric.h"
 
 #include "gncTaxTable.h"
 #include "dialog-tax-table.h"

Modified: gnucash/trunk/src/engine/GNCId.h
===================================================================
--- gnucash/trunk/src/engine/GNCId.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/GNCId.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1,5 +1,5 @@
 
-#include "qofid.h"
+#include "qof.h"
 
 /* Equivalent function prototype:
  * void xaccGUIDNew (GUID *guid, QofBook *book)

Modified: gnucash/trunk/src/engine/Period.h
===================================================================
--- gnucash/trunk/src/engine/Period.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/Period.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -34,8 +34,6 @@
 #define XACC_PERIOD_H
 
 #include "gnc-engine.h"
-#include "qofquery.h"
-#include "qofbook.h"
 
 
 /** The gnc_book_close_period() routine will 'close' a book at

Modified: gnucash/trunk/src/engine/QueryCore.h
===================================================================
--- gnucash/trunk/src/engine/QueryCore.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/QueryCore.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1,5 +1,5 @@
 
-#include "qofquerycore.h"
+#include "qof.h"
 
 		#define QueryPredData_t QofQueryPredData*
 

Modified: gnucash/trunk/src/engine/QueryNew.h
===================================================================
--- gnucash/trunk/src/engine/QueryNew.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/QueryNew.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1,4 +1,4 @@
-#include "qofquery.h"
+#include "qof.h"
 
 
 		#define QUERY_AND QOF_QUERY_AND

Modified: gnucash/trunk/src/engine/QueryObject.h
===================================================================
--- gnucash/trunk/src/engine/QueryObject.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/QueryObject.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1,5 +1,5 @@
 
-#include "qofclass.h"
+#include "qof.h"
 
 		#define query_object_def _QofParam
 		#define QueryObjectDef QofParam

Modified: gnucash/trunk/src/engine/SX-book-p.h
===================================================================
--- gnucash/trunk/src/engine/SX-book-p.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/SX-book-p.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -34,8 +34,7 @@
 #ifndef GNC_SX_BOOK_P_H
 #define GNC_SX_BOOK_P_H
 
-#include "qofbook.h"
-#include "qofid.h"
+#include "qof.h"
 
 /* ====================================================================== */
 

Modified: gnucash/trunk/src/engine/TransLog.c
===================================================================
--- gnucash/trunk/src/engine/TransLog.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/TransLog.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -34,7 +34,7 @@
 #include "Transaction.h"
 #include "TransactionP.h"
 #include "TransLog.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
 /* 
  * Some design philosphy that I think would be good to keep in mind:

Modified: gnucash/trunk/src/engine/Transaction.c
===================================================================
--- gnucash/trunk/src/engine/Transaction.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/Transaction.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1249,7 +1249,7 @@
 
   if (NULL == s->acc) 
   {
-    PERR ("split must have a parent\n");
+    PERR ("split must have a parent account");
     return;
   }
 

Modified: gnucash/trunk/src/engine/Transaction.h
===================================================================
--- gnucash/trunk/src/engine/Transaction.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/Transaction.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -89,12 +89,7 @@
 #include <time.h>
 
 #include "gnc-commodity.h"
-#include "gnc-date.h"
 #include "gnc-engine.h"
-#include "guid.h"
-#include "kvp_frame.h"
-#include "qofbook.h"
-#include "qofinstance.h"
 
 /** @name Split Reconciled field values
 

Modified: gnucash/trunk/src/engine/TransactionP.h
===================================================================
--- gnucash/trunk/src/engine/TransactionP.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/TransactionP.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -51,14 +51,7 @@
 #include <glib.h>
 
 #include "gnc-engine.h"   /* for typedefs */
-#include "gnc-numeric.h"
-#include "kvp_frame.h"
-#include "qofbackend.h"
-#include "qofbook.h"
-#include "qofid.h"
-#include "qofid-p.h"
-#include "qofinstance.h"
-#include "qofinstance-p.h"
+#include "qof.h"
 
 
 /** STRUCTS *********************************************************/

Modified: gnucash/trunk/src/engine/cap-gains.h
===================================================================
--- gnucash/trunk/src/engine/cap-gains.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/cap-gains.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -81,7 +81,6 @@
 #define XACC_CAP_GAINS_H
 
 #include "gnc-engine.h"
-#include "gnc-numeric.h"
 
 /** The xaccSplitGetCapGains() method returns the value of 
  *    capital gains (if any) associated with the indicated 

Modified: gnucash/trunk/src/engine/engine-helpers.h
===================================================================
--- gnucash/trunk/src/engine/engine-helpers.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/engine-helpers.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -32,9 +32,6 @@
 #include "Account.h"
 #include "Query.h"
 #include "Transaction.h"
-#include "guid.h"
-#include "qofbook.h"
-#include "qofsession.h"
 
 Timespec gnc_transaction_get_date_posted(Transaction *t);
 Timespec gnc_transaction_get_date_entered(Transaction *t);

Modified: gnucash/trunk/src/engine/gnc-book.h
===================================================================
--- gnucash/trunk/src/engine/gnc-book.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/gnc-book.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1,4 +1,4 @@
-#include "qofbook.h"
+#include "qof.h"
 
 #define GNCBook  QofBook
 

Modified: gnucash/trunk/src/engine/gnc-budget.h
===================================================================
--- gnucash/trunk/src/engine/gnc-budget.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/gnc-budget.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -63,8 +63,7 @@
 /** The budget data.*/
 typedef struct gnc_budget_private GncBudget;
 
-#include "guid.h"
-#include "qofbook.h"
+#include "qof.h"
 #include "Account.h"
 #include "Recurrence.h"
 

Modified: gnucash/trunk/src/engine/gnc-commodity.h
===================================================================
--- gnucash/trunk/src/engine/gnc-commodity.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/gnc-commodity.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -48,7 +48,6 @@
 
 #include <glib.h>
 #include "gnc-engine.h"
-#include "qofbook.h"
 
 #define GNC_COMMODITY_TABLE "gnc_commodity_table"
 

Modified: gnucash/trunk/src/engine/gnc-session-scm.h
===================================================================
--- gnucash/trunk/src/engine/gnc-session-scm.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/gnc-session-scm.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -41,7 +41,6 @@
 
 #include <libguile.h>
 #include "gnc-engine.h"
-#include "qofsession.h"
 
 void gnc_session_scm_load (QofSession *session);
 gboolean gnc_session_scm_export (QofSession *tmp_session,

Modified: gnucash/trunk/src/engine/gnc-session.h
===================================================================
--- gnucash/trunk/src/engine/gnc-session.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/gnc-session.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1,5 +1,5 @@
 
-#include "qofsession.h"
+#include "qof.h"
 
 #define gnc_get_current_session qof_session_get_current_session
 #define gnc_session_get_url qof_session_get_url

Modified: gnucash/trunk/src/engine/gncObject.h
===================================================================
--- gnucash/trunk/src/engine/gncObject.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/gncObject.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1,4 +1,4 @@
-#include "qofobject.h"
+#include "qof.h"
 
 
 		#define GncObject_t QofObject

Modified: gnucash/trunk/src/engine/gw-engine-spec.scm
===================================================================
--- gnucash/trunk/src/engine/gw-engine-spec.scm	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/gw-engine-spec.scm	2005-11-21 19:31:44 UTC (rev 12007)
@@ -23,22 +23,15 @@
    (list
     "#include <config.h>\n"
     "#include <glib.h>\n"
-    "#include <guid.h>\n"
+    "#include <qof.h>\n"
     "#include <Group.h>\n"
     "#include <Query.h>\n"
     "#include <gnc-budget.h>\n"
     "#include <gnc-commodity.h>\n"
-    "#include <gnc-date.h>\n"
     "#include <gnc-engine.h>\n"
-    "#include <gnc-event.h>\n"
-    "#include <gnc-numeric.h>\n"
     "#include <gnc-pricedb.h>\n"
     "#include <gnc-lot.h>\n"
-    "#include <gnc-trace.h>\n"
     "#include <gnc-session-scm.h>\n"
-    "#include <qofbackend.h>\n"
-    "#include <qofbook.h>\n"
-    "#include <qofsession.h>\n"
     "#include <gnc-hooks-scm.h>\n"
     "#include <engine-helpers.h>\n")))
 

Modified: gnucash/trunk/src/engine/gw-kvp-spec.scm
===================================================================
--- gnucash/trunk/src/engine/gw-kvp-spec.scm	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/gw-kvp-spec.scm	2005-11-21 19:31:44 UTC (rev 12007)
@@ -26,10 +26,9 @@
    ws
    (lambda (wrapset client-wrapset)
      (list
-      "#include <kvp_frame.h>\n"
+      "#include <qof.h>\n"
       "#include <kvp-scm.h>\n"
-      "#include <Transaction.h>\n"
-      "#include <qofbook.h>\n")))
+      "#include <Transaction.h>\n")))
 
   (gw:wrap-as-wct ws '<gnc:kvp-frame*> "KvpFrame*" "const KvpFrame*")
 

Modified: gnucash/trunk/src/engine/kvp-scm.h
===================================================================
--- gnucash/trunk/src/engine/kvp-scm.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/kvp-scm.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -1,7 +1,7 @@
 #ifndef KVP_SCM_H
 #define KVP_SCM_H
 
-#include <kvp_frame.h>
+#include <qof.h>
 #include <libguile.h>
 
 int gnc_kvp_value_ptr_p(SCM arg);

Modified: gnucash/trunk/src/engine/test/test-freq-spec.c
===================================================================
--- gnucash/trunk/src/engine/test/test-freq-spec.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/test/test-freq-spec.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -27,7 +27,6 @@
 #include "test-stuff.h"
 #include "FreqSpec.h"
 #include "gnc-engine.h"
-#include "qofbook.h"
 
 static QofBook *book;
 

Modified: gnucash/trunk/src/engine/test/test-querynew.c
===================================================================
--- gnucash/trunk/src/engine/test/test-querynew.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/test/test-querynew.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -24,8 +24,6 @@
 #include <glib.h>
 #include <stdio.h>
 #include "qof.h"
-#include "guid.h"
-#include "gnc-engine-util.h"
 #include "cashobjects.h"
 #include "test-stuff.h"
 

Modified: gnucash/trunk/src/engine/test/test-recurrence.c
===================================================================
--- gnucash/trunk/src/engine/test/test-recurrence.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/test/test-recurrence.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -28,7 +28,6 @@
 #include "FreqSpec.h"
 #include "Recurrence.h"
 #include "gnc-engine.h"
-#include "qofbook.h"
 
 static QofBook *book;
 static FreqSpec *fs;

Modified: gnucash/trunk/src/engine/test-core/test-engine-stuff.h
===================================================================
--- gnucash/trunk/src/engine/test-core/test-engine-stuff.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/engine/test-core/test-engine-stuff.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -10,11 +10,9 @@
 #include <glib.h>
 #include <stdlib.h>
 
+#include "qof.h"
 #include "Query.h"
-#include "gnc-date.h"
 #include "gnc-pricedb.h"
-#include "qofbook.h"
-#include "qofsession.h"
 
 Timespec* get_random_timespec(void);
 void random_timespec_zero_nsec (gboolean zero_nsec);

Modified: gnucash/trunk/src/gnome/dialog-commodities.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-commodities.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/dialog-commodities.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,7 +31,7 @@
 #include "dialog-utils.h"
 #include "gnc-commodity.h"
 #include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-tree-view-commodity.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/gnome/dialog-price-editor.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-price-editor.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/dialog-price-editor.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -34,7 +34,7 @@
 #include "gnc-component-manager.h"
 #include "gnc-currency-edit.h"
 #include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-pricedb.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/gnome/dialog-sx-from-trans.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-sx-from-trans.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/dialog-sx-from-trans.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -37,7 +37,7 @@
 #include "dialog-sx-from-trans.h"
 #include "dialog-utils.h"
 #include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/gnome/dialog-tax-info.c
===================================================================
--- gnucash/trunk/src/gnome/dialog-tax-info.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/dialog-tax-info.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,7 +31,7 @@
 #include "dialog-utils.h"
 #include "gnc-tree-view-account.h"
 #include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-ui.h"
 
 

Modified: gnucash/trunk/src/gnome/druid-acct-period.c
===================================================================
--- gnucash/trunk/src/gnome/druid-acct-period.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/druid-acct-period.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -38,15 +38,13 @@
 #include "druid-acct-period.h"
 #include "druid-utils.h"
 #include "gnc-component-manager.h"
-#include "gnc-date.h"
+#include "qof.h"
 #include "gnc-file.h"
 #include "gnc-frequency.h"
 #include "gnc-gdate-utils.h"
 #include "gnc-gui-query.h"
-#include "gnc-trace.h"
 #include "gnc-ui-util.h"
 #include "misc-gnome-utils.h"
-#include "qof.h"
 
 
 #define DRUID_ACCT_PERIOD_CM_CLASS "druid-acct-period"

Modified: gnucash/trunk/src/gnome/druid-merge.h
===================================================================
--- gnucash/trunk/src/gnome/druid-merge.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/druid-merge.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -23,7 +23,7 @@
 
 #ifndef DRUID_MERGE_H
 #define DRUID_MERGE_H
-#include "qofsession.h"
+#include "qof.h"
 
 /** @addtogroup GUI
 	@{ */

Modified: gnucash/trunk/src/gnome/druid-stock-split.c
===================================================================
--- gnucash/trunk/src/gnome/druid-stock-split.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/druid-stock-split.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -36,7 +36,7 @@
 #include "gnc-component-manager.h"
 #include "gnc-currency-edit.h"
 #include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-exp-parser.h"
 #include "gnc-gui-query.h"
 #include "gnc-tree-view-account.h"

Modified: gnucash/trunk/src/gnome/gnc-plugin-budget.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-budget.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/gnc-plugin-budget.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,7 +31,7 @@
 #include "gnc-plugin-page-budget.h"
 #include "gnc-tree-model-budget.h"
 
-#include "gnc-trace.h"
+#include "qof.h"
 #include "gnc-ui-util.h"
 #include "gnc-ui.h"
 #include "gnc-component-manager.h"

Modified: gnucash/trunk/src/gnome/gnc-plugin-page-budget.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-budget.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-budget.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -62,9 +62,7 @@
 #include "gnc-main-window.h"
 #include "gnc-component-manager.h"
 
-#include "gnc-engine-util.h"
-#include "gnc-date.h"
-#include "gnc-trace.h"
+#include "qof.h"
 
 #include "gnc-dialog.h"
 #include "gnc-recurrence.h"

Modified: gnucash/trunk/src/gnome/gw-gnc-spec.scm
===================================================================
--- gnucash/trunk/src/gnome/gw-gnc-spec.scm	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/gw-gnc-spec.scm	2005-11-21 19:31:44 UTC (rev 12007)
@@ -30,11 +30,9 @@
       "#include <gnc-ui.h>\n"
       "#include <gnc-ui-util.h>\n"
       "#include <gnc-menu-extensions.h>\n"
-      "#include <gnc-date.h>\n"
       "#include <guile-util.h>\n"
       "#include <gnc-engine.h>\n"
       "#include <gnc-commodity.h>\n"
-      "#include <gnc-numeric.h>\n"
       "#include <dialog-totd.h>\n"
       "#include <gnc-gui-query.h>\n"
       "#include <dialog-new-user.h>\n"

Modified: gnucash/trunk/src/gnome/reconcile-list.h
===================================================================
--- gnucash/trunk/src/gnome/reconcile-list.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/reconcile-list.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -25,7 +25,7 @@
 #define GNC_RECONCILE_LIST_H
 
 #include "gnc-query-list.h"
-#include "gnc-numeric.h"
+#include "qof.h"
 
 G_BEGIN_DECLS
 

Modified: gnucash/trunk/src/gnome/window-main-summarybar.c
===================================================================
--- gnucash/trunk/src/gnome/window-main-summarybar.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome/window-main-summarybar.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -35,7 +35,7 @@
 #include "gnc-euro.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-ui-util.h"
-#include "qofbook.h"
+#include "qof.h"
 #include "window-main-summarybar.h"
 
 typedef struct {

Modified: gnucash/trunk/src/gnome-search/search-date.h
===================================================================
--- gnucash/trunk/src/gnome-search/search-date.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-search/search-date.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -23,7 +23,7 @@
 
 #include "search-core-type.h"
 #include "QueryNew.h"
-#include "gnc-date.h"
+#include "qof.h"
 
 #define GNC_TYPE_SEARCH_DATE		(gnc_search_date_get_type ())
 #define GNCSEARCH_DATE(obj)		GTK_CHECK_CAST (obj, GNC_TYPE_SEARCH_DATE, GNCSearchDate)

Modified: gnucash/trunk/src/gnome-search/search-numeric.h
===================================================================
--- gnucash/trunk/src/gnome-search/search-numeric.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-search/search-numeric.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -22,7 +22,7 @@
 #define _GNCSEARCH_NUMERIC_H
 
 #include "search-core-type.h"
-#include "gnc-numeric.h"
+#include "qof.h"
 #include "QueryNew.h"
 
 #define GNC_TYPE_SEARCH_NUMERIC		(gnc_search_numeric_get_type ())

Modified: gnucash/trunk/src/gnome-utils/dialog-exchange.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-exchange.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/dialog-exchange.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -26,8 +26,7 @@
 
 #include "gnc-pricedb.h"
 #include "gnc-commodity.h"
-#include "gnc-numeric.h"
-#include "gnc-date.h"
+#include "qof.h"
 
 /* Create a dialog to enter/modify an Split's exchange rate.  Look in
  * the pricedb for potential entries if exchange_rate points to a

Modified: gnucash/trunk/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-options.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/dialog-options.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -44,7 +44,6 @@
 #include "gnc-general-select.h"
 #include "gnc-currency-edit.h"
 #include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
 #include "gnc-engine.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-gui-query.h"

Modified: gnucash/trunk/src/gnome-utils/druid-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/druid-utils.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/druid-utils.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -28,7 +28,7 @@
 
 #include "dialog-utils.h"
 #include "druid-utils.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-gnome-utils.h"
 
 void

Modified: gnucash/trunk/src/gnome-utils/gnc-account-sel.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-account-sel.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-account-sel.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -32,8 +32,7 @@
 #include "gnc-account-sel.h"
 #include "gnc-exp-parser.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
-#include "gnc-event.h"
+#include "qof.h"
 
 #define ACCT_DATA_TAG "gnc-account-sel_acct"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-amount-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-amount-edit.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-amount-edit.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -40,7 +40,7 @@
 #include "gnc-amount-edit.h"
 #include "gnc-exp-parser.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 
 
 /* Signal codes */

Modified: gnucash/trunk/src/gnome-utils/gnc-amount-edit.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-amount-edit.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-amount-edit.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -29,7 +29,7 @@
 #ifndef GNC_AMOUNT_EDIT_H
 #define GNC_AMOUNT_EDIT_H 
 
-#include "gnc-numeric.h"
+#include "qof.h"
 #include "gnc-ui-util.h"
 
 #define GNC_TYPE_AMOUNT_EDIT          (gnc_amount_edit_get_type())

Modified: gnucash/trunk/src/gnome-utils/gnc-date-format.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-format.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-date-format.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -29,7 +29,7 @@
 #ifndef GNC_DATE_FORMAT_H
 #define GNC_DATE_FORMAT_H 
 
-#include "gnc-date.h"
+#include "qof.h"
 
 #define GNC_TYPE_DATE_FORMAT         (gnc_date_format_get_type ())
 #define GNC_DATE_FORMAT(obj)          GTK_CHECK_CAST (obj, gnc_date_format_get_type(), GNCDateFormat)

Modified: gnucash/trunk/src/gnome-utils/gnc-dialog.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dialog.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-dialog.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -21,12 +21,11 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include "gnc-trace.h"
+#include "gnc-engine.h"
 #include "gnome.h"         // for gnome_date_edit
 #include "gnc-dialog.h"
 #include "gnc-gobject-utils.h"
 #include "dialog-utils.h"  // for gnc_glade_xml_new
-#include "gnc-engine.h"
 
 static QofLogModule log_module = GNC_MOD_GUI;
 

Modified: gnucash/trunk/src/gnome-utils/gnc-file.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-file.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-file.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -114,7 +114,7 @@
 #define GNC_FILE_H
 
 #include <glib.h>
-#include "qofbackend.h"
+#include "qof.h"
 
 typedef enum
 {

Modified: gnucash/trunk/src/gnome-utils/gnc-gui-query.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gui-query.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-gui-query.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -27,7 +27,7 @@
  
 #include "dialog-utils.h"
 #include "gnc-gconf-utils.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui.h"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-html-graph-gog.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-html-graph-gog.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-html-graph-gog.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -30,8 +30,8 @@
 
 #include "gnc-html-graph-gog.h"
 #include "gnc-html.h"
-#include "gnc-trace.h"
 #include "gnc-engine.h"
+
 #ifdef HAVE_GOFFICE
 #include <goffice/goffice.h>
 #include <goffice/graph/gog-graph.h>

Modified: gnucash/trunk/src/gnome-utils/gnc-html-guppi.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-html-guppi.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-html-guppi.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -33,7 +33,7 @@
 #include <libguppi/guppi-version.h>
 #include <libguppitank/guppi-tank.h>
 
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-html.h"
 #include "gnc-html-guppi.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-menu-additions.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -44,7 +44,6 @@
 #include "gnc-main-window.h"
 #include "gnc-plugin-menu-additions.h"
 #include "gnc-window.h"
-#include "gnc-trace.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-ui.h"
 #include "gnc-menu-extensions.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-page.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-page.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-page.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -36,7 +36,6 @@
 
 #include <gtk/gtk.h>
 #include "gnc-engine.h"
-#include "gnc-trace.h"
 #include "gnc-plugin.h"
 #include "gnc-plugin-page.h"
 #include "gnc-gobject-utils.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-plugin-page.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin-page.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin-page.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -37,8 +37,7 @@
 #define __GNC_PLUGIN_PAGE_H
 
 #include <glib.h>
-#include "guid.h"
-#include "qofbook.h"
+#include "qof.h"
 
 G_BEGIN_DECLS
 

Modified: gnucash/trunk/src/gnome-utils/gnc-plugin.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-plugin.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-plugin.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -38,7 +38,6 @@
 #include <glib/gi18n.h>
 
 #include "gnc-plugin.h"
-#include "gnc-trace.h"
 #include "gnc-engine.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-gnome-utils.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-query-list.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-query-list.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-query-list.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -26,7 +26,7 @@
 
 #include "dialog-utils.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-component-manager.h"
 #include "gnc-query-list.h"
 #include "search-param.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-recurrence.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-recurrence.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-recurrence.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -31,7 +31,6 @@
 #include "gnc-recurrence.h"
 #include "Recurrence.h"
 #include "gnc-engine.h"
-#include "gnc-trace.h"
 #include "gnc-gdate-utils.h"
 
 static QofLogModule log_module = GNC_MOD_GUI;

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-account-types.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-account-types.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-account-types.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 
-#include "gnc-trace.h"
+#include "qof.h"
 #include "gnc-tree-model-account-types.h"
 #include "Account.h"
 

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-commodity.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -38,7 +38,6 @@
 #include "gnc-component-manager.h"
 #include "gnc-engine.h"
 #include "gnc-gobject-utils.h"
-#include "gnc-trace.h"
 #include "gnc-ui-util.h"
 
 #define ITER_IS_NAMESPACE GINT_TO_POINTER(1)

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-example-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-example-account.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-example-account.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "qofbook.h"
+#include "qof.h"
 #include "gnc-tree-model-example-account.h"
 #include "io-example-account.h"
 #include "Group.h"

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-price.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-price.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-price.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -40,7 +40,6 @@
 #include "gnc-gobject-utils.h"
 #include "gnc-pricedb.h"
 #include "gnc-tree-model-price.h"
-#include "gnc-trace.h"
 #include "gnc-ui-util.h"
 
 #define ITER_IS_NAMESPACE GINT_TO_POINTER(1)

Modified: gnucash/trunk/src/gnome-utils/gnc-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-window.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gnc-window.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -26,10 +26,9 @@
 
 #include <gtk/gtk.h>
 
-#include "gnc-trace.h"
+#include "gnc-engine.h"
 #include "gnc-plugin-page.h"
 #include "gnc-window.h"
-#include "gnc-engine.h"
 
 static QofLogModule log_module = GNC_MOD_GUI;
 

Modified: gnucash/trunk/src/gnome-utils/gncmod-gnome-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gncmod-gnome-utils.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/gncmod-gnome-utils.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -16,7 +16,7 @@
 
 #include "dialog-options.h"
 #include "gnc-html.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-err-popup.h"
 #include "gnc-gui-query.h"
 

Modified: gnucash/trunk/src/gnome-utils/test/test-gnc-dialog.c
===================================================================
--- gnucash/trunk/src/gnome-utils/test/test-gnc-dialog.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/gnome-utils/test/test-gnc-dialog.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include "gnc-recurrence.h"
 #include "Recurrence.h"
-#include "qofbook.h"
+#include "qof.h"
 #include "gnc-dialog.h"
 #include "gnc-tree-view-account.h"
 

Modified: gnucash/trunk/src/import-export/binary-import/druid-commodity.h
===================================================================
--- gnucash/trunk/src/import-export/binary-import/druid-commodity.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/binary-import/druid-commodity.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -26,7 +26,6 @@
 
 #include "gnc-commodity.h"
 #include "gnc-engine.h"
-#include "qofsession.h"
 
 typedef struct _commoditydruid CommodityDruid;
 

Modified: gnucash/trunk/src/import-export/hbci/dialog-daterange.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/dialog-daterange.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/hbci/dialog-daterange.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -23,7 +23,7 @@
 #ifndef DIALOG_DATERANGE_H
 #define DIALOG_DATERANGE_H
 
-#include "gnc-date.h"
+#include "qof.h"
 
 gboolean
 gnc_hbci_enter_daterange (GtkWidget *parent,

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-gettrans.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -28,10 +28,8 @@
 #include "gnc-hbci-gettrans.h"
 
 #include "gnc-ui.h"
-#include "gnc-numeric.h"
-#include "gnc-date.h"
+#include "qof.h"
 #include "Transaction.h"
-#include "gnc-engine-util.h" 
 
 #include "import-main-matcher.h"
 

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-kvp.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-kvp.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-kvp.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -24,7 +24,7 @@
 #define GNC_HBCI_KVP_H
 
 #include <glib.h>
-#include "kvp_frame.h"
+#include "qof.h"
 #include "Account.h"
 #include "gnc-book.h"
 

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-trans-templ.h
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-trans-templ.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-trans-templ.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -22,8 +22,7 @@
 
 /** @file gnc-hbci-trans-templ.h Templates for HBCI transactions */
 
-#include "gnc-numeric.h"
-#include "kvp_frame.h"
+#include "qof.h"
 
 /** A template for a HBCI transaction */
 typedef struct _trans_data GNCTransTempl;

Modified: gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/hbci/gnc-hbci-utils.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -35,7 +35,7 @@
 #include "gnc-hbci-kvp.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-ui-util.h"
-#include "gnc-engine-util.h" 
+#include "qof.h" 
 
 #include "hbci-interaction.h"
 #include <aqbanking/version.h>

Modified: gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/hbci/gnc-plugin-hbci.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -26,6 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include "gnc-engine.h"
 #include "druid-hbci-initial.h"
 #include "gnc-plugin-manager.h"
 #include "gnc-gnome-utils.h"
@@ -36,8 +37,6 @@
 #include "gnc-plugin-manager.h"
 #include "gnc-plugin-page-account-tree.h"
 #include "gnc-plugin-page-register.h"
-#include "gnc-trace.h"
-#include "gnc-engine.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = "gnucash-hbci";

Modified: gnucash/trunk/src/import-export/import-main-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-main-matcher.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/import-main-matcher.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -21,7 +21,7 @@
 /** @internal
     @file import-main-matcher.c
     @brief Transaction matcher main window
-    @author Copyright (C) 2002 Benoit Grégoire
+    @author Copyright (C) 2002 Benoit Grégoire
     @author Christian Stimming    
 */
 #include "config.h"
@@ -35,7 +35,6 @@
 #include "gnc-ui.h"
 #include "gnc-ui-util.h"
 #include "gnc-engine.h"
-#include "gnc-trace.h"
 #include "import-settings.h"
 #include "import-match-map.h"
 #include "import-match-picker.h"

Modified: gnucash/trunk/src/import-export/import-match-map.c
===================================================================
--- gnucash/trunk/src/import-export/import-match-map.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/import-match-map.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <glib.h>
 #include "import-match-map.h"
-#include "kvp_frame.h"
 #include "Group.h"
 #include "gnc-ui-util.h"
 #include "gnc-engine.h"

Modified: gnucash/trunk/src/import-export/import-match-picker.c
===================================================================
--- gnucash/trunk/src/import-export/import-match-picker.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/import-match-picker.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -34,7 +34,7 @@
 #include "import-backend.h"
 #include "import-match-picker.h"
 
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-ui-util.h"
 #include <glade/glade.h>
 #include "dialog-utils.h"

Modified: gnucash/trunk/src/import-export/import-parse.h
===================================================================
--- gnucash/trunk/src/import-export/import-parse.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/import-parse.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -27,8 +27,7 @@
 #ifndef IMPORT_PARSE_H
 #define IMPORT_PARSE_H
 
-#include "gnc-numeric.h"
-#include "gnc-date.h"
+#include "qof.h"
 
 typedef enum {
   GNCIF_NONE		= 0,

Modified: gnucash/trunk/src/import-export/import-utilities.c
===================================================================
--- gnucash/trunk/src/import-export/import-utilities.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/import-utilities.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -32,11 +32,10 @@
 
 #include <stdlib.h>
 #include "import-utilities.h"
-#include "kvp_frame.h"
+#include "qof.h"
 #include "Account.h"
 #include "Transaction.h"
 
-#include "gnc-engine-util.h"
 
 /********************************************************************\
  * Setter and getter functions for the online_id kvp frame in

Modified: gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c
===================================================================
--- gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/log-replay/gnc-log-replay.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -39,7 +39,7 @@
 #include "TransactionP.h"
 #include "gnc-log-replay.h"
 #include "gnc-file.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-book.h"
 #include "gnc-ui-util.h"
 #include "gnc-gconf-utils.h"

Modified: gnucash/trunk/src/import-export/qif/qif-import.h
===================================================================
--- gnucash/trunk/src/import-export/qif/qif-import.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/qif/qif-import.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -26,7 +26,7 @@
 #define QIF_IMPORT_H
 
 #include <stdio.h>
-#include "gnc-numeric.h"
+#include "qof.h"
 
 typedef enum {
   QIF_TYPE_BANK = 1,

Modified: gnucash/trunk/src/import-export/qif/qif-objects-p.h
===================================================================
--- gnucash/trunk/src/import-export/qif/qif-objects-p.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/qif/qif-objects-p.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -25,11 +25,10 @@
 #ifndef QIF_OBJECTS_P_H
 #define QIF_OBJECTS_P_H
 
-#include "gnc-date.h"
+#include "qof.h"
 
 #include "qif-import.h"
 #include "qif-objects.h"
-#include "gnc-numeric.h"
 
 struct _QifAccount {
   struct _QifObject obj;

Modified: gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -40,7 +40,7 @@
 #include "druid-qif-import.h"
 #include "druid-utils.h"
 #include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-file.h"
 #include "gnc-gui-query.h"
 #include "gnc-ui-util.h"

Modified: gnucash/trunk/src/network-utils/gnc-http.c
===================================================================
--- gnucash/trunk/src/network-utils/gnc-http.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/network-utils/gnc-http.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -23,7 +23,7 @@
 /********************************************************************
  * 3/11/03 TomF Gnome2 changes for Gnome2                           * 
  * gnc_http.c Disable all functions to bypass missing ghttp	    *
- *   include "gnc-engine-util.h" to allow PERR warnings		    *
+ *   include "qof.h" to allow PERR warnings		    *
  *   Use long if 0 to make it easy to go back to the original to    *
  *   start developing a ghttp replacement.                          *
 *********************************************************************/

Modified: gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/register/ledger-core/dialog-dup-trans.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -30,7 +30,7 @@
 
 #include "dialog-utils.h"
 #include "gnc-date-edit.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-ui.h"
 
 

Modified: gnucash/trunk/src/register/ledger-core/split-register-load.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-load.c	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/register/ledger-core/split-register-load.c	2005-11-21 19:31:44 UTC (rev 12007)
@@ -28,7 +28,7 @@
 #include "account-quickfill.h"
 #include "combocell.h"
 #include "gnc-component-manager.h"
-#include "gnc-engine-util.h"
+#include "qof.h"
 #include "gnc-ui-util.h"
 #include "numcell.h"
 #include "quickfillcell.h"

Modified: gnucash/trunk/src/register/register-core/datecell.h
===================================================================
--- gnucash/trunk/src/register/register-core/datecell.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/register/register-core/datecell.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -97,7 +97,7 @@
 #include <time.h>
 
 #include "basiccell.h"
-#include "gnc-date.h"
+#include "qof.h"
 
 
 typedef struct date_cell

Modified: gnucash/trunk/src/register/register-core/formulacell.h
===================================================================
--- gnucash/trunk/src/register/register-core/formulacell.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/register/register-core/formulacell.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -40,7 +40,7 @@
 #include "gnc-ui-util.h"
 
 #include "basiccell.h"
-#include "gnc-date.h"
+#include "qof.h"
 
 typedef struct _FormulaCell
 {

Modified: gnucash/trunk/src/register/register-core/pricecell.h
===================================================================
--- gnucash/trunk/src/register/register-core/pricecell.h	2005-11-21 06:51:57 UTC (rev 12006)
+++ gnucash/trunk/src/register/register-core/pricecell.h	2005-11-21 19:31:44 UTC (rev 12007)
@@ -45,7 +45,7 @@
 #define PRICE_CELL_H
 
 #include "basiccell.h"
-#include "gnc-numeric.h"
+#include "qof.h"
 #include "gnc-ui-util.h"
 
 typedef struct



More information about the gnucash-changes mailing list