diff -Naurp dasher-4.6.1-orig/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp dasher-4.6.1/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp
--- dasher-4.6.1-orig/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp	2007-10-15 07:55:03.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp	2008-02-26 22:24:14.000000000 -0600
@@ -25,6 +25,7 @@
 //#include "stdafx.h"
 #include "CTWLanguageModel.h"
 #include <math.h> // not in use anymore? needed it for log
+#include <cstring>
 
 using namespace Dasher;
 
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/Alphabet/AlphIO.cpp dasher-4.6.1/Src/DasherCore/Alphabet/AlphIO.cpp
--- dasher-4.6.1-orig/Src/DasherCore/Alphabet/AlphIO.cpp	2007-10-15 07:55:03.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/Alphabet/AlphIO.cpp	2008-02-26 22:30:28.000000000 -0600
@@ -22,6 +22,7 @@
 #include "AlphIO.h"
 
 #include <iostream>
+#include <cstring>
 
 using namespace Dasher;
 using namespace std;
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/ColourIO.cpp dasher-4.6.1/Src/DasherCore/ColourIO.cpp
--- dasher-4.6.1-orig/Src/DasherCore/ColourIO.cpp	2007-10-15 07:55:00.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/ColourIO.cpp	2008-02-26 22:33:08.000000000 -0600
@@ -5,6 +5,8 @@
 #include "../Common/Common.h"
 
 #include "ColourIO.h"
+#include <cstring>
+
 using namespace Dasher;
 using namespace std;
 //using namespace expat;
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/ControlManager.cpp dasher-4.6.1/Src/DasherCore/ControlManager.cpp
--- dasher-4.6.1-orig/Src/DasherCore/ControlManager.cpp	2007-10-15 07:55:00.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/ControlManager.cpp	2008-02-26 22:34:46.000000000 -0600
@@ -21,6 +21,7 @@
 #include "../Common/Common.h"
 
 #include "ControlManager.h"
+#include <cstring>
 
 using namespace Dasher;
 using namespace std;
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/ConversionManager.cpp dasher-4.6.1/Src/DasherCore/ConversionManager.cpp
--- dasher-4.6.1-orig/Src/DasherCore/ConversionManager.cpp	2007-10-15 07:55:00.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/ConversionManager.cpp	2008-02-26 22:36:39.000000000 -0600
@@ -31,6 +31,7 @@
 #include <string>
 #include <vector>
 #include <stdlib.h>
+#include <cstring>
 
 using namespace Dasher;
 
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/DasherModel.cpp dasher-4.6.1/Src/DasherCore/DasherModel.cpp
--- dasher-4.6.1-orig/Src/DasherCore/DasherModel.cpp	2007-10-15 07:55:00.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/DasherModel.cpp	2008-02-26 22:38:47.000000000 -0600
@@ -21,6 +21,7 @@
 #include "../Common/Common.h"
 
 #include <iostream>
+#include <cstring>
 #include "../Common/Random.h"
 #include "DasherModel.h"
 #include "DasherView.h"
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/FileLogger.cpp dasher-4.6.1/Src/DasherCore/FileLogger.cpp
--- dasher-4.6.1-orig/Src/DasherCore/FileLogger.cpp	2007-10-15 07:55:01.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/FileLogger.cpp	2008-02-26 22:41:49.000000000 -0600
@@ -1,6 +1,7 @@
 
 #include "../Common/Common.h"
 
+#include <cstring>
 #include "FileLogger.h"
 
 // Track memory leaks on Windows to the line that new'd the memory
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/TimeSpan.cpp dasher-4.6.1/Src/DasherCore/TimeSpan.cpp
--- dasher-4.6.1-orig/Src/DasherCore/TimeSpan.cpp	2007-10-15 07:55:01.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/TimeSpan.cpp	2008-02-26 22:43:30.000000000 -0600
@@ -2,6 +2,7 @@
 #include "../Common/Common.h"
 
 #include "TimeSpan.h"
+#include <cstring>
 
 #ifdef _WIN32
 #include <sys/timeb.h>
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/UserLog.cpp dasher-4.6.1/Src/DasherCore/UserLog.cpp
--- dasher-4.6.1-orig/Src/DasherCore/UserLog.cpp	2007-10-15 07:55:02.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/UserLog.cpp	2008-02-26 22:45:20.000000000 -0600
@@ -2,6 +2,7 @@
 
 #include "UserLog.h"
 #include <fstream>
+#include <cstring>
 
 #ifdef _WIN32
 #include <sys/timeb.h>
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/UserLogTrial.cpp dasher-4.6.1/Src/DasherCore/UserLogTrial.cpp
--- dasher-4.6.1-orig/Src/DasherCore/UserLogTrial.cpp	2007-10-15 07:55:02.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/UserLogTrial.cpp	2008-02-26 22:47:20.000000000 -0600
@@ -1,6 +1,7 @@
 #include "../Common/Common.h"
 
 #include "UserLogTrial.h"
+#include <cstring>
 
 // Track memory leaks on Windows to the line that new'd the memory
 #ifdef _WIN32
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/XMLUtil.cpp dasher-4.6.1/Src/DasherCore/XMLUtil.cpp
--- dasher-4.6.1-orig/Src/DasherCore/XMLUtil.cpp	2007-10-15 07:55:02.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/XMLUtil.cpp	2008-02-26 22:46:49.000000000 -0600
@@ -2,6 +2,7 @@
 #include "../Common/Common.h"
 
 #include "XMLUtil.h"
