13 files changed, 10 insertions, 10 deletions
diff --git a/libs/evoral/test/BeatsTest.cpp b/libs/evoral/test/BeatsTest.cc
index 07eab1f1ec..07eab1f1ec 100644
--- a/libs/evoral/test/BeatsTest.cpp
+++ b/libs/evoral/test/BeatsTest.cc
diff --git a/libs/evoral/test/BeatsTest.hpp b/libs/evoral/test/BeatsTest.h
index 0db3831b49..0db3831b49 100644
--- a/libs/evoral/test/BeatsTest.hpp
+++ b/libs/evoral/test/BeatsTest.h
diff --git a/libs/evoral/test/CurveTest.cpp b/libs/evoral/test/CurveTest.cc
index 820c53f5ac..195be51a4b 100644
--- a/libs/evoral/test/CurveTest.cpp
+++ b/libs/evoral/test/CurveTest.cc
@@ -1,6 +1,6 @@
 #include "CurveTest.hpp"
-#include "evoral/ControlList.hpp"
-#include "evoral/Curve.hpp"
+#include "evoral/ControlList.h"
+#include "evoral/Curve.h"
 #include <stdlib.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION (CurveTest);
diff --git a/libs/evoral/test/CurveTest.hpp b/libs/evoral/test/CurveTest.h
index 60c0cb788c..32606794d6 100644
--- a/libs/evoral/test/CurveTest.hpp
+++ b/libs/evoral/test/CurveTest.h
@@ -1,7 +1,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <boost/shared_ptr.hpp>
-#include "evoral/ControlList.hpp"
+#include "evoral/ControlList.h"
 
 class CurveTest : public CppUnit::TestFixture
 {
diff --git a/libs/evoral/test/NoteTest.cpp b/libs/evoral/test/NoteTest.cc
index ead96f1d99..43e599d743 100644
--- a/libs/evoral/test/NoteTest.cpp
+++ b/libs/evoral/test/NoteTest.cc
@@ -1,6 +1,6 @@
 #include "NoteTest.hpp"
 #include "temporal/beats.h"
-#include "evoral/Note.hpp"
+#include "evoral/Note.h"
 #include <stdlib.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION (NoteTest);
diff --git a/libs/evoral/test/NoteTest.hpp b/libs/evoral/test/NoteTest.h
index 9d0af69022..9d0af69022 100644
--- a/libs/evoral/test/NoteTest.hpp
+++ b/libs/evoral/test/NoteTest.h
diff --git a/libs/evoral/test/RangeTest.cpp b/libs/evoral/test/RangeTest.cc
index bbb2bdeb58..dcbe1c12dd 100644
--- a/libs/evoral/test/RangeTest.cpp
+++ b/libs/evoral/test/RangeTest.cc
@@ -1,5 +1,5 @@
 #include "RangeTest.hpp"
-#include "evoral/Range.hpp"
+#include "evoral/Range.h"
 #include <stdlib.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION (RangeTest);
diff --git a/libs/evoral/test/RangeTest.hpp b/libs/evoral/test/RangeTest.h
index b06a477b4d..b06a477b4d 100644
--- a/libs/evoral/test/RangeTest.hpp
+++ b/libs/evoral/test/RangeTest.h
diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cc
index 7a7f1cdbe0..7a7f1cdbe0 100644
--- a/libs/evoral/test/SMFTest.cpp
+++ b/libs/evoral/test/SMFTest.cc
diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.h
index d3f01c3607..79bf3d0e89 100644
--- a/libs/evoral/test/SMFTest.hpp
+++ b/libs/evoral/test/SMFTest.h
@@ -24,7 +24,7 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include "temporal/beats.h"
-#include "evoral/SMF.hpp"
+#include "evoral/SMF.h"
 #include "SequenceTest.hpp"
 
 using namespace Evoral;
diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cc
index 6a5fbb64cf..6a5fbb64cf 100644
--- a/libs/evoral/test/SequenceTest.cpp
+++ b/libs/evoral/test/SequenceTest.cc
diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.h
index a337b47279..b40cf15c0a 100644
--- a/libs/evoral/test/SequenceTest.hpp
+++ b/libs/evoral/test/SequenceTest.h
@@ -3,11 +3,11 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include "temporal/beats.h"
-#include "evoral/Sequence.hpp"
-#include "evoral/TypeMap.hpp"
-#include "evoral/EventSink.hpp"
+#include "evoral/Sequence.h"
+#include "evoral/TypeMap.h"
+#include "evoral/EventSink.h"
 #include "evoral/midi_events.h"
-#include "evoral/Control.hpp"
+#include "evoral/Control.h"
 
 using namespace Evoral;
 
diff --git a/libs/evoral/test/testrunner.cpp b/libs/evoral/test/testrunner.cc
index 12f2c9a629..12f2c9a629 100644
--- a/libs/evoral/test/testrunner.cpp
+++ b/libs/evoral/test/testrunner.cc