diff -up notecase-1.6.1/src/main.cpp.gcc43 notecase-1.6.1/src/main.cpp
--- notecase-1.6.1/src/main.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/main.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -8,6 +8,7 @@
 
 #include "config.h"
 #include "mru.h"
+#include <cstdlib>
 #include <gtk/gtk.h>
 #include <libintl.h>
 
diff -up notecase-1.6.1/src/callbacks.cpp.gcc43 notecase-1.6.1/src/callbacks.cpp
--- notecase-1.6.1/src/callbacks.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/callbacks.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -32,6 +32,7 @@
 #include <pango/pango.h>
 #include <glib.h>
 #include <time.h>
+#include <cstdlib>
 #include "lib/NoteDocument.h"
 #include "lib/DocumentIterator.h"
 #include "lib/FilePath.h"
diff -up notecase-1.6.1/src/NodePropertiesDlg.cpp.gcc43 notecase-1.6.1/src/NodePropertiesDlg.cpp
--- notecase-1.6.1/src/NodePropertiesDlg.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/NodePropertiesDlg.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -12,6 +12,7 @@
 #include "gui/FileDialog.h"
 #include "lib/debug.h"
 #include "config.h"
+#include <cstring>
 
 #ifdef _WIN32
  #ifndef __MINGW32__
diff -up notecase-1.6.1/src/DocActionSort.cpp.gcc43 notecase-1.6.1/src/DocActionSort.cpp
--- notecase-1.6.1/src/DocActionSort.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/DocActionSort.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -20,6 +20,7 @@
 #include "TreeView.h"
 #include "lib/debug.h"
 #include <algorithm>
+#include <cstring>
 
 #ifdef _WIN32
  #include <io.h>
diff -up notecase-1.6.1/src/gui/GuiLanguage.cpp.gcc43 notecase-1.6.1/src/gui/GuiLanguage.cpp
--- notecase-1.6.1/src/gui/GuiLanguage.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/gui/GuiLanguage.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -13,6 +13,7 @@
 #include "../config.h"
 #include "GuiLanguage.h"
 #include <algorithm>
+#include <cstring>
 #include <gtk/gtk.h>
 #ifdef ENABLE_NLS
 #include <libintl.h>
diff -up notecase-1.6.1/src/gui/ProgressDlg.cpp.gcc43 notecase-1.6.1/src/gui/ProgressDlg.cpp
--- notecase-1.6.1/src/gui/ProgressDlg.cpp.gcc43	2008-03-27 00:19:20.000000000 -0400
+++ notecase-1.6.1/src/gui/ProgressDlg.cpp	2008-03-27 00:19:38.000000000 -0400
@@ -7,6 +7,7 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "ProgressDlg.h"
+#include <cstring>
 #include <string>
 
 #include <gdk/gdkkeysyms.h>
diff -up notecase-1.6.1/src/lib/Base64.cpp.gcc43 notecase-1.6.1/src/lib/Base64.cpp
--- notecase-1.6.1/src/lib/Base64.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/lib/Base64.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -19,6 +19,7 @@
 
 #include "Base64.h"
 #include "debug.h"
+#include <cstring>
 
 // Static Member Initializers
 //
diff -up notecase-1.6.1/src/lib/IOProcess.cpp.gcc43 notecase-1.6.1/src/lib/IOProcess.cpp
--- notecase-1.6.1/src/lib/IOProcess.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/lib/IOProcess.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -8,6 +8,7 @@
 
 #include "IOProcess.h"
 #include "debug.h"
+#include <cstring>
 
 IOProcess::IOProcess(int nMode)
 {
diff -up notecase-1.6.1/src/lib/FilePath.cpp.gcc43 notecase-1.6.1/src/lib/FilePath.cpp
--- notecase-1.6.1/src/lib/FilePath.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/lib/FilePath.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <cstdlib>
 
 #ifdef _WIN32
  #include <windows.h>
diff -up notecase-1.6.1/src/lib/FormatIOMMLX.cpp.gcc43 notecase-1.6.1/src/lib/FormatIOMMLX.cpp
--- notecase-1.6.1/src/lib/FormatIOMMLX.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/lib/FormatIOMMLX.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -15,6 +15,7 @@
 #include "debug.h"
 #include "../config.h"
 #include "../support.h"
+#include <cstring>
 #include <stdio.h>	//fopen
 #include <glib.h>
 #include <gtk/gtk.h>
diff -up notecase-1.6.1/src/lib/FormatIOExecutable.cpp.gcc43 notecase-1.6.1/src/lib/FormatIOExecutable.cpp
--- notecase-1.6.1/src/lib/FormatIOExecutable.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/lib/FormatIOExecutable.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -12,6 +12,7 @@
 #include "debug.h"
 #include "../config.h"
 #include "../support.h"
+#include <cstring>
 #include <stdio.h>	//fopen
 #include <glib.h>
 #include <gtk/gtk.h>
diff -up notecase-1.6.1/src/lib/FormatIOGjots2.cpp.gcc43 notecase-1.6.1/src/lib/FormatIOGjots2.cpp
--- notecase-1.6.1/src/lib/FormatIOGjots2.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/lib/FormatIOGjots2.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -8,6 +8,7 @@
 
 #include "FormatIOGjots2.h"
 #include "DocumentIterator.h"
+#include <cstring>
 #include <stdio.h>	//fopen
 
 #define  DOC_PARSE_BLANK		0
diff -up notecase-1.6.1/src/lib/FormatIOEncHtml.cpp.gcc43 notecase-1.6.1/src/lib/FormatIOEncHtml.cpp
--- notecase-1.6.1/src/lib/FormatIOEncHtml.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/lib/FormatIOEncHtml.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -16,6 +16,7 @@
 #include "IOLayerFile64.h"
 #include "DocumentIterator.h"
 #include "debug.h"
+#include <cstring>
 #include <stdio.h>	//sprintf
 #include <glib.h>	// bate order macros
 
diff -up notecase-1.6.1/src/lib/HtmlParser.cpp.gcc43 notecase-1.6.1/src/lib/HtmlParser.cpp
--- notecase-1.6.1/src/lib/HtmlParser.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/lib/HtmlParser.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -11,6 +11,7 @@
 #include <glib.h>
 #include <vector>
 #include <algorithm>
+#include <cstring>
 
 void replaceall(std::string &strData, const char *szFind, const char *szReplace);
 
diff -up notecase-1.6.1/src/FindReplaceDlg.cpp.gcc43 notecase-1.6.1/src/FindReplaceDlg.cpp
--- notecase-1.6.1/src/FindReplaceDlg.cpp.gcc43	2007-07-30 23:34:10.000000000 -0400
+++ notecase-1.6.1/src/FindReplaceDlg.cpp	2008-03-27 00:18:40.000000000 -0400
@@ -16,6 +16,7 @@
 #include "TreeView.h"
 #include "support.h"
 #include "interface.h"
+#include <cstring>
 
 extern FindReplaceInfo g_objSearchInfo;
 extern GtkWidget *window1;