diff --git a/include/secp256k1_schnorr.h b/include/secp256k1_schnorr.h
index e9ba843efa7e6..62245a54f1d20 100644
--- a/include/secp256k1_schnorr.h
+++ b/include/secp256k1_schnorr.h
@@ -94,7 +94,7 @@ int secp256k1_schnorr_generate_nonce_pair(
   const unsigned char *sec32,
   secp256k1_nonce_function noncefp,
   const void* noncedata
-) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(6) SECP256K1_ARG_NONNULL(7);
+) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3);
 
 /** Produce a partial Schnorr signature, which can be combined using
  *  secp256k1_schnorr_partial_combine, to end up with a full signature that is
diff --git a/src/modules/ecdh/main_impl.h b/src/modules/ecdh/main_impl.h
index dde8856d5e632..c23e4f82f7fe6 100644
--- a/src/modules/ecdh/main_impl.h
+++ b/src/modules/ecdh/main_impl.h
@@ -7,6 +7,7 @@
 #ifndef _SECP256K1_MODULE_ECDH_MAIN_
 #define _SECP256K1_MODULE_ECDH_MAIN_
 
+#include "include/secp256k1_ecdh.h"
 #include "ecmult_const_impl.h"
 
 int secp256k1_ecdh(const secp256k1_context* ctx, unsigned char *result, const secp256k1_pubkey *point, const unsigned char *scalar) {
diff --git a/src/modules/schnorr/main_impl.h b/src/modules/schnorr/main_impl.h
index 08b0683eea7dc..c10fd259f26ee 100644
--- a/src/modules/schnorr/main_impl.h
+++ b/src/modules/schnorr/main_impl.h
@@ -7,6 +7,7 @@
 #ifndef SECP256K1_MODULE_SCHNORR_MAIN
 #define SECP256K1_MODULE_SCHNORR_MAIN
 
+#include "include/secp256k1_schnorr.h"
 #include "modules/schnorr/schnorr_impl.h"
 
 static void secp256k1_schnorr_msghash_sha256(unsigned char *h32, const unsigned char *r32, const unsigned char *msg32) {
diff --git a/src/modules/schnorr/schnorr.h b/src/modules/schnorr/schnorr.h
index 5f718039fcd09..d227433d48f81 100644
--- a/src/modules/schnorr/schnorr.h
+++ b/src/modules/schnorr/schnorr.h
@@ -4,8 +4,8 @@
  * file COPYING or http://www.opensource.org/licenses/mit-license.php. *
  ***********************************************************************/
 
-#ifndef _SECP256K1_SCHNORR_
-#define _SECP256K1_SCHNORR_
+#ifndef _SECP256K1_MODULE_SCHNORR_H_
+#define _SECP256K1_MODULE_SCHNORR_H_
 
 #include "scalar.h"
 #include "group.h"
diff --git a/src/modules/schnorr/tests_impl.h b/src/modules/schnorr/tests_impl.h
index eabddb04acdc3..79737f7487341 100644
--- a/src/modules/schnorr/tests_impl.h
+++ b/src/modules/schnorr/tests_impl.h
@@ -7,6 +7,8 @@
 #ifndef SECP256K1_MODULE_SCHNORR_TESTS
 #define SECP256K1_MODULE_SCHNORR_TESTS
 
+#include "include/secp256k1_schnorr.h"
+
 void test_schnorr_end_to_end(void) {
     unsigned char privkey[32];
     unsigned char message[32];