+#include <cstring>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff -Naurp dasher-4.6.1-orig/Src/DasherCore/SettingsStore.cpp dasher-4.6.1/Src/DasherCore/SettingsStore.cpp
--- dasher-4.6.1-orig/Src/DasherCore/SettingsStore.cpp	2007-10-15 07:55:02.000000000 -0600
+++ dasher-4.6.1/Src/DasherCore/SettingsStore.cpp	2008-02-26 22:49:30.000000000 -0600
@@ -13,6 +13,7 @@
 #include "EventHandler.h"
 
 #include <iostream>
+#include <cstdlib>
 
 using namespace std;
 
diff -Naurp dasher-4.6.1-orig/Src/Gtk2/DasherAppSettings.cpp dasher-4.6.1/Src/Gtk2/DasherAppSettings.cpp
--- dasher-4.6.1-orig/Src/Gtk2/DasherAppSettings.cpp	2007-10-15 07:55:06.000000000 -0600
+++ dasher-4.6.1/Src/Gtk2/DasherAppSettings.cpp	2008-02-26 22:51:41.000000000 -0600
@@ -16,6 +16,8 @@
 #include "dasher.h"
 #include "GtkDasherControl.h"
 
+#include <cstring>
+
 // FIXME - should really do something to make this a singleton class
 
 // TODO: Rename this file to fit in with naming conventions
diff -Naurp dasher-4.6.1-orig/Src/Gtk2/Preferences.cpp dasher-4.6.1/Src/Gtk2/Preferences.cpp
--- dasher-4.6.1-orig/Src/Gtk2/Preferences.cpp	2007-10-15 07:55:06.000000000 -0600
+++ dasher-4.6.1/Src/Gtk2/Preferences.cpp	2008-02-26 22:52:07.000000000 -0600
@@ -2,6 +2,7 @@
 
 #include <glib/gi18n.h>
 #include <libintl.h>
+#include <cstring>
 
 #include "../Common/Common.h"
 #include "DasherTypes.h"
diff -Naurp dasher-4.6.1-orig/Src/Gtk2/dasher_action_speech.cpp dasher-4.6.1/Src/Gtk2/dasher_action_speech.cpp
--- dasher-4.6.1-orig/Src/Gtk2/dasher_action_speech.cpp	2008-02-26 22:27:46.000000000 -0600
+++ dasher-4.6.1/Src/Gtk2/dasher_action_speech.cpp	2008-02-26 22:55:29.000000000 -0600
@@ -8,6 +8,7 @@
 #include <glib/gi18n.h>
 #include <gnome-speech/gnome-speech.h>
 #include <libbonobo.h>
+#include <cstring>
 //#include <libintl.h>
 //#include <string.h>
 
diff -Naurp dasher-4.6.1-orig/Src/Gtk2/dasher_editor_internal.cpp dasher-4.6.1/Src/Gtk2/dasher_editor_internal.cpp
--- dasher-4.6.1-orig/Src/Gtk2/dasher_editor_internal.cpp	2008-02-26 22:27:46.000000000 -0600
+++ dasher-4.6.1/Src/Gtk2/dasher_editor_internal.cpp	2008-02-26 22:57:15.000000000 -0600
@@ -1,5 +1,6 @@
 #include "config.h"
 
+#include <cstring>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 /* TODO: r4epair gnome libs flags (or get rid of entirely) */
diff -Naurp dasher-4.6.1-orig/Src/Gtk2/dasher_main.cpp dasher-4.6.1/Src/Gtk2/dasher_main.cpp
--- dasher-4.6.1-orig/Src/Gtk2/dasher_main.cpp	2008-02-26 22:27:46.000000000 -0600
+++ dasher-4.6.1/Src/Gtk2/dasher_main.cpp	2008-02-26 22:58:41.000000000 -0600
@@ -1,5 +1,6 @@
 #include "config.h"
 
+#include <cstring>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <glade/glade.h>
diff -Naurp dasher-4.6.1-orig/Src/Gtk2/DasherControl.cpp dasher-4.6.1/Src/Gtk2/DasherControl.cpp
--- dasher-4.6.1-orig/Src/Gtk2/DasherControl.cpp	2007-10-15 07:55:05.000000000 -0600
+++ dasher-4.6.1/Src/Gtk2/DasherControl.cpp	2008-02-26 23:00:13.000000000 -0600
@@ -2,6 +2,7 @@
 #include "../../config.h"
 
 #include <iostream>
+#include <cstring>
 #include "DasherControl.h"
 #include "Timer.h"
 #include "../DasherCore/Event.h"
diff -Naurp dasher-4.6.1-orig/Src/Gtk2/KeyboardHelper.cpp dasher-4.6.1/Src/Gtk2/KeyboardHelper.cpp
--- dasher-4.6.1-orig/Src/Gtk2/KeyboardHelper.cpp	2007-10-15 07:55:05.000000000 -0600
+++ dasher-4.6.1/Src/Gtk2/KeyboardHelper.cpp	2008-02-26 23:01:19.000000000 -0600
@@ -7,6 +7,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
+#include <cstring>
 
 CKeyboardHelper::CKeyboardHelper(DasherAppSettings *pAppSettings) {
   m_pAppSettings = pAppSettings;