diff --git a/CMakeLists.txt b/CMakeLists.txt
index e924baf..abfc0d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,7 @@ set(CONFIGURATION_PACKAGE_SUFFIX
     CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
 find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.21.0 REQUIRED)
 use_cpp_utilities(VISIBILITY PUBLIC)
+list(APPEND META_PRIVATE_COMPILE_DEFINITIONS CHRONO_UTILITIES_TIMESPAN_INTEGER_SCALE_OVERLOADS)
 
 # link against a possibly required extra library for std::filesystem
 use_standard_filesystem()
diff --git a/matroska/matroskaid.cpp b/matroska/matroskaid.cpp
index b3d2e15..dfc6461 100644
--- a/matroska/matroskaid.cpp
+++ b/matroska/matroskaid.cpp
@@ -122,7 +122,7 @@ std::string_view matroskaIdName(std::uint32_t matroskaId)
         return "track number";
     case TrackUID:
         return "unique track id";
-    case TrackType:
+    case TrackEntryIds::TrackType:
         return "track type";
     case TrackAudio:
         return "audio track";
@@ -192,7 +192,7 @@ std::string_view matroskaIdName(std::uint32_t matroskaId)
         return "video display width";
     case DisplayHeight:
         return "video display height";
-    case DisplayUnit:
+    case TrackVideoIds::DisplayUnit:
         return "video display unit";
     case PixelWidth:
         return "video pixel width";
@@ -208,9 +208,9 @@ std::string_view matroskaIdName(std::uint32_t matroskaId)
         return "video pixel crop right";
     case FlagInterlaced:
         return "video flag interlaced";
-    case StereoMode:
+    case TrackVideoIds::StereoMode:
         return "video stereo mode";
-    case AspectRatioType:
+    case TrackVideoIds::AspectRatioType:
         return "video aspect ratio type";
     case ColorSpace:
         return "video color space";
@@ -276,7 +276,7 @@ std::string_view matroskaIdName(std::uint32_t matroskaId)
         return "content encryption signature hash algorithmus";
 
         // IDs in the Tags master
-    case Tag:
+    case TagsIds::Tag:
         return "tag";
 
         // IDs in the Tag master
@@ -569,7 +569,7 @@ MatroskaElementLevel matroskaIdLevel(std::uint32_t matroskaId)
     case CuePoint:
     case AttachedFile:
     case EditionEntry:
-    case Tag:
+    case TagsIds::Tag:
         return MatroskaElementLevel::Level2;
     case SeekID:
     case SeekPosition:
@@ -588,7 +588,7 @@ MatroskaElementLevel matroskaIdLevel(std::uint32_t matroskaId)
     case Slices:
     case TrackNumber:
     case TrackUID:
-    case TrackType:
+    case TrackEntryIds::TrackType:
     case TrackFlagEnabled:
     case TrackFlagDefault:
     case TrackFlagForced:
diff --git a/mp4/mp4container.cpp b/mp4/mp4container.cpp
index 995c816..78e2668 100644
--- a/mp4/mp4container.cpp
+++ b/mp4/mp4container.cpp
@@ -1,5 +1,3 @@
-#define CHRONO_UTILITIES_TIMESPAN_INTEGER_SCALE_OVERLOADS
-
 #include "./mp4container.h"
 #include "./mp4ids.h"
 
diff --git a/mp4/mp4track.cpp b/mp4/mp4track.cpp
index f24ad77..60cc748 100644
--- a/mp4/mp4track.cpp
+++ b/mp4/mp4track.cpp
@@ -1,5 +1,3 @@
-#define CHRONO_UTILITIES_TIMESPAN_INTEGER_SCALE_OVERLOADS
-
 #include "./mp4track.h"
 #include "./mp4atom.h"
 #include "./mp4container.h"
