diff --git a/bindings/business-core.i b/bindings/business-core.i
index af1349235b8..8c7eff8d890 100644
--- a/bindings/business-core.i
+++ b/bindings/business-core.i
@@ -18,19 +18,6 @@
  *                                                                  *
 \********************************************************************/
 
-#if defined(SWIGGUILE)
-%{
-/* Disable -Waddress.  GCC 4.2 warns (and fails to compile with -Werror) when
- * passing the address of a guid on the stack to QOF_BOOK_LOOKUP_ENTITY via
- * gncInvoiceLookup and friends.  When the macro gets inlined, the compiler
- * emits a warning that the guid null pointer test is always true.
- */
-#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
-#    pragma GCC diagnostic warning "-Waddress"
-#endif
-%}
-#endif
-
 %rename(gncOwnerReturnGUID) gncOwnerRetGUID;
 
 %inline %{
diff --git a/gnucash/gnome/business-urls.c b/gnucash/gnome/business-urls.c
index 3e585267f23..8868eb9eb56 100644
--- a/gnucash/gnome/business-urls.c
+++ b/gnucash/gnome/business-urls.c
@@ -45,15 +45,6 @@
 #include "dialog-invoice.h"
 #include "dialog-job.h"
 
-/* Disable -Waddress.  GCC 4.2 warns (and fails to compile with -Werror) when
- * passing the address of a guid on the stack to QOF_BOOK_LOOKUP_ENTITY via
- * gncInvoiceLookup and friends.  When the macro gets inlined, the compiler
- * emits a warning that the guid null pointer test is always true.
- */
-#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
-#    pragma GCC diagnostic warning "-Waddress"
-#endif
-
 #define HANDLE_TYPE(URL_TYPE_STR,OBJ_TYPE) {                                 \
   QofBook *book;                                                             \
   GncGUID guid;                                                                 \
diff --git a/gnucash/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c
index 8307cec9f3f..e72e5f5b43b 100644
--- a/gnucash/gnome/dialog-invoice.c
+++ b/gnucash/gnome/dialog-invoice.c
@@ -80,15 +80,6 @@
 #include "dialog-transfer.h"
 #include "gnc-uri-utils.h"
 
-/* Disable -Waddress.  GCC 4.2 warns (and fails to compile with -Werror) when
- * passing the address of a guid on the stack to QOF_BOOK_LOOKUP_ENTITY via
- * gncInvoiceLookup and friends.  When the macro gets inlined, the compiler
- * emits a warning that the guid null pointer test is always true.
- */
-#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
-#    pragma GCC diagnostic warning "-Waddress"
-#endif
-
 #define DIALOG_NEW_INVOICE_CM_CLASS "dialog-new-invoice"
 #define DIALOG_VIEW_INVOICE_CM_CLASS "dialog-view-invoice"
 
diff --git a/libgnucash/engine/gncBillTerm.h b/libgnucash/engine/gncBillTerm.h
index 724679cc757..34c1803548e 100644
--- a/libgnucash/engine/gncBillTerm.h
+++ b/libgnucash/engine/gncBillTerm.h
@@ -115,8 +115,6 @@ void gncBillTermSetCutoff (GncBillTerm *term, gint cutoff);
 /** Return a pointer to the instance gncBillTerm that is identified
  *  by the guid, and is residing in the book. Returns NULL if the
  *  instance can't be found.
- *  Equivalent function prototype is
- *  GncBillTerm * gncBillTermLookup (QofBook *book, const GncGUID *guid);
  */
 static inline GncBillTerm * gncBillTermLookup (const QofBook *book, const GncGUID *guid)
 {
diff --git a/libgnucash/engine/gncCustomer.h b/libgnucash/engine/gncCustomer.h
index 58ca70b1d58..ec970407988 100644
--- a/libgnucash/engine/gncCustomer.h
+++ b/libgnucash/engine/gncCustomer.h
@@ -112,8 +112,6 @@ void gncCustomerRemoveJob (GncCustomer *customer, GncJob *job);
 /** Return a pointer to the instance gncCustomer that is identified
  *  by the guid, and is residing in the book. Returns NULL if the
  *  instance can't be found.
- *  Equivalent function prototype is
- *  GncCustomer * gncCustomerLookup (QofBook *book, const GncGUID *guid);
  */
 static inline GncCustomer * gncCustomerLookup (const QofBook *book, const GncGUID *guid)
 {
diff --git a/libgnucash/engine/gncEmployee.h b/libgnucash/engine/gncEmployee.h
index 901123b6217..98bdd8d438f 100644
--- a/libgnucash/engine/gncEmployee.h
+++ b/libgnucash/engine/gncEmployee.h
@@ -108,8 +108,6 @@ Account * gncEmployeeGetCCard (const GncEmployee *employee);
 /** Return a pointer to the instance gncEmployee that is identified
  *  by the guid, and is residing in the book. Returns NULL if the
  *  instance can't be found.
- *  Equivalent function prototype is
- *  GncEmployee * gncEmployeeLookup (QofBook *book, const GncGUID *guid);
  */
 static inline GncEmployee * gncEmployeeLookup (const QofBook *book, const GncGUID *guid)
 {
diff --git a/libgnucash/engine/gncEntry.h b/libgnucash/engine/gncEntry.h
index bdb4c12128e..ee818283cf8 100644
--- a/libgnucash/engine/gncEntry.h
+++ b/libgnucash/engine/gncEntry.h
@@ -290,8 +290,6 @@ GncInvoice * gncEntryGetBill (const GncEntry *entry);
 /** Return a pointer to the instance gncEntry that is identified
  *  by the guid, and is residing in the book. Returns NULL if the
  *  instance can't be found.
- *  Equivalent function prototype is
- *  GncEntry * gncEntryLookup (QofBook *book, const GncGUID *guid);
  */
 static inline GncEntry * gncEntryLookup (const QofBook *book, const GncGUID *guid)
 {
diff --git a/libgnucash/engine/gncInvoice.h b/libgnucash/engine/gncInvoice.h
index 43cb1865b3c..fcc471df8ac 100644
--- a/libgnucash/engine/gncInvoice.h
+++ b/libgnucash/engine/gncInvoice.h
@@ -268,8 +268,6 @@ GncInvoice * gncInvoiceGetInvoiceFromLot (GNCLot *lot);
 /** Return a pointer to the instance gncInvoice that is identified
  *  by the guid, and is residing in the book. Returns NULL if the
  *  instance can't be found.
- *  Equivalent function prototype is
- *  GncInvoice * gncInvoiceLookup (QofBook *book, const GncGUID *guid);
  */
 static inline GncInvoice * gncInvoiceLookup (const QofBook *book, const GncGUID *guid)
 {
diff --git a/libgnucash/engine/gncJob.h b/libgnucash/engine/gncJob.h
index b40cdbcab40..d200cdf11f3 100644
--- a/libgnucash/engine/gncJob.h
+++ b/libgnucash/engine/gncJob.h
@@ -89,8 +89,6 @@ gboolean     gncJobGetActive (const GncJob *job);
 /** Return a pointer to the instance gncJob that is identified
  *  by the guid, and is residing in the book. Returns NULL if the
  *  instance can't be found.
- *  Equivalent function prototype is
- *  GncJob * gncJobLookup (QofBook *book, const GncGUID *guid);
  */
 static inline GncJob * gncJobLookup (const QofBook *book, const GncGUID *guid)
 {
diff --git a/libgnucash/engine/gncOrder.h b/libgnucash/engine/gncOrder.h
index 7e77969640f..769d7ec2bfe 100644
--- a/libgnucash/engine/gncOrder.h
+++ b/libgnucash/engine/gncOrder.h
@@ -98,8 +98,6 @@ gboolean gncOrderIsClosed (const GncOrder *order);
 /** Return a pointer to the instance gncOrder that is identified
  *  by the guid, and is residing in the book. Returns NULL if the
  *  instance can't be found.
- *  Equivalent function prototype is
- *  GncOrder * gncOrderLookup (QofBook *book, const GncGUID *guid);
  */
 static inline GncOrder * gncOrderLookup (const QofBook *book, const GncGUID *guid)
 {
diff --git a/libgnucash/engine/gncTaxTable.h b/libgnucash/engine/gncTaxTable.h
index 4ec0dafb23e..a479b85e0ad 100644
--- a/libgnucash/engine/gncTaxTable.h
+++ b/libgnucash/engine/gncTaxTable.h
@@ -142,8 +142,6 @@ gboolean gncTaxTableEqual(const GncTaxTable *a, const GncTaxTable *b);
 /** Return a pointer to the instance gncTaxTable that is identified
  *  by the guid, and is residing in the book. Returns NULL if the
  *  instance can't be found.
- *  Equivalent function prototype is
- *  GncTaxTable * gncTaxTableLookup (QofBook *book, const GncGUID *guid);
  */
 static inline GncTaxTable *gncTaxTableLookup (const QofBook* book, const GncGUID *guid)
 {
diff --git a/libgnucash/engine/gncVendor.h b/libgnucash/engine/gncVendor.h
index 3bcdf6272c5..718c0b851d3 100644
--- a/libgnucash/engine/gncVendor.h
+++ b/libgnucash/engine/gncVendor.h
@@ -108,8 +108,6 @@ int gncVendorCompare (const GncVendor *a, const GncVendor *b);
 /** Return a pointer to the instance gncVendor that is identified
  *  by the guid, and is residing in the book. Returns NULL if the
  *  instance can't be found.
- *  Equivalent function prototype is
- *  GncVendor * gncVendorLookup (QofBook *book, const GncGUID *guid);
  */
 static inline GncVendor * gncVendorLookup (const QofBook *book, const GncGUID *guid)
 {