diff --git a/src/bin/evas/evas_cserve2_debug.c b/src/bin/evas/evas_cserve2_debug.c
index ce8e3e43f1..e68e1138fc 100644
--- a/src/bin/evas/evas_cserve2_debug.c
+++ b/src/bin/evas/evas_cserve2_debug.c
@@ -18,9 +18,8 @@ static int socketfd = -1;
 static unsigned int _rid_count = 1;
 static int _evas_cserve2_debug_log_dom = -1;
 
-static struct sockaddr_un socksize;
 #ifndef UNIX_PATH_MAX
-#define UNIX_PATH_MAX sizeof(socksize.sun_path)
+#define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
 #endif
 
 #ifdef ERR
diff --git a/src/bin/evas/evas_cserve2_main_loop_linux.c b/src/bin/evas/evas_cserve2_main_loop_linux.c
index ca156f2597..52ed3a92d6 100644
--- a/src/bin/evas/evas_cserve2_main_loop_linux.c
+++ b/src/bin/evas/evas_cserve2_main_loop_linux.c
@@ -61,7 +61,7 @@ static Timeout_Cb timeout_func = NULL;
 static Main_Loop_Child_Dead_Cb reap_children_func = NULL;
 
 #ifndef UNIX_PATH_MAX
-#define UNIX_PATH_MAX sizeof(socket_local.sun_path)
+#define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
 #endif
 
 static void