Added forward declaration for struct GncGUID

I also removed the guid.hpp include where I could.
2025-02-25 18:55:30 -06:00 · 2016-06-12 15:47:49 -04:00 · 2016-06-12 15:47:49 -04:00 · e1e85cee16
commit e1e85cee16
parent 3877c03ee7
101 changed files with 3 additions and 101 deletions
--- a/src/app-utils/test/test-option-util.cpp
+++ b/src/app-utils/test/test-option-util.cpp
@ -21,7 +21,6 @@
 * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 ********************************************************************/
-#include <guid.hpp>
 #include <kvp_frame.hpp>
 #include <gmp.h> 
 extern "C"
--- a/src/app-utils/test/test-print-parse-amount.cpp
+++ b/src/app-utils/test/test-print-parse-amount.cpp
@ -18,7 +18,6 @@
 *                                                                  *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/app-utils/test/test-scm-query-string.cpp
+++ b/src/app-utils/test/test-scm-query-string.cpp
@ -18,7 +18,6 @@
 *                                                                  *
 \********************************************************************/

-#include <guid.hpp>
 #include <libguile.h>

 extern "C"
--- a/src/app-utils/test/test-sx.cpp
+++ b/src/app-utils/test/test-sx.cpp
@ -18,7 +18,6 @@
 *                                                                  *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/dbi/gnc-backend-dbi.cpp
+++ b/src/backend/dbi/gnc-backend-dbi.cpp
@ -25,7 +25,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL db using libdbi
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/dbi/test/test-backend-dbi-basic.cpp
+++ b/src/backend/dbi/test/test-backend-dbi-basic.cpp
@ -24,7 +24,6 @@
 *                                                                  *
 \********************************************************************/

-#include <guid.hpp>
 #include <kvp_frame.hpp>

 extern "C"
--- a/src/backend/dbi/test/test-backend-dbi.cpp
+++ b/src/backend/dbi/test/test-backend-dbi.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/dbi/test/test-dbi-business-stuff.cpp
+++ b/src/backend/dbi/test/test-dbi-business-stuff.cpp
@ -22,7 +22,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/dbi/test/test-dbi-stuff.cpp
+++ b/src/backend/dbi/test/test-dbi-stuff.cpp
@ -22,7 +22,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include <config.h>
--- a/src/backend/sql/escape.cpp
+++ b/src/backend/sql/escape.cpp
@ -27,7 +27,6 @@
 * FUNCTION:
 * Escapes the ' and \ characters in a string
 */
-#include <guid.hpp>

 #include "config.h"
 #include <glib.h>
--- a/src/backend/sql/gnc-address-sql.cpp
+++ b/src/backend/sql/gnc-address-sql.cpp
@ -27,7 +27,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL database
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/gnc-book-sql.cpp
+++ b/src/backend/sql/gnc-book-sql.cpp
@ -25,7 +25,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL db
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/gnc-customer-sql.cpp
+++ b/src/backend/sql/gnc-customer-sql.cpp
@ -27,7 +27,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL database
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/gnc-employee-sql.cpp
+++ b/src/backend/sql/gnc-employee-sql.cpp
@ -27,7 +27,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL database
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/gnc-entry-sql.cpp
+++ b/src/backend/sql/gnc-entry-sql.cpp
@ -27,7 +27,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL database
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/gnc-job-sql.cpp
+++ b/src/backend/sql/gnc-job-sql.cpp
@ -27,7 +27,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL database
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/gnc-price-sql.cpp
+++ b/src/backend/sql/gnc-price-sql.cpp
@ -25,7 +25,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL db
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/gnc-recurrence-sql.cpp
+++ b/src/backend/sql/gnc-recurrence-sql.cpp
@ -25,7 +25,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL db
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/gnc-schedxaction-sql.cpp
+++ b/src/backend/sql/gnc-schedxaction-sql.cpp
@ -25,7 +25,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL db
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/gnc-vendor-sql.cpp
+++ b/src/backend/sql/gnc-vendor-sql.cpp
@ -27,7 +27,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an SQL database
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/test/test-column-types.cpp
+++ b/src/backend/sql/test/test-column-types.cpp
@ -23,7 +23,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/test/test-sqlbe.cpp
+++ b/src/backend/sql/test/test-sqlbe.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/sql/test/utest-gnc-backend-sql.cpp
+++ b/src/backend/sql/test/utest-gnc-backend-sql.cpp
@ -20,7 +20,6 @@
 * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 ********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-account-xml-v2.cpp
