diff --git a/src/business/business-gnome/dialog-choose-owner.c b/src/business/business-gnome/dialog-choose-owner.c
index 2f5e1bc383..9ce0174bab 100644
--- a/src/business/business-gnome/dialog-choose-owner.c
+++ b/src/business/business-gnome/dialog-choose-owner.c
@@ -25,7 +25,7 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <qof.h>
+#include "qof.h"
 
 #include "Transaction.h"
 #include "dialog-utils.h"
diff --git a/src/engine/engine.i b/src/engine/engine.i
index b87f2948af..a3bd6229b4 100644
--- a/src/engine/engine.i
+++ b/src/engine/engine.i
@@ -1,22 +1,22 @@
 %module sw_engine
 %{
 /* Includes the header in the wrapper code */
-#include <config.h>
+#include "config.h"
 #include <glib.h>
-#include <qof.h>
-#include <Query.h>
-#include <guile-mappings.h>
-#include <gnc-budget.h>
-#include <gnc-commodity.h>
-#include <gnc-engine.h>
-#include <gnc-filepath-utils.h>
-#include <gnc-pricedb.h>
-#include <gnc-lot.h>
-#include <gnc-session-scm.h>
-#include <gnc-hooks-scm.h>
-#include <engine-helpers.h>
-#include <SX-book.h>
-#include <kvp-scm.h>
+#include "qof.h"
+#include "Query.h"
+#include "guile-mappings.h"
+#include "gnc-budget.h"
+#include "gnc-commodity.h"
+#include "gnc-engine.h"
+#include "gnc-filepath-utils.h"
+#include "gnc-pricedb.h"
+#include "gnc-lot.h"
+#include "gnc-session-scm.h"
+#include "gnc-hooks-scm.h"
+#include "engine-helpers.h"
+#include "SX-book.h"
+#include "kvp-scm.h"
 #include "glib-helpers.h"
 
 SCM scm_init_sw_engine_module (void);
diff --git a/src/engine/gnc-event.h b/src/engine/gnc-event.h
index 1c0fdf6a71..bb86b45946 100644
--- a/src/engine/gnc-event.h
+++ b/src/engine/gnc-event.h
@@ -31,7 +31,7 @@
 #define GNC_EVENT_H
 
 #include <glib.h>
-#include <qof.h>
+#include "qof.h"
 
 typedef struct
 {
diff --git a/src/engine/kvp-scm.c b/src/engine/kvp-scm.c
index f6ab983908..c0c4918b03 100644
--- a/src/engine/kvp-scm.c
+++ b/src/engine/kvp-scm.c
@@ -1,8 +1,8 @@
 #include "config.h"
 
-#include <qof.h>
+#include "qof.h"
 #include <libguile.h>
-#include <engine-helpers.h>
+#include "engine-helpers.h"
 
 #include "kvp-scm.h"
 #include "guile-mappings.h"
diff --git a/src/engine/kvp-scm.h b/src/engine/kvp-scm.h
index 1d8b3b4505..c57227f996 100644
--- a/src/engine/kvp-scm.h
+++ b/src/engine/kvp-scm.h
@@ -1,7 +1,7 @@
 #ifndef KVP_SCM_H
 #define KVP_SCM_H
 
-#include <qof.h>
+#include "qof.h"
 #include <libguile.h>
 
 int gnc_kvp_value_ptr_p(SCM arg);
diff --git a/src/libqof/qof/test/test-qof.c b/src/libqof/qof/test/test-qof.c
index 018d980f7d..5e80952bbe 100644
--- a/src/libqof/qof/test/test-qof.c
+++ b/src/libqof/qof/test/test-qof.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include <glib.h>
-#include <qof.h>
+#include "qof.h"
 
 extern void test_suite_qofbook();
 extern void test_suite_qofinstance();
diff --git a/src/libqof/qof/test/test-qofbook.c b/src/libqof/qof/test/test-qofbook.c
index e2b7e9a176..39f34611cc 100644
--- a/src/libqof/qof/test/test-qofbook.c
+++ b/src/libqof/qof/test/test-qofbook.c
@@ -19,10 +19,10 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
-#include <config.h>
+#include "config.h"
 #include <string.h>
 #include <glib.h>
-#include <qof.h>
+#include "qof.h"
 #include "qofbook-p.h"
 
 static const gchar *suitename = "/qof/qofbook";
diff --git a/src/libqof/qof/test/test-qofinstance.c b/src/libqof/qof/test/test-qofinstance.c
index 81e8df771e..5b0307b75b 100644
--- a/src/libqof/qof/test/test-qofinstance.c
+++ b/src/libqof/qof/test/test-qofinstance.c
@@ -19,9 +19,9 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
-#include <config.h>
+#include "config.h"
 #include <glib.h>
-#include <qof.h>
+#include "qof.h"
 
 static const gchar *suitename = "/qof/qofinstance";
 void test_suite_qofinstance ( void );
diff --git a/src/libqof/qof/test/test-qofsession.c b/src/libqof/qof/test/test-qofsession.c
index aed044be5c..b32904a0ed 100644
--- a/src/libqof/qof/test/test-qofsession.c
+++ b/src/libqof/qof/test/test-qofsession.c
@@ -1,6 +1,6 @@
 /********************************************************************
- * test_qofsession.c: GLib g_test test suite for qofsession.	    *
- * Copyright 2011 John Ralls <jralls@ceridwen.us>		    *
+ * test_qofsession.c: GLib g_test test suite for qofsession.        *
+ * Copyright 2011 John Ralls <jralls@ceridwen.us>                   *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -20,11 +20,11 @@
  * Boston, MA  02110-1301,  USA       gnu@gnu.org                   *
 \********************************************************************/
 
-#include <config.h>
+#include "config.h"
 #include <glib.h>
-#include <qof.h>
-#include <qofbackend-p.h>
-#include <qofsession-p.h>
+#include "qof.h"
+#include "qofbackend-p.h"
+#include "qofsession-p.h"
 
 static const gchar *suitename = "/qof/qofsession";
 void test_suite_qofsession ( void );