minor C++ include issues, debug out removed and bump to 2.6

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3920 d708f5d6-7413-0410-9779-e7cbd77b26cf

11 files changed, 14 insertions, 4 deletions

diff --git a/libs/midi++2/midi.cc b/libs/midi++2/midi.cc
index 3117698d01..89d74b1b31 100644
--- a/libs/midi++2/midi.cc
+++ b/libs/midi++2/midi.cc
@@ -18,7 +18,6 @@
     $Id$
 */
 
-#include <string>
 #include <cstring>
 #include <cstdlib>
 #include <midi++/types.h>
diff --git a/libs/midi++2/midiparser.cc b/libs/midi++2/midiparser.cc
index 36aa1a99cb..dcf591898c 100644
--- a/libs/midi++2/midiparser.cc
+++ b/libs/midi++2/midiparser.cc
@@ -24,7 +24,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <unistd.h>
-#include <string>
+#include <cstring>
 #include <iostream>
 #include <iterator>
 
diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc
index 13f5221929..46f71dc23d 100644
--- a/libs/midi++2/mtc.cc
+++ b/libs/midi++2/mtc.cc
@@ -18,10 +18,9 @@
     $Id$
 */
 
-#include <cstring>
 #include <cstdlib>
 #include <unistd.h>
-#include <string>
+#include <cstring>
 #include <iostream>
 
 #include <midi++/types.h>
diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc
index 6cefd7bf39..355e606d7e 100644
--- a/libs/pbd/mountpoint.cc
+++ b/libs/pbd/mountpoint.cc
@@ -19,6 +19,7 @@
 */
 
 #include <cstdio>
+#include <cstring>
 #include <string>
 #include <cstring>
 #include <limits.h>
diff --git a/libs/rubberband/src/FFT.cpp b/libs/rubberband/src/FFT.cpp
index 5a655efc55..98201350a2 100644
--- a/libs/rubberband/src/FFT.cpp
+++ b/libs/rubberband/src/FFT.cpp
@@ -24,6 +24,8 @@
 #include <fftw3.h>
 #endif
 
+#include <cstdlib>
+
 #ifdef USE_KISSFFT
 #include "bsd-3rdparty/kissfft/kiss_fftr.h"
 #endif
diff --git a/libs/rubberband/src/StretchCalculator.cpp b/libs/rubberband/src/StretchCalculator.cpp
index 61dc611033..1541759762 100644
--- a/libs/rubberband/src/StretchCalculator.cpp
+++ b/libs/rubberband/src/StretchCalculator.cpp
@@ -14,6 +14,7 @@
 
 #include "StretchCalculator.h"
 
+#include <algorithm>
 #include <math.h>
 #include <algorithm>
 #include <iostream>
diff --git a/libs/rubberband/src/StretcherProcess.cpp b/libs/rubberband/src/StretcherProcess.cpp
index 7c3f1e781f..59f678bf6e 100644
--- a/libs/rubberband/src/StretcherProcess.cpp
+++ b/libs/rubberband/src/StretcherProcess.cpp
@@ -21,6 +21,7 @@
 #include "Resampler.h"
 #include "Profiler.h"
 
+#include <cstring>
 #include <cassert>
 #include <cmath>
 #include <set>
diff --git a/libs/rubberband/src/Thread.cpp b/libs/rubberband/src/Thread.cpp
index 98f6e3b445..679115eb52 100644
--- a/libs/rubberband/src/Thread.cpp
+++ b/libs/rubberband/src/Thread.cpp
@@ -18,6 +18,7 @@
 #include <iostream>
 #include <cstdlib>
 
+#include <cstdlib>
 #include <sys/time.h>
 #include <time.h>
 
diff --git a/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp b/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp
index 63cbfecfd1..ff02b87b75 100644
--- a/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp
+++ b/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp
@@ -38,6 +38,9 @@
 #include <cstdlib>
 #include "PluginAdapter.h"
 
+#include <cstdlib>
+#include <cstring>
+
 //#define DEBUG_PLUGIN_ADAPTER 1
 
 
diff --git a/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp b/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp
index 334c11103c..4729a6223c 100644
--- a/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp
+++ b/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp
@@ -37,6 +37,8 @@
 #include <cstdlib>
 #include "PluginHostAdapter.h"
 
+#include <cstdlib>
+
 namespace Vamp
 {
 
diff --git a/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp b/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp
index 4ed32d842c..e9d75ee181 100644
--- a/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp
+++ b/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp
@@ -44,6 +44,7 @@
 #include <cstring>
 #include <fstream>
 #include <cctype> // tolower
+#include <cstring>
 
 #ifdef _WIN32