diff --git a/configure.ac b/configure.ac
index e7dbafd1f..c59accc35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,8 @@ if test "x$with_openssl" = "xyes"; then
     AC_CHECK_LIB([crypto], [SHA256_Init],
         [AC_DEFINE([USE_OPENSSL], [1], [Define to use OpenSSL for cryptography])],
         [AC_MSG_ERROR([OpenSSL crypto library required. Use --without-openssl to use TinyCrypt.])])
+    AC_CHECK_HEADERS([openssl/hpke.h], [], [AC_MSG_ERROR([DM requires OpenSSL 3.2 or newer with HPKE headers.])])
+    AC_CHECK_LIB([crypto], [OSSL_HPKE_CTX_new], [], [AC_MSG_ERROR([DM requires an OpenSSL crypto library with HPKE support.])])
     LIBS="$save_LIBS"
 fi
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e8940d686..6df20066e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -208,6 +208,8 @@ utun_CORE_SOURCES = \
 	dm/dm_identity.h \
 	dm/dm_protocol.c \
 	dm/dm_protocol.h \
+	dm/dm_schema.c \
+	dm/dm_schema.h \
 	dm/dm_history.c \
 	dm/dm_history.h \
 	dm/dm_crypto.c \
@@ -413,6 +415,8 @@ libutun_a_SOURCES = \
 	dm/dm_identity.h \
 	dm/dm_protocol.c \
 	dm/dm_protocol.h \
+	dm/dm_schema.c \
+	dm/dm_schema.h \
 	dm/dm_history.c \
 	dm/dm_history.h \
 	dm/dm_crypto.c \