diff --git a/acinclude.m4 b/acinclude.m4
index 10aa8dc946..c221b7394d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4146,6 +4146,7 @@ AC_ARG_ENABLE(libguppitest, [  --disable-libguppitest       Do not try to compil
   else
     LIBGUPPI_CFLAGS=`$GNOME_CONFIG $libguppiconf_args --cflags gtk libguppi`
     LIBGUPPI_LIBS=`$GNOME_CONFIG $libguppiconf_args --libs gtk libguppi`
+    AS_SCRUB_INCLUDE(LIBGUPPI_CFLAGS)
 
     libguppi_major_version=`$GNOME_CONFIG --modversion libguppi | \
            sed 's/libguppi-\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
diff --git a/configure.in b/configure.in
index 0f8011e827..5b8ce7751c 100644
--- a/configure.in
+++ b/configure.in
@@ -857,9 +857,8 @@ then
     
     GUPPI_LIBS=`$GNOME_CONFIG --libs libguppi`
     GUPPI_CFLAGS=`$GNOME_CONFIG --cflags libguppi`
-    LIBGUPPI_CHECK
-    AS_SCRUB_INCLUDE(LIBGUPPI_CFLAGS)
     AS_SCRUB_INCLUDE(GUPPI_CFLAGS)
+    LIBGUPPI_CHECK
     AC_SUBST(GUPPI_LIBS)
     AC_SUBST(GUPPI_CFLAGS)
     
diff --git a/src/app-utils/gnc-helpers.c b/src/app-utils/gnc-helpers.c
index 5510860b12..7f7d0cd672 100644
--- a/src/app-utils/gnc-helpers.c
+++ b/src/app-utils/gnc-helpers.c
@@ -140,9 +140,9 @@ g_date_equals( gconstpointer gda, gconstpointer gdb )
 {
   if ( !g_date_valid( (GDate*)gda )
        || !g_date_valid( (GDate*)gdb ) ) {
-    DEBUG( "invalid: %.8x(%s), %.8x(%s)",
-           gda, ( g_date_valid(gda) ? "" : "*" ),
-           gdb, ( g_date_valid(gdb) ? "" : "*" ) );
+    DEBUG( "invalid: %p(%s), %p(%s)",
+           gda, ( g_date_valid((GDate*)gda) ? "" : "*" ),
+           gdb, ( g_date_valid((GDate*)gdb) ? "" : "*" ) );
   }
   return ( g_date_compare( (GDate*)gda, (GDate*)gdb )
            == 0 ? TRUE : FALSE );
diff --git a/src/gnome/druid-loan.c b/src/gnome/druid-loan.c
index 7423dc1f26..78f8ee838d 100644
--- a/src/gnome/druid-loan.c
+++ b/src/gnome/druid-loan.c
@@ -1869,6 +1869,7 @@ ld_calc_current_instance_num( int monthsPassed, FreqSpec *fs )
  * - Escrow-diverted repayments cause new Txns w/in their
  *   SX. [Assets->Escrow, Escrow->(Expense|Liability)]
  **/
+#if 0
 static
 void
 new_ld_create_sxes( LoanDruidData *ldd )
@@ -1884,6 +1885,7 @@ new_ld_create_sxes( LoanDruidData *ldd )
          *   . thisSX += txns
          */
 }
+#endif
 
 
 static
diff --git a/src/import-export/import-backend.c b/src/import-export/import-backend.c
index 2b42f7a0b8..a21e19e747 100644
--- a/src/import-export/import-backend.c
+++ b/src/import-export/import-backend.c
@@ -364,7 +364,7 @@ matchmap_store_destination (GncImportMatchMap *matchmap,
 {
   GncImportMatchMap *tmp_matchmap = NULL;
   Account *dest;
-  char *descr, *memo;
+  const char *descr, *memo;
   g_assert (trans_info);
 
   /* This will store the destination account of the selected match if 
diff --git a/src/import-export/import-match-map.c b/src/import-export/import-match-map.c
index dcea4e764b..8080ffc164 100644
--- a/src/import-export/import-match-map.c
+++ b/src/import-export/import-match-map.c
@@ -27,6 +27,7 @@
     "strings" to Gnucash accounts in a generic manner.
     @author Copyright (C) 2002 Derek Atkins <derek@ihtfp.com>
  */
+#include <string.h>
 #include "import-match-map.h"
 #include "kvp_frame.h"
 
diff --git a/src/register/register-core/formulacell.c b/src/register/register-core/formulacell.c
index 36793a8991..da506a0d76 100644
--- a/src/register/register-core/formulacell.c
+++ b/src/register/register-core/formulacell.c
@@ -39,7 +39,9 @@ static gboolean gnc_formula_cell_enter( BasicCell *_cell,
                                         int *start_selection,
                                         int *end_selection );
 
+#if 0
 static void gnc_formula_cell_leave( BasicCell *_cell );
+#endif
 
 static void gnc_formula_cell_modify_verify( BasicCell *_cell, 
                                             const GdkWChar *change,
@@ -98,6 +100,7 @@ gnc_formula_cell_enter( BasicCell *_cell,
   return TRUE;
 }
 
+#if 0
 static
 void
 gnc_formula_cell_leave( BasicCell *_cell )
@@ -108,6 +111,7 @@ gnc_formula_cell_leave( BasicCell *_cell )
   str = fc->cell.value;
   gnc_basic_cell_set_value_internal( &fc->cell, str );
 }
+#endif
 
 static
 void
@@ -128,7 +132,7 @@ gnc_formula_cell_modify_verify( BasicCell *_cell,
   int i;
 
   DEBUG( "%s, %d, %s, %d, %d, %d, %d",
-         change, change_len, newval, newval_len,
+         (gchar *)change, change_len, (gchar *)newval, newval_len,
          *cursor_position, *start_selection, *end_selection );
 
   /* accept the newval string if user action was delete */