+++ b/src/backend/xml/gnc-account-xml-v2.cpp
@ -22,7 +22,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-address-xml-v2.cpp
+++ b/src/backend/xml/gnc-address-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-backend-xml.cpp
+++ b/src/backend/xml/gnc-backend-xml.cpp
@ -27,7 +27,6 @@
 * This file implements the top-level QofBackend API for saving/
 * restoring data to/from an ordinary Unix filesystem file.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-bill-term-xml-v2.cpp
+++ b/src/backend/xml/gnc-bill-term-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-book-xml-v2.cpp
+++ b/src/backend/xml/gnc-book-xml-v2.cpp
@ -22,7 +22,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-budget-xml-v2.cpp
+++ b/src/backend/xml/gnc-budget-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org
 */

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-commodity-xml-v2.cpp
+++ b/src/backend/xml/gnc-commodity-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-customer-xml-v2.cpp
+++ b/src/backend/xml/gnc-customer-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-employee-xml-v2.cpp
+++ b/src/backend/xml/gnc-employee-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-entry-xml-v2.cpp
+++ b/src/backend/xml/gnc-entry-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-freqspec-xml-v2.cpp
+++ b/src/backend/xml/gnc-freqspec-xml-v2.cpp
@ -22,7 +22,6 @@
 *                                                                  *
 *******************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-invoice-xml-v2.cpp
+++ b/src/backend/xml/gnc-invoice-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-job-xml-v2.cpp
+++ b/src/backend/xml/gnc-job-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-lot-xml-v2.cpp
+++ b/src/backend/xml/gnc-lot-xml-v2.cpp
@ -22,7 +22,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-order-xml-v2.cpp
+++ b/src/backend/xml/gnc-order-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-owner-xml-v2.cpp
+++ b/src/backend/xml/gnc-owner-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-pricedb-xml-v2.cpp
+++ b/src/backend/xml/gnc-pricedb-xml-v2.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 *******************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-recurrence-xml-v2.cpp
+++ b/src/backend/xml/gnc-recurrence-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org
 */

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-schedxaction-xml-v2.cpp
+++ b/src/backend/xml/gnc-schedxaction-xml-v2.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 *******************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-tax-table-xml-v2.cpp
+++ b/src/backend/xml/gnc-tax-table-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-transaction-xml-v2.cpp
+++ b/src/backend/xml/gnc-transaction-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 *******************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/gnc-vendor-xml-v2.cpp
+++ b/src/backend/xml/gnc-vendor-xml-v2.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/io-example-account.cpp
+++ b/src/backend/xml/io-example-account.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/io-gncxml-gen.cpp
+++ b/src/backend/xml/io-gncxml-gen.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/io-gncxml-v2.cpp
+++ b/src/backend/xml/io-gncxml-v2.cpp
@ -18,7 +18,6 @@
 * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/io-utils.cpp
+++ b/src/backend/xml/io-utils.cpp
@ -21,7 +21,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/sixtp-dom-generators.cpp
+++ b/src/backend/xml/sixtp-dom-generators.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 ********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #define __EXTENSIONS__
--- a/src/backend/xml/sixtp-dom-parsers.cpp
+++ b/src/backend/xml/sixtp-dom-parsers.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 ********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/sixtp-stack.cpp
+++ b/src/backend/xml/sixtp-stack.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 ********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/sixtp-to-dom-parser.cpp
+++ b/src/backend/xml/sixtp-to-dom-parser.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 ********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/sixtp.cpp
+++ b/src/backend/xml/sixtp.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 ********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-date-converting.cpp
+++ b/src/backend/xml/test/test-date-converting.cpp
@ -17,7 +17,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-dom-converters1.cpp
+++ b/src/backend/xml/test/test-dom-converters1.cpp
@ -21,7 +21,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-file-stuff.cpp
+++ b/src/backend/xml/test/test-file-stuff.cpp
@ -20,7 +20,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 #include <kvp_frame.hpp>

 extern "C"
