diff --git a/src/engine/engine-helpers.c b/src/engine/engine-helpers.c
index 7cb5dc3149..6c4f5cc906 100644
--- a/src/engine/engine-helpers.c
+++ b/src/engine/engine-helpers.c
@@ -40,34 +40,41 @@
 #include "gnc-engine.h"
 #include "gnc-numeric.h"
 
+static short module = MOD_ENGINE;
+
 Timespec
-gnc_transaction_get_date_posted(Transaction *t) {
+gnc_transaction_get_date_posted(Transaction *t) 
+{
   Timespec result;
   xaccTransGetDatePostedTS(t, &result);
   return(result);
 }
 
 Timespec
-gnc_transaction_get_date_entered(Transaction *t) {
+gnc_transaction_get_date_entered(Transaction *t) 
+{
   Timespec result;
   xaccTransGetDateEnteredTS(t, &result);
   return(result);
 }
 
 Timespec
-gnc_split_get_date_reconciled(Split *s) {
+gnc_split_get_date_reconciled(Split *s) 
+{
   Timespec result;
   xaccSplitGetDateReconciledTS(s, &result);
   return(result);
 }
 
 void
-gnc_transaction_set_date_posted(Transaction *t, const Timespec d) {
+gnc_transaction_set_date_posted(Transaction *t, const Timespec d) 
+{
   xaccTransSetDatePostedTS(t, &d);
 }
 
 void
-gnc_transaction_set_date_entered(Transaction *t, const Timespec d) {
+gnc_transaction_set_date_entered(Transaction *t, const Timespec d) 
+{
   xaccTransSetDateEnteredTS(t, &d);
 }
 
@@ -716,7 +723,7 @@ gnc_scm2kvp_value (SCM value_scm)
     }
 
     default:
-      g_warning ("unexpected type: %d", value_t);
+      PWARN ("unexpected type: %d", value_t);
       return NULL;
   }
 
@@ -829,7 +836,7 @@ gnc_queryterm2scm (QueryTerm *qt)
       break;
 
     default:
-      g_warning ("query type %d not supported", qt->data.type);
+      PWARN ("query type %d not supported", qt->data.type);
       return SCM_BOOL_F;
   }
 
diff --git a/src/engine/guid.c b/src/engine/guid.c
index dcec6aa3ac..12491c1aef 100644
--- a/src/engine/guid.c
+++ b/src/engine/guid.c
@@ -47,7 +47,6 @@
 #  define P_tmpdir "/tmp"
 # endif
 
-
 /** Constants *******************************************************/
 #define DEBUG_GUID 0
 #define BLOCKSIZE 4096
@@ -148,9 +147,7 @@ init_from_file(const char *filename, size_t max_size)
 
   file_bytes = init_from_stream(fp, max_size);
 
-#if DEBUG_GUID
-  g_warning ("guid_init got %u bytes from %s", file_bytes, filename);
-#endif
+  PINFO ("guid_init got %u bytes from %s", file_bytes, filename);
 
   total += file_bytes;
 
@@ -343,12 +340,10 @@ guid_init(void)
   /* time in secs and clock ticks */
   bytes += init_from_time();
 
-#if DEBUG_GUID
-  g_warning ("guid_init got %u bytes", bytes);
-#endif
+  PINFO ("got %u bytes", bytes);
 
   if (bytes < THRESHOLD)
-    g_warning("WARNING: guid_init only got %u bytes.\n"
+    PWARN("only got %u bytes.\n"
               "The identifiers might not be very random.\n", bytes);
 
   guid_initialized = TRUE;
diff --git a/src/engine/iso-currencies-to-c b/src/engine/iso-currencies-to-c
index c706baf7d7..3b3542bbcb 100755
--- a/src/engine/iso-currencies-to-c
+++ b/src/engine/iso-currencies-to-c
@@ -38,11 +38,13 @@ exec guile -s $0 "$@"
                                          ~S,
                                          ~S,
                                          ~S);\n
-    if(!c)
-      g_warning(\"failed to create commodity for currency %s\", fullname);
-    else
-      if(!gnc_commodity_table_insert(table, c))
-        g_warning(\"failed to insert %s into commodity table\", fullname);
+    if(!c) {
+      PWARN(\"failed to create commodity for currency %s\", fullname);
+    } else {
+      if(!gnc_commodity_table_insert(table, c)) {
+        PWARN(\"failed to insert %s into commodity table\", fullname);
+      }
+    }
   }\n"
          fullname
          namespace
@@ -78,4 +80,4 @@ exec guile -s $0 "$@"
 
 ;; Local Variables:
 ;; mode: scheme
-;; End:
\ No newline at end of file
+;; End: