diff --git a/src/AccWindow.c b/src/AccWindow.c
index a61178ed7a..ed3471540c 100644
--- a/src/AccWindow.c
+++ b/src/AccWindow.c
@@ -42,7 +42,7 @@
 #include "Account.h"
 #include "AccountMenu.h"
 #include "Data.h"
-#include "main.h"
+#include "messages.h"
 #include "MainWindow.h"
 #include "RegWindow.h"
 #include "TextBox.h"
diff --git a/src/Account.c b/src/Account.c
index df0eeb2d60..c727c46ea2 100644
--- a/src/Account.c
+++ b/src/Account.c
@@ -28,7 +28,6 @@
 #include "Account.h"
 #include "Data.h"
 #include "date.h"
-#include "main.h"
 #include "Transaction.h"
 #include "util.h"
 
diff --git a/src/AccountMenu.c b/src/AccountMenu.c
index d5e6d49a0d..001e7c3c31 100644
--- a/src/AccountMenu.c
+++ b/src/AccountMenu.c
@@ -32,7 +32,7 @@
 #include "Account.h"
 #include "BuildMenu.h"
 #include "Data.h"
-#include "main.h"
+#include "messages.h"
 #include "util.h"
 
 typedef struct _accMenuEntry
diff --git a/src/AdjBWindow.c b/src/AdjBWindow.c
index 74ba750350..efd04f0d11 100644
--- a/src/AdjBWindow.c
+++ b/src/AdjBWindow.c
@@ -35,7 +35,7 @@
 #include "Account.h"
 #include "Data.h"
 #include "date.h"
-#include "main.h"
+#include "messages.h"
 #include "MainWindow.h"
 #include "RegWindow.h"
 #include "RecnWindow.h"
diff --git a/src/FileBox.c b/src/FileBox.c
index 12c0aceff3..2878dac19e 100644
--- a/src/FileBox.c
+++ b/src/FileBox.c
@@ -28,7 +28,7 @@
 #include "config.h"
 
 #include "FileBox.h"
-#include "main.h"
+#include "messages.h"
 #include "util.h"
 #include "xtutil.h"
 
diff --git a/src/FileIO.c b/src/FileIO.c
index 4c4d0a5dd0..7e3ca9c9d5 100644
--- a/src/FileIO.c
+++ b/src/FileIO.c
@@ -85,7 +85,7 @@
 #include "Account.h"
 #include "Data.h"
 #include "FileIO.h"
-#include "main.h"
+#include "messages.h"
 #include "util.h"
 
 #define PERMS   0666
diff --git a/src/HelpWindow.c b/src/HelpWindow.c
index 5f9353ba76..89e79edf83 100644
--- a/src/HelpWindow.c
+++ b/src/HelpWindow.c
@@ -49,6 +49,7 @@
 #endif 
 
 #include "main.h"
+#include "messages.h"
 #include "util.h"
 #include "xtutil.h"
 
diff --git a/src/MainWindow.c b/src/MainWindow.c
index b9f095bfc3..3cbce859e9 100644
--- a/src/MainWindow.c
+++ b/src/MainWindow.c
@@ -48,6 +48,7 @@
 #include "HelpWindow.h"
 #include "LedgerUtils.h"
 #include "main.h"
+#include "messages.h"
 #include "MainWindow.h"
 #include "RecnWindow.h"
 #include "RegWindow.h"
diff --git a/src/QIFIO.c b/src/QIFIO.c
index 1cdc27bfc6..01de555840 100644
--- a/src/QIFIO.c
+++ b/src/QIFIO.c
@@ -42,7 +42,7 @@
 
 #include "Account.h"
 #include "Data.h"
-#include "main.h"
+#include "messages.h"
 #include "util.h"
 
 #define PERMS   0666
diff --git a/src/QuickFill.c b/src/QuickFill.c
index d675e6ab01..632ddc6703 100644
--- a/src/QuickFill.c
+++ b/src/QuickFill.c
@@ -27,11 +27,10 @@
 
 #include "config.h"
 
-#include "util.h"
-#include "main.h"
 #include "Account.h"
 #include "date.h"
 #include "QuickFill.h"
+#include "util.h"
 
 /** PROTOTYPES ******************************************************/
 void qfInsertTransactionRec( QuickFill *qf, Transaction *trans, int depth );
diff --git a/src/RecnWindow.c b/src/RecnWindow.c
index bfcf641beb..55d699184d 100644
--- a/src/RecnWindow.c
+++ b/src/RecnWindow.c
@@ -39,7 +39,7 @@
 #include "Data.h"
 #include "RegWindow.h"
 #include "MainWindow.h"
-#include "main.h"
+#include "messages.h"
 #include "util.h"
 #include "xtutil.h"
 