--- a/src/backend/xml/test/test-kvp-frames.cpp
+++ b/src/backend/xml/test/test-kvp-frames.cpp
@ -1,4 +1,3 @@
-#include <guid.hpp>
 #include <kvp_frame.hpp>

 extern "C"
--- a/src/backend/xml/test/test-load-backend.cpp
+++ b/src/backend/xml/test/test-load-backend.cpp
@ -24,7 +24,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-load-example-account.cpp
+++ b/src/backend/xml/test/test-load-example-account.cpp
@ -20,7 +20,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-load-xml2.cpp
+++ b/src/backend/xml/test/test-load-xml2.cpp
@ -25,7 +25,6 @@
 /* @file test-load-xml2.c
 * @brief test the loading of a version-2 gnucash XML file
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-save-in-lang.cpp
+++ b/src/backend/xml/test/test-save-in-lang.cpp
@ -17,7 +17,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-string-converters.cpp
+++ b/src/backend/xml/test/test-string-converters.cpp
@ -17,7 +17,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-xml-account.cpp
+++ b/src/backend/xml/test/test-xml-account.cpp
@ -21,7 +21,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-xml-commodity.cpp
+++ b/src/backend/xml/test/test-xml-commodity.cpp
@ -17,7 +17,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-xml-pricedb.cpp
+++ b/src/backend/xml/test/test-xml-pricedb.cpp
@ -21,7 +21,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-xml-transaction.cpp
+++ b/src/backend/xml/test/test-xml-transaction.cpp
@ -21,7 +21,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/backend/xml/test/test-xml2-is-file.cpp
+++ b/src/backend/xml/test/test-xml2-is-file.cpp
@ -17,7 +17,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/gtest-import-map.cpp
+++ b/src/engine/test/gtest-import-map.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include <config.h>
--- a/src/engine/test/test-account-object.cpp
+++ b/src/engine/test/test-account-object.cpp
@ -24,7 +24,6 @@
 * @brief Minimal test of reading/writing account parameters
 * @author David Hampton <hampton@employees.org>
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-commodities.cpp
+++ b/src/engine/test/test-commodities.cpp
@ -22,7 +22,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-date.cpp
+++ b/src/engine/test/test-date.cpp
@ -21,7 +21,6 @@
 *                                                                  *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-group-vs-book.cpp
+++ b/src/engine/test/test-group-vs-book.cpp
@ -20,7 +20,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-lots.cpp
+++ b/src/engine/test/test-lots.cpp
@ -24,7 +24,6 @@
 * @brief Minimal test to see if automatic lot scrubbing works.
 * @author Linas Vepstas <linas@linas.org>
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-numeric.cpp
+++ b/src/engine/test/test-numeric.cpp
@ -22,7 +22,6 @@
 *  02110-1301, USA.
 */

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-query.cpp
+++ b/src/engine/test/test-query.cpp
@ -20,7 +20,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-scm-query.cpp
+++ b/src/engine/test/test-scm-query.cpp
@ -20,7 +20,6 @@

 #include <libguile.h>

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-split-vs-account.cpp
+++ b/src/engine/test/test-split-vs-account.cpp
@ -21,7 +21,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-transaction-reversal.cpp
+++ b/src/engine/test/test-transaction-reversal.cpp
@ -21,7 +21,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/test-transaction-voiding.cpp
+++ b/src/engine/test/test-transaction-voiding.cpp
@ -21,7 +21,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 *  02110-1301, USA.
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/utest-Account.cpp
+++ b/src/engine/test/utest-Account.cpp
@ -19,7 +19,6 @@
 * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 ********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/utest-Split.cpp
+++ b/src/engine/test/utest-Split.cpp
@ -21,7 +21,6 @@
 * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 ********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/engine/test/utest-Transaction.cpp
+++ b/src/engine/test/utest-Transaction.cpp
@ -21,7 +21,6 @@
 * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 ********************************************************************/
