diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index c50dce4ba..fee63b0ec 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -54,11 +54,6 @@ applications may follow different packet versions.
 // This just works as a quick implementation.
 #define MAXGENTLEMENDELAY TICRATE
 
-#define PUBKEYLENGTH 32 // Enforced by Monocypher EdDSA
-#define PRIVKEYLENGTH 64 // Enforced by Monocypher EdDSA
-#define SIGNATURELENGTH 64 // Enforced by Monocypher EdDSA
-#define CHALLENGELENGTH 64 // Servers verify client identity by giving them messages to sign. How long are these messages?
-
 //
 // Packet structure
 //
diff --git a/src/doomdef.h b/src/doomdef.h
index a28a7085e..255196a63 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -753,6 +753,12 @@ extern int
 
 #define MAX_VOLUME 100
 
+// Crypto/RRID primitives
+#define PUBKEYLENGTH 32 // Enforced by Monocypher EdDSA
+#define PRIVKEYLENGTH 64 // Enforced by Monocypher EdDSA
+#define SIGNATURELENGTH 64 // Enforced by Monocypher EdDSA
+#define CHALLENGELENGTH 64 // Servers verify client identity by giving them messages to sign. How long are these messages?
+
 #ifdef HAVE_CURL
 #define MASTERSERVER
 #else