diff --git a/src/meson.build b/src/meson.build
index ab5cab0..26a82f9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -60,12 +60,11 @@ virglrenderer_sources = [
    'virglrenderer_hw.h',
 ]
 
-
-virgl_egl_sources = [
-   'virgl_gbm.c',
-   'virgl_gbm.h',
-   'virgl_egl_context.c',
-   'virgl_egl.h',
+vrend_winsys_egl_sources = [
+   'vrend_winsys_gbm.c',
+   'vrend_winsys_gbm.h',
+   'vrend_winsys_egl.c',
+   'vrend_winsys_egl.h',
 ]
 
 virgl_glx_sources = [
@@ -84,7 +83,7 @@ virgl_depends = [
 virgl_sources += vrend_sources
 
 if have_egl
-   virgl_sources += virgl_egl_sources
+   virgl_sources += vrend_winsys_egl_sources
    virgl_depends += [gbm_dep]
 endif
 
diff --git a/src/virglrenderer.c b/src/virglrenderer.c
index ce43c89..9bc1ae8 100644
--- a/src/virglrenderer.c
+++ b/src/virglrenderer.c
@@ -43,8 +43,8 @@
 #include "virgl_resource.h"
 
 #ifdef HAVE_EPOXY_EGL_H
-#include "virgl_gbm.h"
-#include "virgl_egl.h"
+#include "vrend_winsys_gbm.h"
+#include "vrend_winsys_egl.h"
 #endif
 
 #ifdef HAVE_EPOXY_GLX_H
diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
index 28172e1..29cd7ac 100644
--- a/src/vrend_renderer.c
+++ b/src/vrend_renderer.c
@@ -61,8 +61,8 @@
 #endif
 
 #ifdef HAVE_EPOXY_EGL_H
-#include "virgl_gbm.h"
-#include "virgl_egl.h"
+#include "vrend_winsys_gbm.h"
+#include "vrend_winsys_egl.h"
 extern struct virgl_gbm *gbm;
 extern struct virgl_egl *egl;
 #endif
diff --git a/src/vrend_renderer.h b/src/vrend_renderer.h
index 424d750..e2107b9 100644
--- a/src/vrend_renderer.h
+++ b/src/vrend_renderer.h
@@ -32,7 +32,7 @@
 #include "vrend_debug.h"
 #include "vrend_tweaks.h"
 #include "vrend_iov.h"
-#include "virgl_gbm.h"
+#include "vrend_winsys_gbm.h"
 #include "virgl_hw.h"
 #include <epoxy/gl.h>
 
diff --git a/src/virgl_egl_context.c b/src/vrend_winsys_egl.c
similarity index 99%
rename from src/virgl_egl_context.c
rename to src/vrend_winsys_egl.c
index 3949c22..85aab16 100644
--- a/src/virgl_egl_context.c
+++ b/src/vrend_winsys_egl.c
@@ -40,9 +40,9 @@
 #include "util/u_memory.h"
 
 #include "virglrenderer.h"
-#include "virgl_egl.h"
+#include "vrend_winsys_egl.h"
 #include "virgl_hw.h"
-#include "virgl_gbm.h"
+#include "vrend_winsys_gbm.h"
 #include "virgl_util.h"
 
 #define EGL_KHR_SURFACELESS_CONTEXT            BIT(0)
diff --git a/src/virgl_egl.h b/src/vrend_winsys_egl.h
similarity index 100%
rename from src/virgl_egl.h
rename to src/vrend_winsys_egl.h
diff --git a/src/virgl_gbm.c b/src/vrend_winsys_gbm.c
similarity index 99%
rename from src/virgl_gbm.c
rename to src/vrend_winsys_gbm.c
index 7a0499e..3b2369e 100644
--- a/src/virgl_gbm.c
+++ b/src/vrend_winsys_gbm.c
@@ -38,7 +38,7 @@
 #include "util/u_memory.h"
 #include "pipe/p_state.h"
 
-#include "virgl_gbm.h"
+#include "vrend_winsys_gbm.h"
 #include "virgl_hw.h"
 #include "vrend_debug.h"
 
diff --git a/src/virgl_gbm.h b/src/vrend_winsys_gbm.h
similarity index 100%
rename from src/virgl_gbm.h
rename to src/vrend_winsys_gbm.h
diff --git a/tests/test_fuzzer_formats.c b/tests/test_fuzzer_formats.c
index 9ad59b9..154a2e5 100644
--- a/tests/test_fuzzer_formats.c
+++ b/tests/test_fuzzer_formats.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #include "virgl_hw.h"
-#include "virgl_egl.h"
+#include "vrend_winsys_egl.h"
 #include "virglrenderer.h"
 #include "virgl_protocol.h"
 #include "os/os_misc.h"