diff --git a/src/conio/x_cio.c b/src/conio/x_cio.c
index f9262a9670154f4c4a3cdfbe5a05ebab22325dc6..ff62e95af8f0637389811950d86cd6388bc7b1ad 100644
--- a/src/conio/x_cio.c
+++ b/src/conio/x_cio.c
@@ -107,7 +107,7 @@ void x_setname(const char *name)
 	struct x11_local_event ev = {0};
 
 	ev.type=X11_LOCAL_SETNAME;
-	SAFECOPY(ev.data.name, name);
+	strlcpy(ev.data.name, name, sizeof(ev.data.name));
 	write_event(&ev);
 }
 
@@ -116,7 +116,7 @@ void x_settitle(const char *title)
 	struct x11_local_event ev = {0};
 
 	ev.type=X11_LOCAL_SETTITLE;
-	SAFECOPY(ev.data.title, title);
+	strlcpy(ev.data.title, title, sizeof(ev.data.title));
 	write_event(&ev);
 }
 
diff --git a/src/xpdev/gen_defs.h b/src/xpdev/gen_defs.h
index 109ae52e8462c923dd4f32f115fb1d699d7def3d..ed1d139c66192a4e6cb696080aea726956ea5eaf 100644
--- a/src/xpdev/gen_defs.h
+++ b/src/xpdev/gen_defs.h
@@ -551,6 +551,4 @@ 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 */