diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 240448a78b..2c1e8b01c1 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -230,7 +230,7 @@ class Diskstream : public SessionObject, public PublicDiskstream
 
 	virtual int use_pending_capture_data (XMLNode& node) = 0;
 
-	virtual void check_record_status (framepos_t transport_frame, nframes_t nframes, bool can_record);
+	virtual void check_record_status (framepos_t transport_frame, bool can_record);
 	virtual void prepare_record_status (framepos_t /*capture_start_frame*/) {}
 	virtual void set_align_style_from_io() {}
 	virtual void setup_destructive_playlist () {}
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index f8bd4f698f..c88080a3d5 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -437,7 +437,7 @@ AudioDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool ca
 		return 0;
 	}
 
-	check_record_status (transport_frame, nframes, can_record);
+	check_record_status (transport_frame, can_record);
 
 	if (nframes == 0) {
 		return 0;
@@ -474,7 +474,7 @@ AudioDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool ca
         }
         
         OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
-        
+
         calculate_record_range (ot, transport_frame, nframes, rec_nframes, rec_offset);
         
         if (rec_nframes && !was_recording) {
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 179cf2b2a9..2c1877b7b5 100644
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -506,7 +506,7 @@ Diskstream::move_processor_automation (boost::weak_ptr<Processor> p, list< Evora
 }
 
 void
-Diskstream::check_record_status (framepos_t transport_frame, nframes_t /*nframes*/, bool can_record)
+Diskstream::check_record_status (framepos_t transport_frame, bool can_record)
 {
 	int possibly_recording;
 	int rolling;
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 52b93015c8..932b9bb2c9 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -498,7 +498,7 @@ MidiDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool can
 
         playback_distance = 0;
 
-	check_record_status (transport_frame, nframes, can_record);
+	check_record_status (transport_frame, can_record);
 
 	nominally_recording = (can_record && re);
 
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 119ad280fd..638b6fa55d 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -31,6 +31,7 @@
 #include "pbd/failed_constructor.h"
 #include "pbd/stateful_diff_command.h"
 #include "pbd/xml++.h"
+#include "pbd/stacktrace.h"
 
 #include "ardour/debug.h"
 #include "ardour/playlist.h"
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index ff1f6f78ed..46517e1752 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -266,7 +266,7 @@ Track::no_roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 		*/
 	}
 
-	_diskstream->check_record_status (start_frame, nframes, can_record);
+	_diskstream->check_record_status (start_frame, can_record);
 
 	bool send_silence;