diff --git a/src/bin/evas/evas_cserve2_client.c b/src/bin/evas/evas_cserve2_client.c
index 91999f0ef0..a36940ba8a 100644
--- a/src/bin/evas/evas_cserve2_client.c
+++ b/src/bin/evas/evas_cserve2_client.c
@@ -14,8 +14,7 @@
 static unsigned int _rid_count = 0;
 
 #ifndef UNIX_PATH_MAX
-static struct sockaddr_un socket_local;
-#define UNIX_PATH_MAX sizeof(socket_local.sun_path)
+#define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
 #endif
 
 static void
diff --git a/src/bin/evas/evas_cserve2_usage.c b/src/bin/evas/evas_cserve2_usage.c
index 294f5c3747..bcf0cdd7d0 100644
--- a/src/bin/evas/evas_cserve2_usage.c
+++ b/src/bin/evas/evas_cserve2_usage.c
@@ -19,8 +19,7 @@ static unsigned int _rid_count = 1;
 static int _evas_cserve2_usage_log_dom = -1;
 
 #ifndef UNIX_PATH_MAX
-static struct sockaddr_un socksize;
-#define UNIX_PATH_MAX sizeof(socksize.sun_path)
+#define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
 #endif
 
 #ifdef ERR