diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 90b7e3bd4a..8d7de37923 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -76,7 +76,7 @@ libgncmod_app_utils_la_LIBADD = \
   ${GLIB_LIBS}
 
 if BUILDING_FROM_SVN
-swig-app-utils.c: app-utils.i
+swig-app-utils.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
 endif
diff --git a/src/business/business-core/Makefile.am b/src/business/business-core/Makefile.am
index 3857963a88..82b2c8d7a1 100644
--- a/src/business/business-core/Makefile.am
+++ b/src/business/business-core/Makefile.am
@@ -66,7 +66,8 @@ libgncmod_business_core_la_LIBADD = \
 # business-core-helpers.c
 
 if BUILDING_FROM_SVN
-swig-business-core.c: business-core.i ${noinst_HEADERS}
+swig-business-core.c: business-core.i ${noinst_HEADERS} \
+                      ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
 endif
diff --git a/src/business/dialog-tax-table/Makefile.am b/src/business/dialog-tax-table/Makefile.am
index a1e3343f94..63f5620f6e 100644
--- a/src/business/dialog-tax-table/Makefile.am
+++ b/src/business/dialog-tax-table/Makefile.am
@@ -41,7 +41,7 @@ libgncmod_dialog_tax_table_la_LIBADD = \
   ${EFENCE_LIBS}
 
 if BUILDING_FROM_SVN
-swig-dialog-tax-table.c: dialog-tax-table.i
+swig-dialog-tax-table.c: dialog-tax-table.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
 endif
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index 581355c0ae..d5466c6d64 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -26,7 +26,7 @@ noinst_HEADERS = \
   gnc-gtk-utils.h
 
 if BUILDING_FROM_SVN
-swig-core-utils.c: core-utils.i
+swig-core-utils.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
 endif
diff --git a/src/core-utils/gnc-gobject-utils.c b/src/core-utils/gnc-gobject-utils.c
index 49e0d4f442..103ec3d38d 100644
--- a/src/core-utils/gnc-gobject-utils.c
+++ b/src/core-utils/gnc-gobject-utils.c
@@ -39,7 +39,7 @@ static void gnc_gobject_weak_cb (gpointer user_data, GObject *object);
 
 /** Get a pointer to the hash table used by the tracking database.  If
  *  the hash table doesn't exist, it will be created.  If gnucash was
- *  compiled iwh --enable-ref-count-dumps, this funtion is also the
+ *  compiled with --enable-ref-count-dumps, this funtion is also the
  *  point where the gnc_gobject_tracking_dump() function is registered
  *  to be called the GTK exits.
  *
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 0a6d3b6274..0615380d0e 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -168,7 +168,8 @@ endif
 noinst_DATA = .scm-links
 
 if BUILDING_FROM_SVN
-swig-engine.c: engine.i ${gncinclude_HEADERS} ${noinst_HEADERS}
+swig-engine.c: engine.i ${top_srcdir}/src/base-typemaps.i \
+               ${gncinclude_HEADERS} ${noinst_HEADERS}
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/lib/libqof/qof -I${top_srcdir}/src -o $@ $<
 endif
diff --git a/src/engine/TransLog.c b/src/engine/TransLog.c
index c9bb2e02c0..7d1bb796b6 100644
--- a/src/engine/TransLog.c
+++ b/src/engine/TransLog.c
@@ -50,7 +50,7 @@
  *       No, using a perl script to analyze a file that's supposed to
  *       be human readable is not a contradication in terms -- that's 
  *       exactly the point.
- * (2.b) Use tabs as a human freindly field separator; its also a 
+ * (2.b) Use tabs as a human friendly field separator; its also a 
  *       character that does not (should not) appear naturally anywhere 
  *       in the data, as it serves no formatting purpose in the current 
  *       GUI design.  (hack alert -- this is not currently tested for 
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index a82a0378b3..5c969f1906 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -28,7 +28,7 @@ gncinclude_HEADERS = \
 noinst_DATA = .scm-links
 
 if BUILDING_FROM_SVN
-swig-gnc-module.c: gnc-module.i
+swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
 endif
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 3564225f2c..c87b15ede7 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -189,7 +189,8 @@ libgncmod_gnome_utils_la_LIBADD = \
   ${LIBXML2_LIBS}
 
 if BUILDING_FROM_SVN
-swig-gnome-utils.c: gnome-utils.i gnc-html.h print-session.h
+swig-gnome-utils.c: gnome-utils.i gnc-html.h print-session.h \
+                    ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
 endif
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index 20cb6ac847..d9e2e0cbd8 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -89,7 +89,7 @@ noinst_HEADERS = \
   window-reconcile.h
 
 if BUILDING_FROM_SVN
-swig-gnome.c: gnome.i dialog-progress.h
+swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
 endif
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index a712ad2244..2e66f3a242 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -51,7 +51,7 @@ libgncmod_report_gnome_la_LIBADD = \
   ${GLIB_LIBS}
 
 if BUILDING_FROM_SVN
-swig-report-gnome.c: report-gnome.i
+swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
 endif
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index 0c4555457f..40c62b28d7 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -18,7 +18,7 @@ libgncmod_report_system_la_LIBADD = \
   ${GLIB_LIBS}
 
 if BUILDING_FROM_SVN
-swig-report-system.c: report-system.i
+swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src -o $@ $<
 endif