diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 971e728db6..180f88bd88 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -21,8 +21,6 @@
 #include "gtk2ardour-config.h"
 #endif
 
-#include <jack/types.h>
-
 #include "gtkmm2ext/utils.h"
 
 #include "ardour/profile.h"
@@ -64,7 +62,7 @@ using namespace Editing;
 
 /* XXX this is a hack. it ought to be the maximum value of an framepos_t */
 
-const double max_canvas_coordinate = (double) JACK_MAX_FRAMES;
+const double max_canvas_coordinate = (double) UINT32_MAX;
 
 void
 Editor::initialize_canvas ()
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/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index 1390aa440f..259e3e36e1 100644
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -18,8 +18,6 @@
 
 */
 
-#include <jack/types.h>
-
 #include <glib/gstdio.h>
 
 #include "ardour/profile.h"
diff --git a/gtk2_ardour/linux_vst_gui_support.cc b/gtk2_ardour/linux_vst_gui_support.cc
index 4d90bdd4aa..517054bc25 100644
--- a/gtk2_ardour/linux_vst_gui_support.cc
+++ b/gtk2_ardour/linux_vst_gui_support.cc
@@ -26,8 +26,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <jack/jack.h>
-#include <jack/thread.h>
 #include <libgen.h>
 
 #include <pthread.h>
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 8e673a7824..0b37a3d2cf 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"
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index 465de04127..29cfa4b354 100644
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -38,8 +38,6 @@
 #include "ardour/types.h"
 #include "ardour/libardour_visibility.h"
 
-#include <jack/jack.h>
-
 namespace MIDI {
 	class MachineControl;
 	class Port;
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 1688a2a36d..9afd0167e3 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 #include <cmath>
-#include <jack/jack.h>
 
 #include <glibmm/threads.h>
 
diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h
index a3b99575fe..473953e221 100644
--- a/libs/ardour/ardour/ladspa_plugin.h
+++ b/libs/ardour/ardour/ladspa_plugin.h
@@ -28,7 +28,6 @@
 
 #include "pbd/stateful.h"
 
-#include <jack/types.h>
 #include "ardour/ladspa.h"
 #include "ardour/plugin.h"
 
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index a69b87efbd..c485243bd4 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -26,7 +26,6 @@
 #include "pbd/statefuldestructible.h"
 #include "pbd/controllable.h"
 
-#include <jack/types.h>
 #include "ardour/chan_count.h"
 #include "ardour/chan_mapping.h"
 #include "ardour/cycles.h"
diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 5fb9a7efc3..6a05314843 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -25,7 +25,6 @@
 #include <set>
 #include <string>
 #include <vector>
-#include <jack/jack.h>
 #include <boost/utility.hpp>
 #include "pbd/signals.h"
 
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 7e80055f94..6df10c3f9a 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -24,7 +24,6 @@
 
 #include <glibmm/threads.h>
 
-#include <jack/jack.h>
 #include <ltc.h>
 
 #include "pbd/signals.h"
diff --git a/libs/ardour/graph.cc b/libs/ardour/graph.cc
index f8a1d51e10..3e87853319 100644
--- a/libs/ardour/graph.cc
+++ b/libs/ardour/graph.cc
@@ -32,8 +32,6 @@
 #include "ardour/process_thread.h"
 #include "ardour/audioengine.h"
 
-#include <jack/thread.h>
-
 #include "i18n.h"
 
 using namespace ARDOUR;
diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index bc5d26fb80..19bebd103f 100644
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -21,10 +21,6 @@
 #include "libardour-config.h"
 #endif
 
-#ifndef PLATFORM_WINDOWS
-#include <jack/weakjack.h> // so that we can test for new functions at runtime
-#endif
-
 #include "pbd/compose.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
@@ -382,7 +378,7 @@ Port::get_connected_latency_range (LatencyRange& range, bool playback) const
 
                                 boost::shared_ptr<Port> remote_port = AudioEngine::instance()->get_port_by_name (*c);
                                 if (remote_port) {
-                                        lr = remote_port->private_latency_range ((playback ? JackPlaybackLatency : JackCaptureLatency));
+                                        lr = remote_port->private_latency_range ((playback ? true : false));
                                         DEBUG_TRACE (DEBUG::Latency, string_compose (
                                                              "\t%1 <-LOCAL-> %2 : latter has latency range %3 .. %4\n",
                                                              name(), *c, lr.min, lr.max));
diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h
index 6e55134bb5..5a52cfe898 100644
--- a/libs/midi++2/midi++/port.h
+++ b/libs/midi++2/midi++/port.h
@@ -22,10 +22,6 @@
 #include <string>
 #include <iostream>
 
-#include <jack/types.h> /* XXX ... desirable to get rid of this but needed for
-			 * now due to use of JackPortIsXXXX
-			 */
-
 #include <pthread.h>
 
 #include "pbd/xml++.h"
@@ -47,8 +43,8 @@ class PortRequest;
 class LIBMIDIPP_API Port {
   public:
 	enum Flags {
-		IsInput = JackPortIsInput,
-		IsOutput = JackPortIsOutput,
+		IsInput = 0x1,  /* MUST MATCH JACK's JackPortIsInput */
+		IsOutput = 0x2, /* MUST MATCH JACK's JackPortIsOutput */
 	};
 	
 	Port (std::string const &, Flags);
diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 180688e616..277a7f8ecd 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -28,8 +28,6 @@
 
 #include "ardour/types.h"
 
-#include <jack/types.h>
-
 #include "timecode/time.h"
 
 #include "control_protocol/visibility.h"