diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 1b937dad7d..3cf3ef83b7 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1469,7 +1469,7 @@ Editor::update_punch_range_view ()
 
 		if (_session->config.get_punch_in()) {
 			transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start()));
-			transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (JACK_MAX_FRAMES));
+			transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (max_framepos));
 		} else {
 			transport_punch_range_rect->set_x0 (0);
 			transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : v.width ());
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 9a1af4b577..f3b76e9310 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -32,7 +32,6 @@
 #include <gtkmm/box.h>
 #include <gtkmm/window.h>
 #include <gtkmm/actiongroup.h>
-#include <jack/types.h>
 #include <sigc++/signal.h>
 
 #include "evoral/types.hpp"