diff --git a/BUILD.bazel b/BUILD.bazel
index a566aa6..a42e5be 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -16,7 +16,7 @@ config_setting(
 cc_library(
     name = "ncrypto",
     srcs = glob(["src/*.cpp"]),
-    hdrs = glob(["include/*.h"]),
+    hdrs = glob(["include/*.h", "include/ncrypto/*.h"]),
     includes = ["include"],
     local_defines = {
         "NCRYPTO_BSSL_LIBDECREPIT_MISSING": select(
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdb2c35..ceff915 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,11 @@ install(
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
   COMPONENT ncrypto_development
 )
+install(
+  DIRECTORY include/ncrypto
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+  COMPONENT ncrypto_development
+)
 
 install(
   TARGETS ncrypto
diff --git a/include/ncrypto.h b/include/ncrypto.h
index 263c4dc..8621510 100644
--- a/include/ncrypto.h
+++ b/include/ncrypto.h
@@ -1760,6 +1760,6 @@ class KEM final {
 
 #endif  // OPENSSL_VERSION_MAJOR >= 3
 
-#include "version.h"
+#include "ncrypto/version.h"
 
 }  // namespace ncrypto
diff --git a/include/aead.h b/include/ncrypto/aead.h
similarity index 100%
rename from include/aead.h
rename to include/ncrypto/aead.h
diff --git a/include/version.h b/include/ncrypto/version.h
similarity index 100%
rename from include/version.h
rename to include/ncrypto/version.h
diff --git a/release-please-config.json b/release-please-config.json
index 332b057..b940b09 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -4,7 +4,7 @@
       "release-type": "simple",
       "extra-files": [
         "CMakeLists.txt",
-        "include/version.h"
+        "include/ncrypto/version.h"
       ]
     }
   }
diff --git a/src/aead.cpp b/src/aead.cpp
index 73ea2c7..0c0d041 100644
--- a/src/aead.cpp
+++ b/src/aead.cpp
@@ -3,7 +3,7 @@
 #include "ncrypto.h"
 
 #ifdef OPENSSL_IS_BORINGSSL
-#include "aead.h"
+#include "ncrypto/aead.h"
 
 namespace ncrypto {
 
diff --git a/tests/basic.cpp b/tests/basic.cpp
index d8c7f11..66f7d66 100644
--- a/tests/basic.cpp
+++ b/tests/basic.cpp
@@ -1,5 +1,5 @@
-#include <aead.h>
 #include <ncrypto.h>
+#include <ncrypto/aead.h>
 
 #include <gtest/gtest.h>
 #include <string>