diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12f5b1e..0aa8c95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,15 @@ else ()
       STRING "" FORCE)
 endif ()
 
+# mkvparser section.
+# TODO(tomfinegan): move to mkvparser/CMakeLists.txt.
+add_library(mkvparser STATIC
+            "${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.cpp"
+            "${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.hpp"
+            "${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.cpp"
+            "${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.hpp"
+            "${LIBWEBM_SRC_DIR}/webmids.hpp")
+
 # Libwebm section.
 add_library(webm STATIC
             "${LIBWEBM_SRC_DIR}/common/file_util.cc"
@@ -48,13 +57,11 @@ add_library(webm STATIC
             "${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp"
             "${LIBWEBM_SRC_DIR}/mkvmuxerutil.cpp"
             "${LIBWEBM_SRC_DIR}/mkvmuxerutil.hpp"
-            "${LIBWEBM_SRC_DIR}/mkvparser.cpp"
-            "${LIBWEBM_SRC_DIR}/mkvparser.hpp"
-            "${LIBWEBM_SRC_DIR}/mkvreader.cpp"
-            "${LIBWEBM_SRC_DIR}/mkvreader.hpp"
             "${LIBWEBM_SRC_DIR}/mkvwriter.cpp"
             "${LIBWEBM_SRC_DIR}/mkvwriter.hpp"
             "${LIBWEBM_SRC_DIR}/webmids.hpp")
+target_link_libraries(webm LINK_PUBLIC mkvparser)
+
 if (WIN32)
   # Use libwebm and libwebm.lib for project and library name on Windows (instead
   # webm and webm.lib).
diff --git a/Makefile.unix b/Makefile.unix
index c850e32..9658c19 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -2,7 +2,8 @@ CXX       := g++
 CXXFLAGS  := -W -Wall -g -MMD -MP
 LIBWEBMA  := libwebm.a
 LIBWEBMSO := libwebm.so
-WEBMOBJS  := mkvparser.o mkvreader.o mkvmuxer.o mkvmuxerutil.o mkvwriter.o
+WEBMOBJS  := mkvmuxer.o mkvmuxerutil.o mkvwriter.o
+WEBMOBJS  += mkvparser/mkvparser.o mkvparser/mkvreader.o
 WEBMOBJS  += common/file_util.o common/hdr_util.o
 OBJSA     := $(WEBMOBJS:.o=_a.o)
 OBJSSO    := $(WEBMOBJS:.o=_so.o)
diff --git a/common/hdr_util.cc b/common/hdr_util.cc
index 4587b2e..13aee45 100644
--- a/common/hdr_util.cc
+++ b/common/hdr_util.cc
@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <new>
 
-#include "../mkvparser.hpp"
+#include "mkvparser/mkvparser.hpp"
 
 namespace libwebm {
 bool CopyPrimaryChromaticity(const mkvparser::PrimaryChromaticity& parser_pc,
diff --git a/m2ts/webm2pes.h b/m2ts/webm2pes.h
index a83fe00..de58c81 100644
--- a/m2ts/webm2pes.h
+++ b/m2ts/webm2pes.h
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "mkvparser.hpp"
-#include "mkvreader.hpp"
+#include "mkvparser/mkvparser.hpp"
+#include "mkvparser/mkvreader.hpp"
 
 #include "common/libwebm_util.h"
 
diff --git a/mkvmuxer.cpp b/mkvmuxer.cpp
index f31e553..7bff98c 100644
--- a/mkvmuxer.cpp
+++ b/mkvmuxer.cpp
@@ -20,7 +20,7 @@
 #include <new>
 
 #include "mkvmuxerutil.hpp"
-#include "mkvparser.hpp"
+#include "mkvparser/mkvparser.hpp"
 #include "mkvwriter.hpp"
 #include "webmids.hpp"
 
diff --git a/mkvparser.cpp b/mkvparser/mkvparser.cpp
similarity index 100%
rename from mkvparser.cpp
rename to mkvparser/mkvparser.cpp
diff --git a/mkvparser.hpp b/mkvparser/mkvparser.hpp
similarity index 100%
rename from mkvparser.hpp
rename to mkvparser/mkvparser.hpp
diff --git a/mkvreader.cpp b/mkvparser/mkvreader.cpp
similarity index 100%
rename from mkvreader.cpp
rename to mkvparser/mkvreader.cpp
diff --git a/mkvreader.hpp b/mkvparser/mkvreader.hpp
similarity index 100%
rename from mkvreader.hpp
rename to mkvparser/mkvreader.hpp
diff --git a/sample.cpp b/sample.cpp
index bb814bf..553ffc1 100644
--- a/sample.cpp
+++ b/sample.cpp
@@ -13,8 +13,8 @@
 #include <memory>
 #include <new>
 
-#include "mkvparser.hpp"
-#include "mkvreader.hpp"
+#include "mkvparser/mkvparser.hpp"
+#include "mkvparser/mkvreader.hpp"
 
 #ifdef _MSC_VER
 // Disable MSVC warnings that suggest making code non-portable.
diff --git a/sample_muxer.cpp b/sample_muxer.cpp
index 9326efa..90a1156 100644
--- a/sample_muxer.cpp
+++ b/sample_muxer.cpp
@@ -17,11 +17,11 @@
 #include "common/file_util.h"
 #include "common/hdr_util.h"
 
-// libwebm parser includes
-#include "mkvparser.hpp"
-#include "mkvreader.hpp"
+// libwebm mkvparser includes
+#include "mkvparser/mkvparser.hpp"
+#include "mkvparser/mkvreader.hpp"
 
-// libwebm muxer includes
+// libwebm mkvmuxer includes
 #include "mkvmuxer.hpp"
 #include "mkvmuxertypes.hpp"
 #include "mkvwriter.hpp"
diff --git a/testing/muxer_tests.cc b/testing/muxer_tests.cc
index f702da1..2dff053 100644
--- a/testing/muxer_tests.cc
+++ b/testing/muxer_tests.cc
@@ -17,13 +17,12 @@
 #include "gtest/gtest-message.h"
 #include "gtest/gtest.h"
 
-#include "mkvmuxer.hpp"
-#include "mkvmuxertypes.hpp"
-#include "mkvreader.hpp"
-#include "mkvwriter.hpp"
-
 #include "common/file_util.h"
 #include "common/libwebm_util.h"
+#include "mkvmuxer.hpp"
+#include "mkvmuxertypes.hpp"
+#include "mkvparser/mkvreader.hpp"
+#include "mkvwriter.hpp"
 #include "testing/test_util.h"
 
 #ifdef _MSC_VER
diff --git a/testing/parser_tests.cc b/testing/parser_tests.cc
index a4c4839..3c6b1e9 100644
--- a/testing/parser_tests.cc
+++ b/testing/parser_tests.cc
@@ -14,9 +14,8 @@
 #include <iomanip>
 #include <string>
 
-#include "mkvparser.hpp"
-#include "mkvreader.hpp"
-
+#include "mkvparser/mkvparser.hpp"
+#include "mkvparser/mkvreader.hpp"
 #include "testing/test_util.h"
 
 using libwebm::mkvparser::AudioTrack;
diff --git a/vttdemux.cc b/vttdemux.cc
index 56ddacf..8868523 100644
--- a/vttdemux.cc
+++ b/vttdemux.cc
@@ -14,8 +14,8 @@
 #include <string>
 #include <utility>
 
-#include "mkvparser.hpp"
-#include "mkvreader.hpp"
+#include "mkvparser/mkvparser.hpp"
+#include "mkvparser/mkvreader.hpp"
 #include "webvttparser.h"
 
 #ifdef _MSC_VER