diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h
index f3808ae140..27238e5897 100644
--- a/libs/ardour/ardour/graph.h
+++ b/libs/ardour/ardour/graph.h
@@ -1,5 +1,6 @@
 /*
     Copyright (C) 2010 Paul Davis
+    Copyright (C) 2017 Robin Gareus <robin@gareus.org>
     Author: Torben Hohn
 
     This program is free software; you can redistribute it and/or modify
@@ -79,7 +80,7 @@ protected:
 	virtual void session_going_away ();
 
 private:
-	volatile bool        _threads_active;
+	volatile bool _threads_active;
 
 	void reset_thread_list ();
 	void drop_threads ();
@@ -110,25 +111,26 @@ private:
 
 	bool _graph_empty;
 
-	// chain swapping
-	Glib::Threads::Mutex  _swap_mutex;
-        Glib::Threads::Cond   _cleanup_cond;
+	/* chain swapping */
+	Glib::Threads::Mutex _swap_mutex;
+	Glib::Threads::Cond  _cleanup_cond;
+
 	volatile int _current_chain;
 	volatile int _pending_chain;
 	volatile int _setup_chain;
 
-	// parameter caches.
+	/* parameter caches */
 	pframes_t   _process_nframes;
 	samplepos_t _process_start_sample;
 	samplepos_t _process_end_sample;
-	bool	      _process_can_record;
-	bool	      _process_non_rt_pending;
+	bool        _process_can_record;
+	bool        _process_non_rt_pending;
 
 	bool _process_noroll;
 	int  _process_retval;
 	bool _process_need_butler;
 
-	// enginer / thread connection
+	/* engine / thread connection */
 	PBD::ScopedConnectionList engine_connections;
 	void engine_stopped ();
 };
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index cfc74185dd..0a40c0bf66 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -90,18 +90,18 @@ public:
 	void ensure_disk_file (const Lock& lock);
 
 	samplecnt_t read_unlocked (const Lock&                    lock,
-	                          Evoral::EventSink<samplepos_t>& dst,
-	                          samplepos_t                     position,
-	                          samplepos_t                     start,
-	                          samplecnt_t                     cnt,
-	                          Evoral::Range<samplepos_t>*     loop_range,
-	                          MidiStateTracker*               tracker,
-	                          MidiChannelFilter*              filter) const;
+	                           Evoral::EventSink<samplepos_t>& dst,
+	                           samplepos_t                     position,
+	                           samplepos_t                     start,
+	                           samplecnt_t                     cnt,
+	                           Evoral::Range<samplepos_t>*     loop_range,
+	                           MidiStateTracker*               tracker,
+	                           MidiChannelFilter*              filter) const;
 
 	samplecnt_t write_unlocked (const Lock&                 lock,
-	                           MidiRingBuffer<samplepos_t>& src,
-	                           samplepos_t                  position,
-	                           samplecnt_t                  cnt);
+	                            MidiRingBuffer<samplepos_t>& src,
+	                            samplepos_t                  position,
+	                            samplecnt_t                  cnt);
 
 };