diff -Nurd cmt/src/analogue.cpp cmt-patched/src/analogue.cpp
--- cmt/src/analogue.cpp	2001-02-17 06:50:07.000000000 -0500
+++ cmt-patched/src/analogue.cpp	2009-08-22 23:15:49.000000000 -0400
@@ -24,7 +24,7 @@
 
 /*****************************************************************************/
 
-#include <malloc.h>
+#include <unistd.h>
 #include <math.h>
 #include <stdlib.h>
 #include "cmt.h"
diff -Nurd cmt/src/canyondelay.cpp cmt-patched/src/canyondelay.cpp
--- cmt/src/canyondelay.cpp	2000-11-04 06:39:53.000000000 -0500
+++ cmt-patched/src/canyondelay.cpp	2009-08-22 23:15:49.000000000 -0400
@@ -25,7 +25,7 @@
 /*****************************************************************************/
 
 
-#include <malloc.h>
+#include <unistd.h>
 #include <math.h>
 #include "cmt.h"
 
diff -Nurd cmt/src/lofi.cpp cmt-patched/src/lofi.cpp
--- cmt/src/lofi.cpp	2001-09-17 18:15:46.000000000 -0400
+++ cmt-patched/src/lofi.cpp	2009-08-22 23:15:49.000000000 -0400
@@ -24,7 +24,7 @@
 
 /*****************************************************************************/
 
-#include <malloc.h>
+#include <unistd.h>
 #include <math.h>
 #include <stdlib.h>
 #include "cmt.h"
diff -Nurd cmt/src/makefile cmt-patched/src/makefile
--- cmt/src/makefile	2007-11-06 05:25:34.000000000 -0500
+++ cmt-patched/src/makefile	2009-08-22 23:16:39.000000000 -0400
@@ -11,7 +11,7 @@
 # GENERAL
 #
 
-CFLAGS		=	$(INCLUDES) -Wall -O3 -fPIC
+CFLAGS		=	$(INCLUDES) -Wall -O3 -fPIC -fno-common
 CXXFLAGS	=	$(CFLAGS)
 PLUGIN_LIB	=	../plugins/cmt.so
 
@@ -66,25 +66,13 @@
 targets:	$(PLUGIN_LIB)
 
 $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
-	$(CXX)	-shared							\
+	$(CXX)	-bundle -L@PREFIX@/lib -ldl				\
 		-o $(PLUGIN_LIB)					\
 		$(PLUGIN_OBJECTS)					
 
 install:	$(PLUGIN_LIB)
-	-strip $(PLUGIN_LIB)
 	cp $(PLUGIN_LIB) $(INSTALL_PLUGINS_DIR)
 
-test:	/tmp/test.wav ../../ladspa_sdk/snd/noise.wav always
-	@echo ---------------------------------------------
-	@echo First listen to the white noise input signal:
-	@echo ---------------------------------------------
-	play ../../ladspa_sdk/snd/noise.wav
-	@echo -------------------------
-	@echo Compare to plugin output.
-	@echo -------------------------
-	@echo Should be a noise band around 6000Hz, repeated quietly after 1s.
-	play /tmp/test.wav
-
 /tmp/test.wav:	$(PLUGIN_LIB) ../../ladspa_sdk/snd/noise.wav
 	analyseplugin $(PLUGIN_LIB)
 	echo;analyseplugin -l $(PLUGIN_LIB);echo
diff -Nurd cmt/src/phasemod.cpp cmt-patched/src/phasemod.cpp
--- cmt/src/phasemod.cpp	2001-09-17 18:15:46.000000000 -0400
+++ cmt-patched/src/phasemod.cpp	2009-08-22 23:15:49.000000000 -0400
@@ -24,7 +24,7 @@
 
 /*****************************************************************************/
 
-#include <malloc.h>
+#include <unistd.h>
 #include <math.h>
 #include <stdlib.h>
 #include "cmt.h"
diff -Nurd cmt/src/syndrum.cpp cmt-patched/src/syndrum.cpp
--- cmt/src/syndrum.cpp	2002-12-19 15:54:36.000000000 -0500
+++ cmt-patched/src/syndrum.cpp	2009-08-22 23:15:49.000000000 -0400
@@ -24,7 +24,7 @@
 
 /*****************************************************************************/
 
-#include <malloc.h>
+#include <unistd.h>
 #include <math.h>
 #include "cmt.h"
 
diff -Nurd cmt/src/vcf303.cpp cmt-patched/src/vcf303.cpp
--- cmt/src/vcf303.cpp	2000-11-04 06:39:53.000000000 -0500
+++ cmt-patched/src/vcf303.cpp	2009-08-22 23:15:49.000000000 -0400
@@ -26,7 +26,7 @@
 /*****************************************************************************/
 
 
-#include <malloc.h>
+#include <unistd.h>
 #include <math.h>
 #include "cmt.h"