diff --git a/control.h b/control.h
index 6346b8a..7493b0c 100644
--- a/control.h
+++ b/control.h
@@ -1,24 +1,21 @@
-/* -*- Mode: C ; c-basic-offset: 4 -*- */
 /*
-  JACK control API
+    Copyright (C) 2008 Nedko Arnaudov
+    Copyright (C) 2008 GRAME
 
-  Copyright (C) 2008 Nedko Arnaudov
-  Copyright (C) 2008 GRAME
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 of the License.
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
+
 /**
  * @file   jack/control.h
  * @ingroup publicheader
diff --git a/intclient.h b/intclient.h
index 728de50..e6d0392 100644
--- a/intclient.h
+++ b/intclient.h
@@ -1,21 +1,20 @@
 /*
- *  Copyright (C) 2004 Jack O'Quin
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2.1 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
+    Copyright (C) 2004 Jack O'Quin
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __jack_intclient_h__
 #define __jack_intclient_h__
diff --git a/jack.h b/jack.h
index 6804478..4a87c63 100644
--- a/jack.h
+++ b/jack.h
@@ -15,7 +15,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef __jack_h__
diff --git a/jslist.h b/jslist.h
index a19e500..755b31a 100644
--- a/jslist.h
+++ b/jslist.h
@@ -19,7 +19,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef __jack_jslist_h__
diff --git a/metadata.h b/metadata.h
index 891dbd6..8dc3e9b 100644
--- a/metadata.h
+++ b/metadata.h
@@ -1,20 +1,20 @@
 /*
-  Copyright (C) 2011-2014 David Robillard
-  Copyright (C) 2013 Paul Davis
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or (at
-  your option) any later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program; if not, write to the Free Software Foundation,
-  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    Copyright (C) 2011-2014 David Robillard
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 /**
diff --git a/midiport.h b/midiport.h
index 008e7ab..b8d79ec 100644
--- a/midiport.h
+++ b/midiport.h
@@ -14,10 +14,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
-
 #ifndef __JACK_MIDIPORT_H
 #define __JACK_MIDIPORT_H
 
diff --git a/ringbuffer.h b/ringbuffer.h
index 7df7e00..4d4db80 100644
--- a/ringbuffer.h
+++ b/ringbuffer.h
@@ -15,7 +15,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef _RINGBUFFER_H
diff --git a/statistics.h b/statistics.h
index 0940ae5..3457d4a 100644
--- a/statistics.h
+++ b/statistics.h
@@ -1,22 +1,20 @@
 /*
- *  Copyright (C) 2004 Rui Nuno Capela, Lee Revell
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public License
- *  as published by the Free Software Foundation; either version 2.1
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to the Free
- *  Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- *  02111-1307, USA.
- *
- */
+    Copyright (C) 2004 Rui Nuno Capela, Lee Revell
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
 
 #ifndef __statistics_h__
 #define __statistics_h__
diff --git a/systemdeps.h b/systemdeps.h
index 242b794..c991da8 100644
--- a/systemdeps.h
+++ b/systemdeps.h
@@ -1,20 +1,19 @@
 /*
-Copyright (C) 2004-2012 Grame
+    Copyright (C) 2004-2012 Grame
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
 
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
 #ifndef __jack_systemdeps_h__
diff --git a/thread.h b/thread.h
index e8885f8..b426baa 100644
--- a/thread.h
+++ b/thread.h
@@ -14,7 +14,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef __jack_thread_h__
diff --git a/transport.h b/transport.h
index b390cb6..54b7b44 100644
--- a/transport.h
+++ b/transport.h
@@ -15,7 +15,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef __jack_transport_h__
diff --git a/types.h b/types.h
index 9090574..fa84994 100644
--- a/types.h
+++ b/types.h
@@ -15,7 +15,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef __jack_types_h__
diff --git a/uuid.h b/uuid.h
index d38a044..1fb440f 100644
--- a/uuid.h
+++ b/uuid.h
@@ -14,7 +14,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef __jack_uuid_h__
diff --git a/weakjack.h b/weakjack.h
index b8f36c2..f967149 100644
--- a/weakjack.h
+++ b/weakjack.h
@@ -14,7 +14,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef __weakjack_h__
diff --git a/weakmacros.h b/weakmacros.h
index 65224b4..de8ffc9 100644
--- a/weakmacros.h
+++ b/weakmacros.h
@@ -14,7 +14,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef __weakmacros_h__