10 files changed, 9 insertions, 10 deletions
diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index d24a0d9da9..39fdb11397 100644
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -24,7 +24,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
-#include "evoral/types.hpp"
 #include "pbd/controllable.h"
 #include "evoral/Control.hpp"
 
diff --git a/libs/ardour/ardour/beats_frames_converter.h b/libs/ardour/ardour/beats_frames_converter.h
index 908dd1909e..4b7169bfe7 100644
--- a/libs/ardour/ardour/beats_frames_converter.h
+++ b/libs/ardour/ardour/beats_frames_converter.h
@@ -19,8 +19,8 @@
     $Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $
 */
 
+#include "evoral/Beats.hpp"
 #include "evoral/TimeConverter.hpp"
-#include "evoral/types.hpp"
 
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index fb9be653e1..e51f8c3ef1 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -29,7 +29,7 @@
 
 #include <boost/utility.hpp>
 
-#include "evoral/types.hpp"
+#include "evoral/Range.hpp"
 
 #include "ardour/ardour.h"
 #include "ardour/chan_count.h"
diff --git a/libs/ardour/ardour/midi_operator.h b/libs/ardour/ardour/midi_operator.h
index b79544ed61..589e93041d 100644
--- a/libs/ardour/ardour/midi_operator.h
+++ b/libs/ardour/ardour/midi_operator.h
@@ -23,7 +23,7 @@
 #include <vector>
 #include <string>
 
-#include "evoral/types.hpp"
+#include "evoral/Beats.hpp"
 #include "evoral/Sequence.hpp"
 
 class Command;
diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h
index cb07bc1820..a84c464801 100644
--- a/libs/ardour/ardour/midi_playlist.h
+++ b/libs/ardour/ardour/midi_playlist.h
@@ -30,12 +30,12 @@
 #include "ardour/midi_state_tracker.h"
 #include "ardour/note_fixer.h"
 #include "ardour/playlist.h"
-#include "evoral/Beats.hpp"
 #include "evoral/Note.hpp"
 #include "evoral/Parameter.hpp"
 
 namespace Evoral {
 template<typename Time> class EventSink;
+class                         Beats;
 }
 
 namespace ARDOUR
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 250a58aa70..81f490f51c 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "evoral/types.hpp"
+#include "evoral/Beats.hpp"
 
 #include "ardour/ardour.h"
 #include "ardour/region.h"
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index e5bdfd9458..5eec755a38 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -38,7 +38,7 @@
 #include "pbd/sequence_property.h"
 #include "pbd/stacktrace.h"
 
-#include "evoral/types.hpp"
+#include "evoral/Range.hpp"
 
 #include "ardour/ardour.h"
 #include "ardour/region.h"
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index a650bfdb1a..9e0cf6ec08 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -49,7 +49,7 @@
 
 #include "lua/luastate.h"
 
-#include "evoral/types.hpp"
+#include "evoral/Range.hpp"
 
 #include "midi++/types.h"
 #include "midi++/mmc.h"
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index bb22a79c8e..89e41938d2 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -30,7 +30,7 @@
 #include "pbd/stateful.h"
 #include "pbd/statefuldestructible.h"
 
-#include "evoral/types.hpp"
+#include "evoral/Beats.hpp"
 
 #include "ardour/ardour.h"
 
diff --git a/libs/ardour/ardour/variant.h b/libs/ardour/ardour/variant.h
index 9ecadbfe6a..4cf1df5556 100644
--- a/libs/ardour/ardour/variant.h
+++ b/libs/ardour/ardour/variant.h
@@ -27,7 +27,7 @@
 #include <stdexcept>
 
 #include "ardour/libardour_visibility.h"
-#include "evoral/types.hpp"
+#include "evoral/Beats.hpp"
 #include "pbd/compose.h"
 
 namespace ARDOUR {