diff --git a/common/intclient.h b/common/intclient.h
index 8e87f6d8..7fecd7aa 100644
--- a/common/intclient.h
+++ b/common/intclient.h
@@ -26,7 +26,7 @@ extern "C"
 {
 #endif
 
-    //#include <jack/types.h>
+//#include <jack/types.h>
 #include "types.h"
 
     /**
diff --git a/common/jack.h b/common/jack.h
index 1fb97c8e..0789da6c 100644
--- a/common/jack.h
+++ b/common/jack.h
@@ -34,10 +34,10 @@ extern "C"
 	#include <pthread.h>
 #endif
 
-    /*
-    #include <jack/types.h>
-    #include <jack/transport.h>
-    */
+/*
+#include <jack/types.h>
+#include <jack/transport.h>
+*/
 
 #include "types.h"
 #include "transport.h"
diff --git a/common/statistics.h b/common/statistics.h
index 23ea4b66..04c4eb57 100644
--- a/common/statistics.h
+++ b/common/statistics.h
@@ -27,7 +27,7 @@ extern "C"
 {
 #endif
 
-    //#include <jack/types.h>
+//#include <jack/types.h>
 #include "types.h"
 
     /**
diff --git a/common/transport.h b/common/transport.h
index 877f8a68..a3ff0865 100644
--- a/common/transport.h
+++ b/common/transport.h
@@ -27,7 +27,7 @@ extern "C"
 {
 #endif
 
-    //#include <jack/types.h>
+//#include <jack/types.h>
 #include "types.h"
 
     /**
diff --git a/common/transport_types.h b/common/transport_types.h
index 74aa94ec..54337935 100644
--- a/common/transport_types.h
+++ b/common/transport_types.h
@@ -27,7 +27,6 @@ extern "C"
 {
 #endif
 
-    //#include <jack/types.h>
 #include "types.h"
 
     /**
diff --git a/example-clients/echo.cpp b/example-clients/echo.cpp
index 153d2fc9..1244be5c 100644
--- a/example-clients/echo.cpp
+++ b/example-clients/echo.cpp
@@ -47,11 +47,6 @@ inline void *aligned_calloc(size_t nmemb, size_t size)
     return (void*)((unsigned)(calloc((nmemb*size) + 15, sizeof(char))) + 15 & 0xfffffff0);
 }
 
-
-
-
-
-
 /******************************************************************************
 *******************************************************************************
  
@@ -114,8 +109,7 @@ struct param
     float fMax;
     param(float* z, float a, float b) : fZone(z), fMin(a), fMax(b)
     {}
-}
-;
+};
 
 class CMDUI : public UI
 {
@@ -289,15 +283,12 @@ class dsp
         virtual void compute(int len, float** inputs, float** outputs) = 0;
         virtual void conclude()
         {}
-}
-;
-
+};
 
 //----------------------------------------------------------------------------
 // 	FAUST generated code
 //----------------------------------------------------------------------------
 
-
 class mydsp : public dsp
 {
     private:
diff --git a/example-clients/freeverb.cpp b/example-clients/freeverb.cpp
index 6053877c..53c4e0d3 100644
--- a/example-clients/freeverb.cpp
+++ b/example-clients/freeverb.cpp
@@ -47,11 +47,6 @@ inline void *aligned_calloc(size_t nmemb, size_t size)
     return (void*)((unsigned)(calloc((nmemb*size) + 15, sizeof(char))) + 15 & 0xfffffff0);
 }
 
-
-
-
-
-
 /******************************************************************************
 *******************************************************************************
  
@@ -114,8 +109,7 @@ struct param
     float fMax;
     param(float* z, float a, float b) : fZone(z), fMin(a), fMax(b)
     {}
-}
-;
+};
 
 class CMDUI : public UI
 {
@@ -290,15 +284,13 @@ class dsp
         virtual void compute(int len, float** inputs, float** outputs) = 0;
         virtual void conclude()
         {}
-}
-;
+};
 
 
 //----------------------------------------------------------------------------
 // 	FAUST generated code
 //----------------------------------------------------------------------------
 
-
 class mydsp : public dsp
 {
     private:
@@ -734,8 +726,6 @@ class mydsp : public dsp
         }
 };
 
-
-
 mydsp	DSP;
 
 
@@ -748,7 +738,6 @@ mydsp	DSP;
 *******************************************************************************/
 
 
-
 //----------------------------------------------------------------------------
 // 	number of input and output channels
 //----------------------------------------------------------------------------
diff --git a/windows/libportaudio.a b/macosx/libportaudio.a
similarity index 100%
rename from windows/libportaudio.a
rename to macosx/libportaudio.a