diff --git a/src/RegWindow.c b/src/RegWindow.c
index c53ca4269e..7059b2f6d5 100644
--- a/src/RegWindow.c
+++ b/src/RegWindow.c
@@ -41,10 +41,11 @@
 #include "BuildMenu.h"
 #include "Data.h"
 #include "date.h"
-#include "main.h"
-#include "MainWindow.h"
 #include "Ledger.h"
 #include "LedgerUtils.h"
+#include "MainWindow.h"
+#include "main.h"
+#include "messages.h"
 #include "QuickFill.h"
 #include "RecnWindow.h"
 #include "Transaction.h"
diff --git a/src/Reports.c b/src/Reports.c
index bdae223a66..98ce1e1d21 100644
--- a/src/Reports.c
+++ b/src/Reports.c
@@ -32,7 +32,7 @@
 #include <Xm/LabelGP.h>
 
 #include "config.h"
-#include "main.h"
+#include "messages.h"
 #include "Reports.h"
 #include "util.h"
 #include "xtutil.h"
diff --git a/src/TextBox.c b/src/TextBox.c
index d80e39270f..8bef1fe608 100644
--- a/src/TextBox.c
+++ b/src/TextBox.c
@@ -38,7 +38,7 @@
 #include <Xbae/Matrix.h>
 
 #include "config.h"
-#include "main.h"
+#include "messages.h"
 #include "util.h"
 #include "xtutil.h"
 
diff --git a/src/Transaction.c b/src/Transaction.c
index cbeb367d82..a13c9c0f95 100644
--- a/src/Transaction.c
+++ b/src/Transaction.c
@@ -23,6 +23,8 @@
  *           Huntington Beach, CA 92648-4632                        *
 \********************************************************************/
 
+#include <string.h>
+
 #include "config.h"
 
 #include "date.h"
diff --git a/src/XferWindow.c b/src/XferWindow.c
index 60247d216c..429e7ae456 100644
--- a/src/XferWindow.c
+++ b/src/XferWindow.c
@@ -37,7 +37,7 @@
 #include "Account.h"
 #include "BuildMenu.h"
 #include "Data.h"
-#include "main.h"
+#include "messages.h"
 #include "MainWindow.h"
 #include "RecnWindow.h"
 #include "RegWindow.h"
diff --git a/src/register/actioncell.c b/src/register/actioncell.c
index ef9d2a8530..d3ed10a97c 100644
--- a/src/register/actioncell.c
+++ b/src/register/actioncell.c
@@ -1,5 +1,6 @@
 
 #include "actioncell.h"
+#include "messages.h"
 
 static void realizeAction (struct _BasicCell *bcell, void *w, int width);
 static void destroyAction (struct _BasicCell *bcell);
diff --git a/src/register/combocell.c b/src/register/combocell.c
index 053ec121f6..1f828504b2 100644
--- a/src/register/combocell.c
+++ b/src/register/combocell.c
@@ -138,12 +138,6 @@ void moveCombo (struct _BasicCell *bcell, int phys_row, int phys_col)
    /* if the drop-down menu is showing, hide it now */
    XmComboBoxHideList (box->combobox);
 
-printf ("move from %d %d to %d %d \n", 
-   box->currow,
-   box->curcol,
-   phys_row,
-   phys_col);
-
    /* if there is an old widget, remove it */
    if ((0 <= box->currow) && (0 <= box->curcol)) {
       XbaeMatrixSetCellWidget (box->parent, box->currow, box->curcol, NULL);
@@ -204,7 +198,6 @@ const char * enterCombo (struct _BasicCell *bcell, const char *value)
 
       /* drop down the menu so that its ready to go. */
       XmComboBoxShowList (box->combobox); 
-printf ("show at %d %d \n", phys_row, phys_col);
    } else {
       XtUnmanageChild (box->combobox); 
    }
@@ -284,7 +277,6 @@ static void selectCB (Widget w, XtPointer cd, XtPointer cb )
    }
    if (!choice) choice = XtNewString ("");
 
-printf ("select %s \n", choice);
    XbaeMatrixSetCell (box->parent, box->currow, box->curcol, choice); 
    xaccSetBasicCellValue (&(cell->cell), choice);
    XtFree (choice);
diff --git a/src/util.c b/src/util.c
index 62f5224ff6..9af94b0412 100644
--- a/src/util.c
+++ b/src/util.c
@@ -24,7 +24,7 @@
 \********************************************************************/
 
 #include "config.h"
-#include "main.h"
+#include "messages.h"
 #include "util.h"
 
 /** GLOBALS *********************************************************/
diff --git a/src/xtutil.c b/src/xtutil.c
index 79a5c6fdde..c6700b56d1 100644
--- a/src/xtutil.c
+++ b/src/xtutil.c
@@ -37,7 +37,7 @@
 #include <Xbae/Matrix.h>
 
 #include "config.h"
-#include "main.h"
+#include "messages.h"
 #include "util.h"
 #include "xtutil.h"