diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c3464df..f4e3b95c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,6 @@ set(libmatroska_PUBLIC_HEADERS
   matroska/KaxCuesData.h
   matroska/KaxCues.h
   matroska/KaxDefines.h
-  matroska/KaxInfoData.h
   matroska/KaxSeekHead.h
   matroska/KaxSegment.h
   matroska/KaxSemantic.h
diff --git a/matroska/KaxInfoData.h b/matroska/KaxInfoData.h
deleted file mode 100644
index cce9e3fb..00000000
--- a/matroska/KaxInfoData.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright © 2002-2010 Steve Lhomme.
-// SPDX-License-Identifier: LGPL-2.1-or-later
-
-/*!
-  \file
-  \author Steve Lhomme     <robux4 @ users.sf.net>
-  \author John Cannon      <spyder2555 @ users.sf.net>
-  \author Moritz Bunkus    <moritz @ bunkus.org>
-*/
-#ifndef LIBMATROSKA_INFO_DATA_H
-#define LIBMATROSKA_INFO_DATA_H
-
-#include "matroska/KaxTypes.h"
-#include <ebml/EbmlUInteger.h>
-#include <ebml/EbmlFloat.h>
-#include <ebml/EbmlUnicodeString.h>
-#include <ebml/EbmlBinary.h>
-#include <ebml/EbmlDate.h>
-#include <ebml/EbmlMaster.h>
-#include "matroska/KaxDefines.h"
-#include "matroska/KaxSemantic.h"
-
-using namespace libebml;
-
-namespace libmatroska {
-
-DECLARE_MKX_BINARY (KaxPrevUID)
-  public:
-    bool ValidateSize() const override { return IsFiniteSize() && (GetSize() == 16);}
-};
-
-DECLARE_MKX_BINARY (KaxNextUID)
-  public:
-    bool ValidateSize() const override { return IsFiniteSize() && (GetSize() == 16);}
-};
-
-} // namespace libmatroska
-
-#endif // LIBMATROSKA_INFO_DATA_H
diff --git a/matroska/KaxSemantic.h b/matroska/KaxSemantic.h
index 0d4afb71..97c76e70 100644
--- a/matroska/KaxSemantic.h
+++ b/matroska/KaxSemantic.h
@@ -43,9 +43,19 @@ DECLARE_MKX_BINARY (KaxSegmentUID)
 DECLARE_MKX_UNISTRING(KaxSegmentFilename)
 };
 
+DECLARE_MKX_BINARY (KaxPrevUID)
+public:
+  bool ValidateSize() const override {return IsFiniteSize() && GetSize() == 16;}
+};
+
 DECLARE_MKX_UNISTRING(KaxPrevFilename)
 };
 
+DECLARE_MKX_BINARY (KaxNextUID)
+public:
+  bool ValidateSize() const override {return IsFiniteSize() && GetSize() == 16;}
+};
+
 DECLARE_MKX_UNISTRING(KaxNextFilename)
 };
 
diff --git a/src/KaxSemantic.cpp b/src/KaxSemantic.cpp
index 53668b47..e6324dc4 100644
--- a/src/KaxSemantic.cpp
+++ b/src/KaxSemantic.cpp
@@ -13,7 +13,6 @@
 #include "matroska/KaxCluster.h"
 #include "matroska/KaxTracks.h"
 #include "matroska/KaxCues.h"
-#include "matroska/KaxInfoData.h"
 #include "matroska/KaxBlockData.h"
 #include "matroska/KaxCuesData.h"
 
@@ -67,9 +66,9 @@ DEFINE_END_SEMANTIC(KaxInfo)
 DEFINE_MKX_MASTER(KaxInfo, 0x1549A966, 4, KaxSegment, "Info")
 DEFINE_MKX_BINARY (KaxSegmentUID, 0x73A4, 2, KaxInfo, "SegmentUID")
 DEFINE_MKX_UNISTRING(KaxSegmentFilename, 0x7384, 2, KaxInfo, "SegmentFilename")
-DEFINE_MKX_BINARY(KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID")
+DEFINE_MKX_BINARY (KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID")
 DEFINE_MKX_UNISTRING(KaxPrevFilename, 0x3C83AB, 3, KaxInfo, "PrevFilename")
-DEFINE_MKX_BINARY(KaxNextUID, 0x3EB923, 3, KaxInfo, "NextUID")
+DEFINE_MKX_BINARY (KaxNextUID, 0x3EB923, 3, KaxInfo, "NextUID")
 DEFINE_MKX_UNISTRING(KaxNextFilename, 0x3E83BB, 3, KaxInfo, "NextFilename")
 DEFINE_MKX_BINARY (KaxSegmentFamily, 0x4444, 2, KaxInfo, "SegmentFamily")
 
diff --git a/test/mux/test6.cpp b/test/mux/test6.cpp
index 07740385..415b057e 100644
--- a/test/mux/test6.cpp
+++ b/test/mux/test6.cpp
@@ -24,7 +24,6 @@
 #include "matroska/KaxCluster.h"
 #include "matroska/KaxSeekHead.h"
 #include "matroska/KaxCues.h"
-#include "matroska/KaxInfoData.h"
 
 using namespace libmatroska;
 using namespace std;
diff --git a/test/mux/test8.cpp b/test/mux/test8.cpp
index 1c411e19..80acd780 100644
--- a/test/mux/test8.cpp
+++ b/test/mux/test8.cpp
@@ -21,7 +21,6 @@
 #include "matroska/KaxSegment.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxTracks.h"
-#include "matroska/KaxInfoData.h"
 #include "matroska/KaxCluster.h"
 #include "matroska/KaxBlockData.h"
 #include "matroska/KaxSeekHead.h"
diff --git a/test/tags/test9.cpp b/test/tags/test9.cpp
index 5df74173..8ac7f059 100644
--- a/test/tags/test9.cpp
+++ b/test/tags/test9.cpp
@@ -21,7 +21,6 @@
 #include <matroska/KaxBlock.h>
 #include <matroska/KaxCluster.h>
 #include <matroska/KaxCues.h>
-#include <matroska/KaxInfoData.h>
 #include <matroska/KaxSeekHead.h>
 #include <matroska/KaxSegment.h>
 #include <matroska/KaxTracks.h>