diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index dcd59b545..7ce9e47d7 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -426,7 +426,7 @@ ufindhash (int i)
 #define FMAXHASH 2047
 faction * factionhash[FMAXHASH];
 
-static void
+void
 fhash(faction * f)
 {
 	int index = f->no % FMAXHASH;
@@ -434,7 +434,7 @@ fhash(faction * f)
 	factionhash[index] = f;
 }
 
-static void
+void
 funhash(faction * f)
 {
 	int index = f->no % FMAXHASH;
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index fc22778ff..d89e7ed69 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -1064,6 +1064,9 @@ void uhash(struct unit * u);
 void uunhash(struct unit * u);
 struct unit *ufindhash(int i);
 
+void fhash(struct faction * f);
+void funhash(struct faction * f);
+
 #ifndef NDEBUG
 const char *strcheck(const char *s, size_t maxlen);
 
diff --git a/src/common/gamecode/xmas.c b/src/common/modules/xmas.c
similarity index 100%
rename from src/common/gamecode/xmas.c
rename to src/common/modules/xmas.c
diff --git a/src/common/gamecode/xmas.h b/src/common/modules/xmas.h
similarity index 100%
rename from src/common/gamecode/xmas.h
rename to src/common/modules/xmas.h