--- stk-4.3.1.orig/projects/effects/effects.cpp	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/effects/effects.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -15,6 +15,7 @@
 #include <signal.h>
 #include <iostream>
 #include <algorithm>
+#include <cstring>
 using std::min;
 
 void usage(void) {
--- stk-4.3.1.orig/projects/examples/duplex.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/duplex.cpp	2008-06-16 23:56:00.000000000 +0200
@@ -10,6 +10,8 @@
 
 #include "RtAudio.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 /*
 typedef signed long  MY_TYPE;
--- stk-4.3.1.orig/projects/examples/foursine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/foursine.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/grains.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/grains.cpp	2008-06-16 23:57:46.000000000 +0200
@@ -4,6 +4,7 @@
 
 #include "Granulate.h"
 #include "RtAudio.h"
+#include <cstdlib>
 
 // This tick() function handles sample computation only.  It will be
 // called automatically when the system needs a new buffer of audio
--- stk-4.3.1.orig/projects/examples/inetIn.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/inetIn.cpp	2008-06-16 23:56:18.000000000 +0200
@@ -30,6 +30,7 @@
 
 #include "InetWvIn.h"
 #include "RtWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/inetOut.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/inetOut.cpp	2008-06-16 23:56:33.000000000 +0200
@@ -19,6 +19,7 @@
 
 #include "FileWvIn.h"
 #include "InetWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/midiprobe.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/midiprobe.cpp	2008-06-16 23:55:29.000000000 +0200
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include "RtMidi.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/play.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/play.cpp	2008-06-16 23:54:54.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include <signal.h>
 #include <iostream>
+#include <cstdlib>
 
 // Eewww ... global variables! :-)
 bool done;
--- stk-4.3.1.orig/projects/examples/playsmf.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/playsmf.cpp	2008-06-16 23:57:25.000000000 +0200
@@ -7,7 +7,8 @@
 
 #include "MidiFileIn.h"
 #include "RtMidi.h"
-#include <signal.h>
+#include <csignal>
+#include <cstdlib>
 
 bool done = false;
 static void finish(int ignore){ done = true; }
--- stk-4.3.1.orig/projects/examples/record.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/record.cpp	2008-06-16 23:55:10.000000000 +0200
@@ -24,6 +24,7 @@
 
 #include "RtWvIn.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 void usage( void ) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/rtsine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/rtsine.cpp	2008-06-16 23:53:54.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "SineWave.h"
 #include "RtWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/examples/sine.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/sine.cpp	2008-06-16 23:54:20.000000000 +0200
@@ -14,6 +14,7 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 void usage(void) {
   // Error function in case of incorrect command-line
--- stk-4.3.1.orig/projects/examples/sineosc.cpp	2007-12-06 01:58:34.000000000 +0100
+++ stk-4.3.1/projects/examples/sineosc.cpp	2008-06-16 23:54:38.000000000 +0200
@@ -2,6 +2,7 @@
 
 #include "WaveLoop.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 int main()
 {
--- stk-4.3.1.orig/projects/ragamatic/ragamat.cpp	2007-12-07 07:25:42.000000000 +0100
+++ stk-4.3.1/projects/ragamatic/ragamat.cpp	2008-06-16 23:59:13.000000000 +0200
@@ -10,9 +10,11 @@
 #include "Messager.h"
 #include "RtAudio.h"
 
-#include <signal.h>
+#include <csignal>
 #include <iostream>
 #include <algorithm>
+#include <cstdlib>
+#include <cstring>
 using std::min;
 
 StkFloat float_random(StkFloat max) // Return random float between 0.0 and max
--- stk-4.3.1.orig/src/FileRead.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/FileRead.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -33,6 +33,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <cmath>
+#include <cstring>
 
 FileRead :: FileRead()
   : fd_(0)
--- stk-4.3.1.orig/src/FileWrite.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/FileWrite.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include "FileWrite.h"
 #include <cmath>
+#include <cstring>
 
 const FileWrite::FILE_TYPE FileWrite :: FILE_RAW = 1;
 const FileWrite::FILE_TYPE FileWrite :: FILE_WAV = 2;
--- stk-4.3.1.orig/src/Messager.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/Messager.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -34,6 +34,7 @@
 
 #include "Messager.h"
 #include <iostream>
+#include <algorithm>
 #include "SKINI.msg"
 
 static const int STK_FILE   = 0x1;
--- stk-4.3.1.orig/src/MidiFileIn.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/MidiFileIn.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -17,6 +17,7 @@
 
 #include "MidiFileIn.h"
 #include <iostream>
+#include <cstring>
 
 MidiFileIn :: MidiFileIn( std::string fileName )
 {
--- stk-4.3.1.orig/src/Modal.cpp	2007-12-06 01:58:27.000000000 +0100
+++ stk-4.3.1/src/Modal.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -12,6 +12,7 @@
 /***************************************************/
 
 #include "Modal.h"
+#include <cstdlib>
 
 Modal :: Modal(unsigned int modes)
   : nModes_(modes)
--- stk-4.3.1.orig/src/RtAudio.cpp	2007-12-07 09:04:43.000000000 +0100
+++ stk-4.3.1/src/RtAudio.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -42,6 +42,9 @@
 
 #include "RtAudio.h"
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
 
 // Static variable definitions.
 const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
--- stk-4.3.1.orig/src/Shakers.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/Shakers.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -54,6 +54,8 @@
 
 #include "Stk.h"
 #include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 int my_random(int max) //  Return Random Int Between 0 and max
 {
--- stk-4.3.1.orig/src/Skini.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/Skini.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -25,6 +25,7 @@
 
 #include "Skini.h"
 #include "SKINI.tbl"
+#include <cstdlib>
 
 Skini :: Skini()
 {
--- stk-4.3.1.orig/src/Stk.cpp	2007-12-06 01:58:28.000000000 +0100
+++ stk-4.3.1/src/Stk.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -51,6 +51,7 @@
 /***************************************************/
 
 #include "Stk.h"
+#include <cstdlib>
 
 StkFloat Stk :: srate_ = (StkFloat) SRATE;
 std::string Stk :: rawwavepath_ = RAWWAVE_PATH;
--- stk-4.3.1.orig/src/TcpClient.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/TcpClient.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -24,6 +24,7 @@
 /***************************************************/
 
 #include "TcpClient.h"
+#include <cstring>
 
 TcpClient :: TcpClient(int port, std::string hostname )
 {
--- stk-4.3.1.orig/src/UdpSocket.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/UdpSocket.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -22,6 +22,7 @@
 /***************************************************/
 
 #include "UdpSocket.h"
+#include <cstring>
 
 UdpSocket :: UdpSocket(int port )
 {
--- stk-4.3.1.orig/src/VoicForm.cpp	2007-12-06 01:58:26.000000000 +0100
+++ stk-4.3.1/src/VoicForm.cpp	2008-06-16 23:52:34.000000000 +0200
@@ -30,6 +30,7 @@
 #include "SKINI.msg"
 
 #include <cmath>
+#include <cstring>
 
 VoicForm :: VoicForm() : Instrmnt()
 {
diff -up stk-4.3.1/projects/demo/Md2Skini.cpp.orig stk-4.3.1/projects/demo/Md2Skini.cpp
--- stk-4.3.1/projects/demo/Md2Skini.cpp.orig	2007-12-06 01:58:33.000000000 +0100
+++ stk-4.3.1/projects/demo/Md2Skini.cpp	2008-08-07 20:45:08.000000000 +0200
@@ -12,7 +12,7 @@
 
 #include "RtMidi.h"
 #include "SKINI.msg"
-#include <stdio.h>
+#include <cstdlib>
 #include <iostream>
 #include <string>