diff --git a/src/xpdev/gen_defs.h b/src/xpdev/gen_defs.h
index 261fa9b5649c6507f6d8a07c78126791e1b6a91a..109ae52e8462c923dd4f32f115fb1d699d7def3d 100644
--- a/src/xpdev/gen_defs.h
+++ b/src/xpdev/gen_defs.h
@@ -27,6 +27,7 @@
 #include <assert.h>
 #endif
 #include <errno.h>
+// Note, genwrap.h is included at the *end* of this file.
 
 /* Resolve multi-named errno constants */
 #if defined(EDEADLK) && !defined(EDEADLOCK)
@@ -550,4 +551,6 @@ typedef struct {
         #include <SDL.h>
 #endif
 
+#include "genwrap.h" // For strlcpy()/strlcat() -- yes, it needs to be down here.
+
 #endif /* Don't add anything after this #endif statement */