diff -Nur audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp
--- audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp	2008-05-07 23:19:58.000000000 +0200
+++ audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp	2008-08-28 18:31:49.000000000 +0200
@@ -42,6 +42,7 @@
 
 #include <fstream>
 #include <cctype> // tolower
+#include <cstring>
 
 #include <cstring>
 
diff -Nur audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp
--- audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp	2008-05-07 23:19:58.000000000 +0200
+++ audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp	2008-08-28 18:31:49.000000000 +0200
@@ -39,6 +39,10 @@
 #include <cstring>
 #include <cstdlib>
 
+#include <cstdlib>
+#include <cstring>
+using namespace std;
+
 //#define DEBUG_PLUGIN_ADAPTER 1
 
 namespace Vamp {
diff -Nur audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
--- audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp	2008-05-07 23:19:58.000000000 +0200
+++ audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp	2008-08-28 18:31:49.000000000 +0200
@@ -37,6 +37,9 @@
 #include "PluginHostAdapter.h"
 #include <cstdlib>
 
+#include <cstdlib>
+
+
 namespace Vamp
 {
 
@@ -64,7 +67,7 @@
     std::vector<std::string> path;
     std::string envPath;
 
-    char *cpath = getenv("VAMP_PATH");
+    char *cpath = std::getenv("VAMP_PATH");
     if (cpath) envPath = cpath;
 
 #ifdef _WIN32
@@ -81,7 +84,7 @@
 
     if (envPath == "") {
         envPath = DEFAULT_VAMP_PATH;
-        char *chome = getenv("HOME");
+        char *chome = std::getenv("HOME");
         if (chome) {
             std::string home(chome);
             std::string::size_type f;