diff --git a/src/backend.cmod b/src/backend.cmod
index abb06ed5359032f7a0a4e75aeea8c4271b15980d..6753309ca178059de6113ef86f5564090f28b507 100644
--- a/src/backend.cmod
+++ b/src/backend.cmod
@@ -177,6 +177,8 @@ struct hash_ent
 
 
 
+#define DEFAULT_CMOD_STORAGE
+
 DECLARATIONS
 
 
diff --git a/src/builtin.cmod b/src/builtin.cmod
index 78439986ad9d84182f4cd9d3168ac2dadc9cf93d..84cf567d770c71b4fd4aee46db4f52d8a70fee76 100644
--- a/src/builtin.cmod
+++ b/src/builtin.cmod
@@ -41,6 +41,8 @@
 #include <math.h>
 #include <arpa/inet.h>
 
+#define DEFAULT_CMOD_STORAGE
+
 DECLARATIONS
 
 
diff --git a/src/iterators.cmod b/src/iterators.cmod
index 7bfe15b5c024ed6581c5a038553db6801772df57..ef290dcb8f3d22ffecef75a6d43342d3ea77bdbf 100644
--- a/src/iterators.cmod
+++ b/src/iterators.cmod
@@ -29,6 +29,8 @@
 
 #define sp Pike_sp
 
+#define DEFAULT_CMOD_STORAGE
+
 DECLARATIONS
 
 /*! @class Iterator
diff --git a/src/post_modules/Nettle/cipher.cmod b/src/post_modules/Nettle/cipher.cmod
index 8c4802e282d528137123f8f5678f9302e1d7179c..bdd92c2365f26d63ed4a678e0a8a59570d63e1ed 100644
--- a/src/post_modules/Nettle/cipher.cmod
+++ b/src/post_modules/Nettle/cipher.cmod
@@ -5278,7 +5278,7 @@ PIKECLASS DES
 }
 /*! @endclass DES */
 
-void f_Nettle_DES3_fix_parity(INT32);
+DEFAULT_CMOD_STORAGE void f_Nettle_DES3_fix_parity(INT32);
 
 static void
 pike_des3_set_key(void *c,
diff --git a/src/post_modules/Shuffler/Shuffler.cmod b/src/post_modules/Shuffler/Shuffler.cmod
index a79d55a6030066d1f41b535eb3fc0f290a1e1bf9..4310a6fcb531d4d9f1da883242ff7543cfc199ec 100644
--- a/src/post_modules/Shuffler/Shuffler.cmod
+++ b/src/post_modules/Shuffler/Shuffler.cmod
@@ -46,7 +46,7 @@ static void free_source( struct source *s )
   free( s );
 }
 
-extern struct program *Shuffler_program;
+DEFAULT_CMOD_STORAGE struct program *Shuffler_program;
 
 /*! @module Shuffler
  *!