diff --git a/tests/overallmkv.cpp b/tests/overallmkv.cpp
index a69f9bf..9c50355 100644
--- a/tests/overallmkv.cpp
+++ b/tests/overallmkv.cpp
@@ -37,7 +37,7 @@ enum TestFlag {
 void OverallTests::checkMkvTestfile1()
 {
     CPPUNIT_ASSERT_EQUAL(ContainerFormat::Matroska, m_fileInfo.containerFormat());
-    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromMinutes(1) + TimeSpan::fromSeconds(27) + TimeSpan::fromMilliseconds(336), m_fileInfo.duration());
+    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromMinutes(1.0) + TimeSpan::fromSeconds(27.0) + TimeSpan::fromMilliseconds(336.0), m_fileInfo.duration());
     const auto tracks = m_fileInfo.tracks();
     CPPUNIT_ASSERT_EQUAL(2_st, tracks.size());
     for (const auto &track : tracks) {
@@ -86,7 +86,7 @@ void OverallTests::checkMkvTestfile1()
 void OverallTests::checkMkvTestfile2()
 {
     CPPUNIT_ASSERT_EQUAL(ContainerFormat::Matroska, m_fileInfo.containerFormat());
-    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(47) + TimeSpan::fromMilliseconds(509), m_fileInfo.duration());
+    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(47.0) + TimeSpan::fromMilliseconds(509.0), m_fileInfo.duration());
     const auto tracks = m_fileInfo.tracks();
     CPPUNIT_ASSERT_EQUAL(2_st, tracks.size());
     for (const auto &track : tracks) {
@@ -135,7 +135,7 @@ void OverallTests::checkMkvTestfile2()
 void OverallTests::checkMkvTestfile3()
 {
     CPPUNIT_ASSERT_EQUAL(ContainerFormat::Matroska, m_fileInfo.containerFormat());
-    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(49) + TimeSpan::fromMilliseconds(64), m_fileInfo.duration());
+    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(49.0) + TimeSpan::fromMilliseconds(64.0), m_fileInfo.duration());
     const auto tracks = m_fileInfo.tracks();
     CPPUNIT_ASSERT_EQUAL(2_st, tracks.size());
     for (const auto &track : tracks) {
@@ -244,7 +244,7 @@ void OverallTests::checkMkvTestfile4()
 void OverallTests::checkMkvTestfile5()
 {
     CPPUNIT_ASSERT_EQUAL(ContainerFormat::Matroska, m_fileInfo.containerFormat());
-    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(46) + TimeSpan::fromMilliseconds(665), m_fileInfo.duration());
+    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(46.0) + TimeSpan::fromMilliseconds(665.0), m_fileInfo.duration());
     const auto tracks = m_fileInfo.tracks();
     CPPUNIT_ASSERT_EQUAL(11_st, tracks.size());
     for (const auto &track : tracks) {
@@ -298,7 +298,7 @@ void OverallTests::checkMkvTestfile5()
 void OverallTests::checkMkvTestfile6()
 {
     CPPUNIT_ASSERT_EQUAL(ContainerFormat::Matroska, m_fileInfo.containerFormat());
-    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromMinutes(1) + TimeSpan::fromSeconds(27) + TimeSpan::fromMilliseconds(336), m_fileInfo.duration());
+    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromMinutes(1.0) + TimeSpan::fromSeconds(27.0) + TimeSpan::fromMilliseconds(336.0), m_fileInfo.duration());
     const auto tracks = m_fileInfo.tracks();
     CPPUNIT_ASSERT_EQUAL(2_st, tracks.size());
     for (const auto &track : tracks) {
@@ -348,7 +348,7 @@ void OverallTests::checkMkvTestfile6()
 void OverallTests::checkMkvTestfile7()
 {
     CPPUNIT_ASSERT_EQUAL(ContainerFormat::Matroska, m_fileInfo.containerFormat());
-    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(37) + TimeSpan::fromMilliseconds(43), m_fileInfo.duration());
+    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(37.0) + TimeSpan::fromMilliseconds(43.0), m_fileInfo.duration());
     const auto tracks = m_fileInfo.tracks();
     CPPUNIT_ASSERT_EQUAL(2_st, tracks.size());
     for (const auto &track : tracks) {
@@ -408,7 +408,7 @@ void OverallTests::checkMkvTestfile7()
 void OverallTests::checkMkvTestfile8()
 {
     CPPUNIT_ASSERT_EQUAL(ContainerFormat::Matroska, m_fileInfo.containerFormat());
-    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(47) + TimeSpan::fromMilliseconds(341), m_fileInfo.duration());
+    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(47.0) + TimeSpan::fromMilliseconds(341.0), m_fileInfo.duration());
     const auto tracks = m_fileInfo.tracks();
     CPPUNIT_ASSERT_EQUAL(2_st, tracks.size());
     for (const auto &track : tracks) {
@@ -459,7 +459,7 @@ void OverallTests::checkMkvTestfile8()
 void OverallTests::checkMkvTestfileHandbrakeChapters()
 {
     CPPUNIT_ASSERT_EQUAL(ContainerFormat::Matroska, m_fileInfo.containerFormat());
-    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(27) + TimeSpan::fromMilliseconds(569), m_fileInfo.duration());
+    CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(27.0) + TimeSpan::fromMilliseconds(569.0), m_fileInfo.duration());
     const auto tracks = m_fileInfo.tracks();
     CPPUNIT_ASSERT_EQUAL(2_st, tracks.size());
     for (const auto &track : tracks) {
diff --git a/tests/tagvalue.cpp b/tests/tagvalue.cpp
index dfc31bd..d729a4c 100644
--- a/tests/tagvalue.cpp
+++ b/tests/tagvalue.cpp
@@ -157,7 +157,7 @@ void TagValueTests::testPositionInSet()
 
 void TagValueTests::testTimeSpan()
 {
-    const TimeSpan fiveMinutes(TimeSpan::fromMinutes(5));
+    const TimeSpan fiveMinutes(TimeSpan::fromMinutes(5.0));
     TagValue timeSpan;
     timeSpan.assignTimeSpan(fiveMinutes);
     CPPUNIT_ASSERT_EQUAL(timeSpan, TagValue(timeSpan));