diff --git a/build.json b/build.json
index 361548ccd6..ad0ae43bf8 100644
--- a/build.json
+++ b/build.json
@@ -1041,5 +1041,10 @@
             "rust/bssl-crypto/src/*.rs",
             "rust/bssl-crypto/src/*/*.rs"
         ]
+    },
+    "oqs": {
+        "hdrs": [
+            "oqs/include/oqs/*.h"
+        ]
     }
 }
diff --git a/gen/sources.bzl b/gen/sources.bzl
index 6be7530381..5ba9ba986e 100644
--- a/gen/sources.bzl
+++ b/gen/sources.bzl
@@ -1091,6 +1091,33 @@ fuzz_sources = [
     "fuzz/verify_name_match_verifynameinsubtree_fuzzer.cc",
 ]
 
+oqs_headers = [
+    "oqs/include/oqs/aes_ops.h",
+    "oqs/include/oqs/common.h",
+    "oqs/include/oqs/kem.h",
+    "oqs/include/oqs/kem_bike.h",
+    "oqs/include/oqs/kem_classic_mceliece.h",
+    "oqs/include/oqs/kem_frodokem.h",
+    "oqs/include/oqs/kem_hqc.h",
+    "oqs/include/oqs/kem_kyber.h",
+    "oqs/include/oqs/kem_ml_kem.h",
+    "oqs/include/oqs/kem_ntruprime.h",
+    "oqs/include/oqs/oqs.h",
+    "oqs/include/oqs/oqsconfig.h",
+    "oqs/include/oqs/rand.h",
+    "oqs/include/oqs/sha2_ops.h",
+    "oqs/include/oqs/sha3_ops.h",
+    "oqs/include/oqs/sha3x4_ops.h",
+    "oqs/include/oqs/sig.h",
+    "oqs/include/oqs/sig_cross.h",
+    "oqs/include/oqs/sig_dilithium.h",
+    "oqs/include/oqs/sig_falcon.h",
+    "oqs/include/oqs/sig_mayo.h",
+    "oqs/include/oqs/sig_ml_dsa.h",
+    "oqs/include/oqs/sig_sphincs.h",
+    "oqs/include/oqs/sig_stfl.h",
+]
+
 pki_sources = [
     "pki/cert_error_id.cc",
     "pki/cert_error_params.cc",
diff --git a/gen/sources.cmake b/gen/sources.cmake
index 098cebd669..c7bdb6cb66 100644
--- a/gen/sources.cmake
+++ b/gen/sources.cmake
@@ -1125,6 +1125,35 @@ set(
   fuzz/verify_name_match_verifynameinsubtree_fuzzer.cc
 )
 
+set(
+  OQS_HEADERS
+
+  oqs/include/oqs/aes_ops.h
+  oqs/include/oqs/common.h
+  oqs/include/oqs/kem.h
+  oqs/include/oqs/kem_bike.h
+  oqs/include/oqs/kem_classic_mceliece.h
+  oqs/include/oqs/kem_frodokem.h
+  oqs/include/oqs/kem_hqc.h
+  oqs/include/oqs/kem_kyber.h
+  oqs/include/oqs/kem_ml_kem.h
+  oqs/include/oqs/kem_ntruprime.h
+  oqs/include/oqs/oqs.h
+  oqs/include/oqs/oqsconfig.h
+  oqs/include/oqs/rand.h
+  oqs/include/oqs/sha2_ops.h
+  oqs/include/oqs/sha3_ops.h
+  oqs/include/oqs/sha3x4_ops.h
+  oqs/include/oqs/sig.h
+  oqs/include/oqs/sig_cross.h
+  oqs/include/oqs/sig_dilithium.h
+  oqs/include/oqs/sig_falcon.h
+  oqs/include/oqs/sig_mayo.h
+  oqs/include/oqs/sig_ml_dsa.h
+  oqs/include/oqs/sig_sphincs.h
+  oqs/include/oqs/sig_stfl.h
+)
+
 set(
   PKI_SOURCES
 
diff --git a/gen/sources.gni b/gen/sources.gni
index 34d4acf243..bf1682fdc1 100644
--- a/gen/sources.gni
+++ b/gen/sources.gni
@@ -343,6 +343,8 @@ crypto_sources = [
   "crypto/evp/p_ed25519.c",
   "crypto/evp/p_ed25519_asn1.c",
   "crypto/evp/p_hkdf.c",
+  "crypto/evp/p_oqs.c",
+  "crypto/evp/p_oqs_asn1.c",
   "crypto/evp/p_rsa.c",
   "crypto/evp/p_rsa_asn1.c",
   "crypto/evp/p_x25519.c",
@@ -1089,6 +1091,33 @@ fuzz_sources = [
   "fuzz/verify_name_match_verifynameinsubtree_fuzzer.cc",
 ]
 
+oqs_headers = [
+  "oqs/include/oqs/aes_ops.h",
+  "oqs/include/oqs/common.h",
+  "oqs/include/oqs/kem.h",
+  "oqs/include/oqs/kem_bike.h",
+  "oqs/include/oqs/kem_classic_mceliece.h",
+  "oqs/include/oqs/kem_frodokem.h",
+  "oqs/include/oqs/kem_hqc.h",
+  "oqs/include/oqs/kem_kyber.h",
+  "oqs/include/oqs/kem_ml_kem.h",
+  "oqs/include/oqs/kem_ntruprime.h",
+  "oqs/include/oqs/oqs.h",
+  "oqs/include/oqs/oqsconfig.h",
+  "oqs/include/oqs/rand.h",
+  "oqs/include/oqs/sha2_ops.h",
+  "oqs/include/oqs/sha3_ops.h",
+  "oqs/include/oqs/sha3x4_ops.h",
+  "oqs/include/oqs/sig.h",
+  "oqs/include/oqs/sig_cross.h",
+  "oqs/include/oqs/sig_dilithium.h",
+  "oqs/include/oqs/sig_falcon.h",
+  "oqs/include/oqs/sig_mayo.h",
+  "oqs/include/oqs/sig_ml_dsa.h",
+  "oqs/include/oqs/sig_sphincs.h",
+  "oqs/include/oqs/sig_stfl.h",
+]
+
 pki_sources = [
   "pki/cert_error_id.cc",
   "pki/cert_error_params.cc",
diff --git a/gen/sources.json b/gen/sources.json
index 8f5cfb5e6f..9237aa2c49 100644
--- a/gen/sources.json
+++ b/gen/sources.json
@@ -1073,6 +1073,34 @@
       "fuzz/verify_name_match_verifynameinsubtree_fuzzer.cc"
     ]
   },
+  "oqs": {
+    "hdrs": [
+      "oqs/include/oqs/aes_ops.h",
+      "oqs/include/oqs/common.h",
+      "oqs/include/oqs/kem.h",
+      "oqs/include/oqs/kem_bike.h",
+      "oqs/include/oqs/kem_classic_mceliece.h",
+      "oqs/include/oqs/kem_frodokem.h",
+      "oqs/include/oqs/kem_hqc.h",
+      "oqs/include/oqs/kem_kyber.h",
+      "oqs/include/oqs/kem_ml_kem.h",
+      "oqs/include/oqs/kem_ntruprime.h",
+      "oqs/include/oqs/oqs.h",
+      "oqs/include/oqs/oqsconfig.h",
+      "oqs/include/oqs/rand.h",
+      "oqs/include/oqs/sha2_ops.h",
+      "oqs/include/oqs/sha3_ops.h",
+      "oqs/include/oqs/sha3x4_ops.h",
+      "oqs/include/oqs/sig.h",
+      "oqs/include/oqs/sig_cross.h",
+      "oqs/include/oqs/sig_dilithium.h",
+      "oqs/include/oqs/sig_falcon.h",
+      "oqs/include/oqs/sig_mayo.h",
+      "oqs/include/oqs/sig_ml_dsa.h",
+      "oqs/include/oqs/sig_sphincs.h",
+      "oqs/include/oqs/sig_stfl.h"
+    ]
+  },
   "pki": {
     "srcs": [
       "pki/cert_error_id.cc",