diff --git a/src/directives.h b/include/yaml-cpp/directives.h
similarity index 100%
rename from src/directives.h
rename to include/yaml-cpp/directives.h
diff --git a/include/yaml-cpp/parser.h b/include/yaml-cpp/parser.h
index e9fba0c..c9263f9 100644
--- a/include/yaml-cpp/parser.h
+++ b/include/yaml-cpp/parser.h
@@ -11,6 +11,8 @@
 #include <memory>
 
 #include "yaml-cpp/dll.h"
+#include "yaml-cpp/directives.h"
+#include "yaml-cpp/scanner.h"
 
 namespace YAML {
 class EventHandler;
diff --git a/src/ptr_vector.h b/include/yaml-cpp/ptr_vector.h
similarity index 100%
rename from src/ptr_vector.h
rename to include/yaml-cpp/ptr_vector.h
diff --git a/src/scanner.h b/include/yaml-cpp/scanner.h
similarity index 98%
rename from src/scanner.h
rename to include/yaml-cpp/scanner.h
index c653ac6..82605b3 100644
--- a/src/scanner.h
+++ b/include/yaml-cpp/scanner.h
@@ -15,9 +15,9 @@
 #include <stack>
 #include <string>
 
-#include "ptr_vector.h"
-#include "stream.h"
-#include "token.h"
+#include "yaml-cpp/ptr_vector.h"
+#include "yaml-cpp/stream.h"
+#include "yaml-cpp/token.h"
 #include "yaml-cpp/mark.h"
 
 namespace YAML {
diff --git a/src/stream.h b/include/yaml-cpp/stream.h
similarity index 100%
rename from src/stream.h
rename to include/yaml-cpp/stream.h
diff --git a/src/token.h b/include/yaml-cpp/token.h
similarity index 100%
rename from src/token.h
rename to include/yaml-cpp/token.h
diff --git a/src/directives.cpp b/src/directives.cpp
index 0c85d0f..d8340c2 100644
--- a/src/directives.cpp
+++ b/src/directives.cpp
@@ -1,4 +1,4 @@
-#include "directives.h"
+#include "yaml-cpp/directives.h"
 
 namespace YAML {
 Directives::Directives() : version{true, 1, 2}, tags{} {}
diff --git a/src/exp.cpp b/src/exp.cpp
index 695440a..831ee87 100644
--- a/src/exp.cpp
+++ b/src/exp.cpp
@@ -1,7 +1,7 @@
 #include <sstream>
 
 #include "exp.h"
-#include "stream.h"
+#include "yaml-cpp/stream.h"
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
 
 namespace YAML {
diff --git a/src/exp.h b/src/exp.h
index fe36535..7797904 100644
--- a/src/exp.h
+++ b/src/exp.h
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "regex_yaml.h"
-#include "stream.h"
+#include "yaml-cpp/stream.h"
 
 namespace YAML {
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/parser.cpp b/src/parser.cpp
index 7bc0c78..52ac6a4 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1,10 +1,10 @@
 #include <cstdio>
 #include <sstream>
 
-#include "directives.h"  // IWYU pragma: keep
-#include "scanner.h"     // IWYU pragma: keep
+#include "yaml-cpp/directives.h"  // IWYU pragma: keep
+#include "yaml-cpp/scanner.h"     // IWYU pragma: keep
 #include "singledocparser.h"
-#include "token.h"
+#include "yaml-cpp/token.h"
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
 #include "yaml-cpp/parser.h"
 
diff --git a/src/regeximpl.h b/src/regeximpl.h
index 709124f..aabf793 100644
--- a/src/regeximpl.h
+++ b/src/regeximpl.h
@@ -7,7 +7,7 @@
 #pragma once
 #endif
 
-#include "stream.h"
+#include "yaml-cpp/stream.h"
 #include "stringsource.h"
 #include "streamcharsource.h"
 
diff --git a/src/scanner.cpp b/src/scanner.cpp
index ac84892..94bec9f 100644
--- a/src/scanner.cpp
+++ b/src/scanner.cpp
@@ -2,8 +2,8 @@
 #include <memory>
 
 #include "exp.h"
-#include "scanner.h"
-#include "token.h"
+#include "yaml-cpp/scanner.h"
+#include "yaml-cpp/token.h"
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
 
 namespace YAML {
diff --git a/src/scanscalar.cpp b/src/scanscalar.cpp
index e5b0973..a1dce46 100644
--- a/src/scanscalar.cpp
+++ b/src/scanscalar.cpp
@@ -4,7 +4,7 @@
 
 #include "exp.h"
 #include "regeximpl.h"
-#include "stream.h"
+#include "yaml-cpp/stream.h"
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
 
 namespace YAML {
diff --git a/src/scanscalar.h b/src/scanscalar.h
index c3a574a..2f621d2 100644
--- a/src/scanscalar.h
+++ b/src/scanscalar.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "regex_yaml.h"
-#include "stream.h"
+#include "yaml-cpp/stream.h"
 
 namespace YAML {
 enum CHOMP { STRIP = -1, CLIP, KEEP };
diff --git a/src/scantag.cpp b/src/scantag.cpp
index c5b3965..0b4e4a6 100644
--- a/src/scantag.cpp
+++ b/src/scantag.cpp
@@ -1,7 +1,7 @@
 #include "exp.h"
 #include "regex_yaml.h"
 #include "regeximpl.h"
-#include "stream.h"
+#include "yaml-cpp/stream.h"
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
 #include "yaml-cpp/mark.h"
 
diff --git a/src/scantag.h b/src/scantag.h
index 522ba54..b4dff33 100644
--- a/src/scantag.h
+++ b/src/scantag.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <string>
-#include "stream.h"
+#include "yaml-cpp/stream.h"
 
 namespace YAML {
 const std::string ScanVerbatimTag(Stream& INPUT);
diff --git a/src/scantoken.cpp b/src/scantoken.cpp
index 325de57..fb9d7a0 100644
--- a/src/scantoken.cpp
+++ b/src/scantoken.cpp
@@ -3,11 +3,11 @@
 #include "exp.h"
 #include "regex_yaml.h"
 #include "regeximpl.h"
-#include "scanner.h"
+#include "yaml-cpp/scanner.h"
 #include "scanscalar.h"
 #include "scantag.h"  // IWYU pragma: keep
 #include "tag.h"      // IWYU pragma: keep
-#include "token.h"
+#include "yaml-cpp/token.h"
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
 #include "yaml-cpp/mark.h"
 
diff --git a/src/simplekey.cpp b/src/simplekey.cpp
index c7a2135..450b1dd 100644
--- a/src/simplekey.cpp
+++ b/src/simplekey.cpp
@@ -1,5 +1,5 @@
-#include "scanner.h"
-#include "token.h"
+#include "yaml-cpp/scanner.h"
+#include "yaml-cpp/token.h"
 
 namespace YAML {
 struct Mark;
diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp
index be82741..50a27a0 100644
--- a/src/singledocparser.cpp
+++ b/src/singledocparser.cpp
@@ -3,10 +3,10 @@
 #include <sstream>
 
 #include "collectionstack.h"  // IWYU pragma: keep
-#include "scanner.h"
+#include "yaml-cpp/scanner.h"
 #include "singledocparser.h"
 #include "tag.h"
-#include "token.h"
+#include "yaml-cpp/token.h"
 #include "yaml-cpp/emitterstyle.h"
 #include "yaml-cpp/eventhandler.h"
 #include "yaml-cpp/exceptions.h"  // IWYU pragma: keep
diff --git a/src/stream.cpp b/src/stream.cpp
index 592802d..e87a805 100644
--- a/src/stream.cpp
+++ b/src/stream.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "stream.h"
+#include "yaml-cpp/stream.h"
 
 #ifndef YAML_PREFETCH_SIZE
 #define YAML_PREFETCH_SIZE 2048
diff --git a/src/tag.cpp b/src/tag.cpp
index df8a2cf..8860cfe 100644
--- a/src/tag.cpp
+++ b/src/tag.cpp
@@ -1,9 +1,9 @@
 #include <cassert>
 #include <stdexcept>
 
-#include "directives.h"  // IWYU pragma: keep
+#include "yaml-cpp/directives.h"  // IWYU pragma: keep
 #include "tag.h"
-#include "token.h"
+#include "yaml-cpp/token.h"
 
 namespace YAML {
 Tag::Tag(const Token& token)
diff --git a/test/regex_test.cpp b/test/regex_test.cpp
index 658db9e..3ae9580 100644
--- a/test/regex_test.cpp
+++ b/test/regex_test.cpp
@@ -1,5 +1,5 @@
 #include "regex_yaml.h"
-#include "stream.h"
+#include "yaml-cpp/stream.h"
 #include "gtest/gtest.h"
 
 using YAML::RegEx;