diff -up rosegarden-1.6.1/src/base/AudioPluginInstance.cpp.gcc43 rosegarden-1.6.1/src/base/AudioPluginInstance.cpp
--- rosegarden-1.6.1/src/base/AudioPluginInstance.cpp.gcc43	2007-12-19 07:42:34.000000000 -0600
+++ rosegarden-1.6.1/src/base/AudioPluginInstance.cpp	2008-04-02 10:17:51.000000000 -0500
@@ -22,6 +22,7 @@
 #include "Instrument.h"
 
 #include <iostream>
+#include <cstring>
 
 #if (__GNUC__ < 3)
 #include <strstream>
diff -up rosegarden-1.6.1/src/base/ScriptAPI.h.gcc43 rosegarden-1.6.1/src/base/ScriptAPI.h
--- rosegarden-1.6.1/src/base/ScriptAPI.h.gcc43	2007-12-19 07:42:34.000000000 -0600
+++ rosegarden-1.6.1/src/base/ScriptAPI.h	2008-04-02 10:29:21.000000000 -0500
@@ -107,9 +107,9 @@ public:
     EventId addEvent(ScriptId id,
                      std::string type, int bar, ScriptTime time, ScriptTime duration);
 
-    void deleteEvent(ScriptId id, EventId id);
+    void deleteEvent(ScriptId id, EventId id2);
 
-    std::string getEventType(ScriptId id, EventId id);
+    std::string getEventType(ScriptId id, EventId id2);
     std::string getProperty(ScriptId id, EventId event, std::string property);
     void setProperty(ScriptId id, EventId event, std::string property, std::string value);
 
diff -up rosegarden-1.6.1/src/base/XmlExportable.cpp.gcc43 rosegarden-1.6.1/src/base/XmlExportable.cpp
--- rosegarden-1.6.1/src/base/XmlExportable.cpp.gcc43	2007-12-19 07:42:34.000000000 -0600
+++ rosegarden-1.6.1/src/base/XmlExportable.cpp	2008-04-02 10:29:47.000000000 -0500
@@ -21,6 +21,7 @@
 #include "XmlExportable.h"
 #include <iostream>
 #include <cstdlib>
+#include <cstring>
 
 namespace Rosegarden
 {
diff -up rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp.gcc43 rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp
--- rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp.gcc43	2007-12-19 07:42:35.000000000 -0600
+++ rosegarden-1.6.1/src/gui/configuration/NotationConfigurationPage.cpp	2008-04-02 10:47:16.000000000 -0500
@@ -59,6 +59,7 @@
 #include <qstringlist.h>
 #include <qtabwidget.h>
 #include <qwidget.h>
+#include <algorithm>
 
 
 namespace Rosegarden
diff -up rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp.gcc43 rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp
--- rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp.gcc43	2007-12-19 07:42:35.000000000 -0600
+++ rosegarden-1.6.1/src/gui/dialogs/KeySignatureDialog.cpp	2008-04-02 10:48:06.000000000 -0500
@@ -44,6 +44,7 @@
 #include <qvbox.h>
 #include <qwidget.h>
 #include <qcheckbox.h>
+#include <algorithm>
 
 
 namespace Rosegarden
diff -up rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp.gcc43 rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp
--- rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp.gcc43	2007-12-19 07:42:38.000000000 -0600
+++ rosegarden-1.6.1/src/gui/studio/OSCMessage.cpp	2008-04-02 10:55:09.000000000 -0500
@@ -28,6 +28,7 @@
 #include "OSCMessage.h"
 
 #include <cstdlib>
+#include <cstring>
 
 namespace Rosegarden
 {
diff -up rosegarden-1.6.1/src/sound/RingBuffer.h.gcc43 rosegarden-1.6.1/src/sound/RingBuffer.h
--- rosegarden-1.6.1/src/sound/RingBuffer.h.gcc43	2007-12-19 07:42:39.000000000 -0600
+++ rosegarden-1.6.1/src/sound/RingBuffer.h	2008-04-02 10:31:07.000000000 -0500
@@ -24,6 +24,7 @@
 
 #include <sys/types.h>
 #include <sys/mman.h>
+#include <cstring>
 
 #include "Scavenger.h"