diff --git a/src/eressea.c b/src/eressea.c
index cb02a8bd0..117895f6e 100644
--- a/src/eressea.c
+++ b/src/eressea.c
@@ -16,9 +16,7 @@
 #include <kernel/config.h>
 #include <util/log.h>
 
-#if MUSEUM_MODULE
 #include <modules/museum.h>
-#endif
 #include <triggers/triggers.h>
 #include <util/language.h>
 #include <util/functions.h>
@@ -41,6 +39,7 @@
 
 void game_done(void)
 {
+#undef CLEANUP_CODE
 #ifdef CLEANUP_CODE
     /* Diese Routine enfernt allen allokierten Speicher wieder. Das ist nur
      * zum Debugging interessant, wenn man Leak Detection hat, und nach
@@ -78,9 +77,7 @@ void game_init(void)
     register_names();
     register_resources();
     register_itemfunctions();
-#if MUSEUM_MODULE
     register_museum();
-#endif
     wormholes_register();
 
     register_weapons();
diff --git a/src/give.c b/src/give.c
index 84e2765a6..5f7945887 100644
--- a/src/give.c
+++ b/src/give.c
@@ -239,12 +239,6 @@ struct order *ord)
                 change_reservation(dest, item2resource(itype), r);
             }
 #endif
-#endif
-#if MUSEUM_MODULE && defined(TODO)
-            /* TODO: use a trigger for the museum warden! */
-            if (a_find(dest->attribs, &at_warden)) {
-                warden_add_give(src, dest, itype, delta);
-            }
 #endif
         }
         else {
diff --git a/src/gmtool.c b/src/gmtool.c
index c33478843..fcb8cff8b 100644
--- a/src/gmtool.c
+++ b/src/gmtool.c
@@ -24,9 +24,7 @@
 
 #include <modules/xmas.h>
 #include <modules/gmcmd.h>
-#if MUSEUM_MODULE
 #include <modules/museum.h>
-#endif
 #include <modules/autoseed.h>
 
 #include <kernel/building.h>
diff --git a/src/modules/museum.c b/src/modules/museum.c
index 1eee3529f..572a8c41a 100644
--- a/src/modules/museum.c
+++ b/src/modules/museum.c
@@ -20,7 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <kernel/config.h>
 
-#if MUSEUM_MODULE
 #include "museum.h"
 
 /* kernel includes */
@@ -502,5 +501,3 @@ void register_museum(void)
     register_item_use(use_museumkey, "use_questkey1");
     register_item_use(use_museumkey, "use_questkey2");
 }
-
-#endif
diff --git a/src/modules/museum.h b/src/modules/museum.h
index ed9dc74b0..704d38604 100644
--- a/src/modules/museum.h
+++ b/src/modules/museum.h
@@ -20,10 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define HEADER_MUSEUM_H
 #ifdef __cplusplus
 extern "C" {
-#endif
-
-#if MUSEUM_MODULE == 0
-#error "must define MUSEUM_MODULE to use this module"
 #endif
 
     extern struct attrib_type at_warden;
diff --git a/src/settings.h b/src/settings.h
index e8693a763..0a017dd7a 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -24,12 +24,6 @@
 
 #define ROW_FACTOR 3            /* factor for combat row advancement rule */
 
-/* optional game components. TODO: These should either be 
- * configuration variables (XML), script extensions (lua),
- * or both. We don't want separate binaries for different games
- */
-#define MUSEUM_MODULE 1
-
  /* TODO: move these settings to settings.h or into configuration files */
 #define TREESIZE (8)            /* space used by trees (in #peasants) */
 #define PEASANTFORCE 0.75       /* Chance einer Vermehrung trotz 90% Auslastung */