diff --git a/src/modules/bppp/bppp_norm_product_impl.h b/src/modules/bppp/bppp_norm_product_impl.h
index 6b7521a1..6ff48f7f 100644
--- a/src/modules/bppp/bppp_norm_product_impl.h
+++ b/src/modules/bppp/bppp_norm_product_impl.h
@@ -7,15 +7,15 @@
 #ifndef _SECP256K1_MODULE_BPPP_PP_NORM_PRODUCT_
 #define _SECP256K1_MODULE_BPPP_PP_NORM_PRODUCT_
 
-#include "group.h"
-#include "scalar.h"
-#include "ecmult.h"
-#include "ecmult_gen.h"
-#include "hash.h"
+#include "../../group.h"
+#include "../../scalar.h"
+#include "../../ecmult.h"
+#include "../../ecmult_gen.h"
+#include "../../hash.h"
 
-#include "modules/bppp/main.h"
-#include "modules/bppp/bppp_util.h"
-#include "modules/bppp/bppp_transcript_impl.h"
+#include "../bppp/main.h"
+#include "../bppp/bppp_util.h"
+#include "../bppp/bppp_transcript_impl.h"
 
 /* Computes the inner product of two vectors of scalars
  * with elements starting from offset a and offset b
diff --git a/src/modules/bppp/bppp_transcript_impl.h b/src/modules/bppp/bppp_transcript_impl.h
index a734ea2d..1b51b22e 100644
--- a/src/modules/bppp/bppp_transcript_impl.h
+++ b/src/modules/bppp/bppp_transcript_impl.h
@@ -6,8 +6,8 @@
 #ifndef _SECP256K1_MODULE_BPPP_PP_TRANSCRIPT_IMPL_
 #define _SECP256K1_MODULE_BPPP_PP_TRANSCRIPT_IMPL_
 
-#include "group.h"
-#include "scalar.h"
+#include "../../group.h"
+#include "../../scalar.h"
 #include "bppp_util.h"
 
 /* Initializes SHA256 with fixed midstate. This midstate was computed by applying
diff --git a/src/modules/bppp/bppp_util.h b/src/modules/bppp/bppp_util.h
index fd04ae69..3d810400 100644
--- a/src/modules/bppp/bppp_util.h
+++ b/src/modules/bppp/bppp_util.h
@@ -7,10 +7,10 @@
 #ifndef _SECP256K1_MODULE_BPPP_UTIL_
 #define _SECP256K1_MODULE_BPPP_UTIL_
 
-#include "field.h"
-#include "group.h"
-#include "hash.h"
-#include "eckey.h"
+#include "../../field.h"
+#include "../../group.h"
+#include "../../hash.h"
+#include "../../eckey.h"
 
 /* Outputs a pair of points, amortizing the parity byte between them
  * Assumes both points' coordinates have been normalized.
diff --git a/src/modules/bppp/main_impl.h b/src/modules/bppp/main_impl.h
index dfebde10..b8ac117d 100644
--- a/src/modules/bppp/main_impl.h
+++ b/src/modules/bppp/main_impl.h
@@ -7,13 +7,13 @@
 #ifndef _SECP256K1_MODULE_BPPP_MAIN_
 #define _SECP256K1_MODULE_BPPP_MAIN_
 
-#include "include/secp256k1_bppp.h"
-#include "include/secp256k1_generator.h"
-#include "modules/generator/main_impl.h" /* for generator_{load, save} */
-#include "hash.h"
-#include "util.h"
-#include "modules/bppp/main.h"
-#include "modules/bppp/bppp_norm_product_impl.h"
+#include "../../../include/secp256k1_bppp.h"
+#include "../../../include/secp256k1_generator.h"
+#include "../generator/main_impl.h" /* for generator_{load, save} */
+#include "../../hash.h"
+#include "../../util.h"
+#include "../bppp/main.h"
+#include "../bppp/bppp_norm_product_impl.h"
 
 secp256k1_bppp_generators *secp256k1_bppp_generators_create(const secp256k1_context *ctx, size_t n) {
     secp256k1_bppp_generators *ret;
diff --git a/src/modules/bppp/tests_impl.h b/src/modules/bppp/tests_impl.h
index bdb261a0..fb383f5a 100644
--- a/src/modules/bppp/tests_impl.h
+++ b/src/modules/bppp/tests_impl.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "include/secp256k1_bppp.h"
+#include "../../../include/secp256k1_bppp.h"
 #include "bppp_norm_product_impl.h"
 #include "bppp_util.h"
 #include "bppp_transcript_impl.h"
diff --git a/src/modules/generator/main_impl.h b/src/modules/generator/main_impl.h
index e60ecdc2..4fba00ca 100644
--- a/src/modules/generator/main_impl.h
+++ b/src/modules/generator/main_impl.h
@@ -14,7 +14,7 @@
 #include "../../hash.h"
 #include "../../scalar.h"
 
-#include "modules/generator/pedersen_impl.h"
+#include "../generator/pedersen_impl.h"
 
 /** Alternative generator for secp256k1.
  *  This is the sha256 of 'g' after standard encoding (without compression),
diff --git a/src/modules/rangeproof/main_impl.h b/src/modules/rangeproof/main_impl.h
index b1af2a5e..ced0d5cd 100644
--- a/src/modules/rangeproof/main_impl.h
+++ b/src/modules/rangeproof/main_impl.h
@@ -9,9 +9,9 @@
 
 #include "../../group.h"
 
-#include "modules/generator/main_impl.h"
-#include "modules/rangeproof/borromean_impl.h"
-#include "modules/rangeproof/rangeproof_impl.h"
+#include "../generator/main_impl.h"
+#include "../rangeproof/borromean_impl.h"
+#include "../rangeproof/rangeproof_impl.h"
 
 int secp256k1_rangeproof_info(const secp256k1_context* ctx, int *exp, int *mantissa,
  uint64_t *min_value, uint64_t *max_value, const unsigned char *proof, size_t plen) {
diff --git a/src/modules/rangeproof/rangeproof_impl.h b/src/modules/rangeproof/rangeproof_impl.h
index dd79b6ad..12684b9c 100644
--- a/src/modules/rangeproof/rangeproof_impl.h
+++ b/src/modules/rangeproof/rangeproof_impl.h
@@ -13,9 +13,9 @@
 #include "../../hash_impl.h"
 #include "../../util.h"
 
-#include "modules/generator/pedersen.h"
-#include "modules/rangeproof/borromean.h"
-#include "modules/rangeproof/rangeproof.h"
+#include "../generator/pedersen.h"
+#include "../rangeproof/borromean.h"
+#include "../rangeproof/rangeproof.h"
 
 SECP256K1_INLINE static void secp256k1_rangeproof_pub_expand(secp256k1_gej *pubs,
  int exp, size_t *rsizes, size_t rings, const secp256k1_ge* genp) {
diff --git a/src/modules/surjection/main_impl.h b/src/modules/surjection/main_impl.h
index a214f90b..42041573 100644
--- a/src/modules/surjection/main_impl.h
+++ b/src/modules/surjection/main_impl.h
@@ -10,7 +10,7 @@
 #include <string.h>
 
 #if defined HAVE_CONFIG_H
-#include "libsecp256k1-config.h"
+#include "../../libsecp256k1-config.h"
 #endif
 
 #include "../../../include/secp256k1_rangeproof.h"
diff --git a/src/secp256k1.c b/src/secp256k1.c
index c147eae5..a9730f5e 100644
--- a/src/secp256k1.c
+++ b/src/secp256k1.c
@@ -33,15 +33,15 @@
 #endif
 
 #ifdef ENABLE_MODULE_GENERATOR
-# include "include/secp256k1_generator.h"
+# include "../include/secp256k1_generator.h"
 #endif
 
 #ifdef ENABLE_MODULE_RANGEPROOF
-# include "include/secp256k1_rangeproof.h"
+# include "../include/secp256k1_rangeproof.h"
 #endif
 
 #ifdef ENABLE_MODULE_ECDSA_S2C
-# include "include/secp256k1_ecdsa_s2c.h"
+# include "../include/secp256k1_ecdsa_s2c.h"
 static void secp256k1_ecdsa_s2c_opening_save(secp256k1_ecdsa_s2c_opening* opening, secp256k1_ge* ge);
 #else
 typedef void secp256k1_ecdsa_s2c_opening;