-#include <guid.hpp>
 extern "C"
 {
 #include <config.h>
--- a/src/libqof/qof/gnc-aqbanking-templates.cpp
+++ b/src/libqof/qof/gnc-aqbanking-templates.cpp
@ -25,7 +25,6 @@
 /** Class for managing AQBanking Transaction Templates.
 */

-#include "guid.hpp"
 #include <string>

 extern "C"
--- a/src/libqof/qof/gnc-date.cpp
+++ b/src/libqof/qof/gnc-date.cpp
@ -24,7 +24,6 @@
 *                                                                  *
 \********************************************************************/

-#include <guid.hpp>
 #define __EXTENSIONS__
 extern "C"
 {
--- a/src/libqof/qof/gnc-timezone.cpp
+++ b/src/libqof/qof/gnc-timezone.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/

-#include <guid.hpp>
 #include "gnc-timezone.hpp"

 #include <string>
--- a/src/libqof/qof/guid.h
+++ b/src/libqof/qof/guid.h
@ -65,7 +65,9 @@ extern "C"
 * the object can be persisted), and a different one when compiling for C++
 * found in guid.hpp
 */
-#ifndef __cplusplus
+#ifdef __cplusplus
+struct GncGUID;
+#else
 /** The type used to store guids in C */
 typedef struct _gncGuid {
    unsigned char reserved[GUID_DATA_SIZE];
--- a/src/libqof/qof/kvp-value.cpp
+++ b/src/libqof/qof/kvp-value.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>

 #include "kvp-value.hpp"
 #include "kvp_frame.hpp"
--- a/src/libqof/qof/kvp_frame.cpp
+++ b/src/libqof/qof/kvp_frame.cpp
@ -22,7 +22,6 @@
 *                                                                  *
 ********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/libqof/qof/qof-string-cache.cpp
+++ b/src/libqof/qof/qof-string-cache.cpp
@ -26,7 +26,6 @@
 *   Author: Phil Longstaff (phil.longstaff@yahoo.ca)               *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/libqof/qof/qofbackend.cpp
+++ b/src/libqof/qof/qofbackend.cpp
@ -22,7 +22,6 @@
 *                                                                  *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {

--- a/src/libqof/qof/qofbook.cpp
+++ b/src/libqof/qof/qofbook.cpp
@ -33,7 +33,6 @@
 * Copyright (c) 2007 David Hampton <hampton@employees.org>
 */

-#include <guid.hpp>
 extern "C"
 {

--- a/src/libqof/qof/qofchoice.cpp
+++ b/src/libqof/qof/qofchoice.cpp
@ -21,7 +21,6 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */

-#include <guid.hpp>
 extern "C"
 {

--- a/src/libqof/qof/qofclass.cpp
+++ b/src/libqof/qof/qofclass.cpp
@ -20,7 +20,6 @@
 * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 *                                                                  *
 \********************************************************************/
-#include <guid.hpp>

 extern "C"
 {
--- a/src/libqof/qof/qofevent.cpp
+++ b/src/libqof/qof/qofevent.cpp
@ -22,7 +22,6 @@
 *                                                                  *
 ********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/libqof/qof/qofid.cpp
+++ b/src/libqof/qof/qofid.cpp
@ -22,7 +22,6 @@
 *                                                                  *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/libqof/qof/qoflog.cpp
+++ b/src/libqof/qof/qoflog.cpp
@ -25,7 +25,6 @@
 *  02110-1301,  USA
 */

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/libqof/qof/qofobject.cpp
+++ b/src/libqof/qof/qofobject.cpp
@ -23,7 +23,6 @@
 * Copyright (C) 2001 Derek Atkins
 * Author: Derek Atkins <warlord@MIT.EDU>
 */
-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/libqof/qof/qofquery.cpp
+++ b/src/libqof/qof/qofquery.cpp
@ -21,7 +21,6 @@
 *                                                                  *
 \********************************************************************/

-#include <guid.hpp>
 extern "C"
 {
 #include "config.h"
--- a/src/libqof/qof/qofsession.cpp
+++ b/src/libqof/qof/qofsession.cpp
@ -32,7 +32,6 @@
 @author Copyright (c) 2016 Aaron Laws
   */

-#include "guid.hpp"
 extern "C"
 {

--- a/Show More
+++ b/Show More