diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h
index 6538ec37f1..a6b0e8e63b 100644
--- a/libs/ardour/ardour/midi_buffer.h
+++ b/libs/ardour/ardour/midi_buffer.h
@@ -71,11 +71,17 @@ public:
 		class iterator_base
 	{
 	public:
-		iterator_base<BufferType, EventType>(BufferType& b, samplecnt_t o)
-			: buffer(&b), offset(o) {}
+		iterator_base (BufferType& b, samplecnt_t o)
+		        : buffer (&b)
+		        , offset (o)
+		{
+		}
 
-		iterator_base<BufferType, EventType>(const iterator_base<BufferType,EventType>& o)
-			: buffer (o.buffer), offset(o.offset) {}
+		iterator_base (const iterator_base<BufferType, EventType>& o)
+		        : buffer (o.buffer)
+		        , offset (o.offset)
+		{
+		}
 
 		inline iterator_base<BufferType,EventType> operator= (const iterator_base<BufferType,EventType>& o) {
 			if (&o != this) {
diff --git a/libs/ardour/ardour/port_set.h b/libs/ardour/ardour/port_set.h
index a9aba4ca1a..413160825b 100644
--- a/libs/ardour/ardour/port_set.h
+++ b/libs/ardour/ardour/port_set.h
@@ -89,8 +89,12 @@ public:
 	private:
 		friend class PortSet;
 
-		iterator_base<PS,P>(PS& list, DataType type, size_t index)
-			: _set(list), _type(type), _index(index) {}
+		iterator_base (PS& list, DataType type, size_t index)
+		        : _set (list)
+		        , _type (type)
+		        , _index (index)
+		{
+		}
 
 		PS&      _set;
 		DataType _type; ///< Ignored if NIL (to iterator over entire set)
diff --git a/libs/lua/LuaBridge/detail/Userdata.h b/libs/lua/LuaBridge/detail/Userdata.h
index d86969d716..11e048d0e6 100644
--- a/libs/lua/LuaBridge/detail/Userdata.h
+++ b/libs/lua/LuaBridge/detail/Userdata.h
@@ -361,8 +361,8 @@ template <class T>
 class UserdataValue : public Userdata
 {
 private:
-  UserdataValue <T> (UserdataValue <T> const&);
-  UserdataValue <T> operator= (UserdataValue <T> const&);
+  UserdataValue (UserdataValue<T> const&);
+  UserdataValue<T> operator= (UserdataValue<T> const&);
 
   char m_storage [sizeof (T)];