4 files changed, 8 insertions, 14 deletions

diff --git a/src/lib/libcrypto/mlkem/mlkem.h b/src/lib/libcrypto/mlkem/mlkem.h
index 7941c21875..a5645facc6 100644
--- a/src/lib/libcrypto/mlkem/mlkem.h
+++ b/src/lib/libcrypto/mlkem/mlkem.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: mlkem.h,v 1.3 2024/12/17 06:43:32 tb Exp $ */
+/*      $OpenBSD: mlkem.h,v 1.4 2024/12/19 23:52:26 tb Exp $ */
 /*
  * Copyright (c) 2024, Google Inc.
  *
@@ -21,11 +21,6 @@
 #include <sys/types.h>
 #include <stdint.h>
 
-#ifdef LIBRESSL_HAS_MLKEM
-/* This needs to become public */
-#include <openssl/bytestring.h>
-#endif
-
 #if defined(__cplusplus)
 extern "C" {
 #endif
diff --git a/src/lib/libcrypto/mlkem/mlkem1024.c b/src/lib/libcrypto/mlkem/mlkem1024.c
index b3cacc828b..1de14fde52 100644
--- a/src/lib/libcrypto/mlkem/mlkem1024.c
+++ b/src/lib/libcrypto/mlkem/mlkem1024.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mlkem1024.c,v 1.4 2024/12/18 10:55:21 tb Exp $ */
+/* $OpenBSD: mlkem1024.c,v 1.5 2024/12/19 23:52:26 tb Exp $ */
 /*
  * Copyright (c) 2024, Google Inc.
  * Copyright (c) 2024, Bob Beck <beck@obtuse.com>
@@ -16,13 +16,12 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <openssl/mlkem.h>
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "bytestring.h"
+#include "mlkem.h"
 
 #include "sha3_internal.h"
 #include "mlkem_internal.h"
diff --git a/src/lib/libcrypto/mlkem/mlkem768.c b/src/lib/libcrypto/mlkem/mlkem768.c
index 040118cafc..7d99041152 100644
--- a/src/lib/libcrypto/mlkem/mlkem768.c
+++ b/src/lib/libcrypto/mlkem/mlkem768.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mlkem768.c,v 1.5 2024/12/18 10:55:21 tb Exp $ */
+/* $OpenBSD: mlkem768.c,v 1.6 2024/12/19 23:52:26 tb Exp $ */
 /*
  * Copyright (c) 2024, Google Inc.
  * Copyright (c) 2024, Bob Beck <beck@obtuse.com>
@@ -16,13 +16,12 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <openssl/mlkem.h>
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "bytestring.h"
+#include "mlkem.h"
 
 #include "sha3_internal.h"
 #include "mlkem_internal.h"
diff --git a/src/lib/libcrypto/mlkem/mlkem_internal.h b/src/lib/libcrypto/mlkem/mlkem_internal.h
index 4c8a0650a8..d3f325932f 100644
--- a/src/lib/libcrypto/mlkem/mlkem_internal.h
+++ b/src/lib/libcrypto/mlkem/mlkem_internal.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: mlkem_internal.h,v 1.3 2024/12/17 06:43:32 tb Exp $ */
+/*      $OpenBSD: mlkem_internal.h,v 1.4 2024/12/19 23:52:26 tb Exp $ */
 /*
  * Copyright (c) 2023, Google Inc.
  *
@@ -18,7 +18,8 @@
 #ifndef OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H
 #define OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H
 
-#include <openssl/mlkem.h>
+#include "bytestring.h"
+#include "mlkem.h"
 
 #if defined(__cplusplus)
 extern "C" {