Remove wlr_ prefix from local symbols

17 files changed, 120 insertions, 118 deletions

diff --git a/backend/drm/atomic.c b/backend/drm/atomic.c
index 29b5ccb1..fb3ab098 100644
--- a/backend/drm/atomic.c
+++ b/backend/drm/atomic.c
@@ -237,7 +237,7 @@ static uint32_t atomic_crtc_get_gamma_size(struct wlr_drm_backend *drm,
 		return legacy_iface.crtc_get_gamma_size(drm, crtc);
 	}
 
-	if (!wlr_drm_get_prop(drm->fd, crtc->id, crtc->props.gamma_lut_size,
+	if (!drm_get_prop(drm->fd, crtc->id, crtc->props.gamma_lut_size,
 			   &gamma_lut_size)) {
 		wlr_log(L_ERROR, "Unable to get gamma lut size");
 		return 0;
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 66cb89d3..5dc8a119 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -17,7 +17,7 @@
 
 static bool wlr_drm_backend_start(struct wlr_backend *backend) {
 	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)backend;
-	wlr_drm_scan_connectors(drm);
+	drm_scan_connectors(drm);
 	return true;
 }
 
@@ -28,7 +28,7 @@ static void wlr_drm_backend_destroy(struct wlr_backend *backend) {
 
 	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)backend;
 
-	wlr_drm_restore_outputs(drm);
+	drm_restore_outputs(drm);
 
 	struct wlr_drm_connector *conn, *next;
 	wl_list_for_each_safe(conn, next, &drm->outputs, link) {
@@ -41,8 +41,8 @@ static void wlr_drm_backend_destroy(struct wlr_backend *backend) {
 	wl_list_remove(&drm->session_signal.link);
 	wl_list_remove(&drm->drm_invalidated.link);
 
-	wlr_drm_resources_free(drm);
-	wlr_drm_renderer_finish(&drm->renderer);
+	drm_resources_finish(drm);
+	drm_renderer_finish(&drm->renderer);
 	wlr_session_close_file(drm->session, drm->fd);
 	wl_event_source_remove(drm->drm_event);
 	free(drm);
@@ -71,14 +71,14 @@ static void session_signal(struct wl_listener *listener, void *data) {
 
 	if (session->active) {
 		wlr_log(L_INFO, "DRM fd resumed");
-		wlr_drm_scan_connectors(drm);
+		drm_scan_connectors(drm);
 
 		struct wlr_drm_connector *conn;
 		wl_list_for_each(conn, &drm->outputs, link){
 			if (conn->output.enabled) {
 				wlr_output_set_mode(&conn->output, conn->output.current_mode);
 			} else {
-				wlr_drm_connector_enable(&conn->output, false);
+				drm_connector_enable(&conn->output, false);
 			}
 
 			if (!conn->crtc) {
@@ -104,7 +104,7 @@ static void drm_invalidated(struct wl_listener *listener, void *data) {
 	wlr_log(L_DEBUG, "%s invalidated", name);
 	free(name);
 
-	wlr_drm_scan_connectors(drm);
+	drm_scan_connectors(drm);
 }
 
 static void handle_display_destroy(struct wl_listener *listener, void *data) {
@@ -144,7 +144,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
 	struct wl_event_loop *event_loop = wl_display_get_event_loop(display);
 
 	drm->drm_event = wl_event_loop_add_fd(event_loop, drm->fd,
-		WL_EVENT_READABLE, wlr_drm_event, NULL);
+		WL_EVENT_READABLE, drm_event, NULL);
 	if (!drm->drm_event) {
 		wlr_log(L_ERROR, "Failed to create DRM event source");
 		goto error_fd;
@@ -153,15 +153,15 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
 	drm->session_signal.notify = session_signal;
 	wl_signal_add(&session->session_signal, &drm->session_signal);
 
-	if (!wlr_drm_check_features(drm)) {
+	if (!drm_check_features(drm)) {
 		goto error_event;
 	}
 
-	if (!wlr_drm_resources_init(drm)) {
+	if (!drm_resources_init(drm)) {
 		goto error_event;
 	}
 
-	if (!wlr_drm_renderer_init(drm, &drm->renderer)) {
+	if (!drm_renderer_init(drm, &drm->renderer)) {
 		wlr_log(L_ERROR, "Failed to initialize renderer");
 		goto error_event;
 	}
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index fcc435e6..e059df80 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -26,7 +26,7 @@
 #include "backend/drm/util.h"
 #include "util/signal.h"
 
-bool wlr_drm_check_features(struct wlr_drm_backend *drm) {
+bool drm_check_features(struct wlr_drm_backend *drm) {
 	if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
 		wlr_log(L_ERROR, "DRM universal planes unsupported");
 		return false;
@@ -87,8 +87,8 @@ static bool init_planes(struct wlr_drm_backend *drm) {
 		p->possible_crtcs = plane->possible_crtcs;
 		uint64_t type;
 
-		if (!wlr_drm_get_plane_props(drm->fd, p->id, &p->props) ||
-				!wlr_drm_get_prop(drm->fd, p->id, p->props.type, &type)) {
+		if (!drm_get_plane_props(drm->fd, p->id, &p->props) ||
+				!drm_get_prop(drm->fd, p->id, p->props.type, &type)) {
 			drmModeFreePlane(plane);
 			goto error_planes;
 		}
@@ -122,7 +122,7 @@ error_res:
 	return false;
 }
 
-bool wlr_drm_resources_init(struct wlr_drm_backend *drm) {
+bool drm_resources_init(struct wlr_drm_backend *drm) {
 	drmModeRes *res = drmModeGetResources(drm->fd);
 	if (!res) {
 		wlr_log_errno(L_ERROR, "Failed to get DRM resources");
@@ -142,7 +142,7 @@ bool wlr_drm_resources_init(struct wlr_drm_backend *drm) {
 		struct wlr_drm_crtc *crtc = &drm->crtcs[i];
 		crtc->id = res->crtcs[i];
 		crtc->legacy_crtc = drmModeGetCrtc(drm->fd, crtc->id);
-		wlr_drm_get_crtc_props(drm->fd, crtc->id, &crtc->props);
+		drm_get_crtc_props(drm->fd, crtc->id, &crtc->props);
 	}
 
 	if (!init_planes(drm)) {
@@ -160,7 +160,7 @@ error_res:
 	return false;
 }
 
-void wlr_drm_resources_free(struct wlr_drm_backend *drm) {
+void drm_resources_finish(struct wlr_drm_backend *drm) {
 	if (!drm) {
 		return;
 	}
@@ -187,13 +187,13 @@ void wlr_drm_resources_free(struct wlr_drm_backend *drm) {
 	free(drm->planes);
 }
 
-static bool wlr_drm_connector_make_current(struct wlr_output *output,
+static bool drm_connector_make_current(struct wlr_output *output,
 		int *buffer_age) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
-	return wlr_drm_surface_make_current(&conn->crtc->primary->surf, buffer_age);
+	return drm_surface_make_current(&conn->crtc->primary->surf, buffer_age);
 }
 
-static bool wlr_drm_connector_swap_buffers(struct wlr_output *output,
+static bool drm_connector_swap_buffers(struct wlr_output *output,
 		pixman_region32_t *damage) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
 	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend;
@@ -207,9 +207,9 @@ static bool wlr_drm_connector_swap_buffers(struct wlr_output *output,
 	}
 	struct wlr_drm_plane *plane = crtc->primary;
 
-	struct gbm_bo *bo = wlr_drm_surface_swap_buffers(&plane->surf, damage);
+	struct gbm_bo *bo = drm_surface_swap_buffers(&plane->surf, damage);
 	if (drm->parent) {
-		bo = wlr_drm_surface_mgpu_copy(&plane->mgpu_surf, bo);
+		bo = drm_surface_mgpu_copy(&plane->mgpu_surf, bo);
 	}
 	uint32_t fb_id = get_fb_for_bo(bo);
 
@@ -227,7 +227,7 @@ static bool wlr_drm_connector_swap_buffers(struct wlr_output *output,
 	return true;
 }
 
-static void wlr_drm_connector_set_gamma(struct wlr_output *output,
+static void drm_connector_set_gamma(struct wlr_output *output,
 		uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
 	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend;
@@ -242,7 +242,7 @@ static void wlr_drm_connector_set_gamma(struct wlr_output *output,
 
 }
 
-static uint32_t wlr_drm_connector_get_gamma_size(struct wlr_output *output) {
+static uint32_t drm_connector_get_gamma_size(struct wlr_output *output) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
 	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend;
 
@@ -253,7 +253,7 @@ static uint32_t wlr_drm_connector_get_gamma_size(struct wlr_output *output) {
 	return 0;
 }
 
-void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn) {
+static void drm_connector_start_renderer(struct wlr_drm_connector *conn) {
 	if (conn->state != WLR_DRM_CONN_CONNECTED) {
 		return;
 	}
@@ -265,7 +265,7 @@ void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn) {
 	}
 	struct wlr_drm_plane *plane = crtc->primary;
 
-	struct gbm_bo *bo = wlr_drm_surface_get_front(
+	struct gbm_bo *bo = drm_surface_get_front(
 		drm->parent ? &plane->mgpu_surf : &plane->surf);
 	uint32_t fb_id = get_fb_for_bo(bo);
 
@@ -279,7 +279,7 @@ void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn) {
 	}
 }
 
-void wlr_drm_connector_enable(struct wlr_output *output, bool enable) {
+void drm_connector_enable(struct wlr_output *output, bool enable) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
 	if (conn->state != WLR_DRM_CONN_CONNECTED) {
 		return;
@@ -292,7 +292,7 @@ void wlr_drm_connector_enable(struct wlr_output *output, bool enable) {
 	}
 
 	if (enable) {
-		wlr_drm_connector_start_renderer(conn);
+		drm_connector_start_renderer(conn);
 	}
 
 	wlr_output_update_enabled(&conn->output, enable);
@@ -340,9 +340,9 @@ static void realloc_planes(struct wlr_drm_backend *drm, const uint32_t *crtc_in,
 			if (*old != new) {
 				changed_outputs[crtc_res[i]] = true;
 				if (*old) {
-					wlr_drm_surface_finish(&(*old)->surf);
+					drm_surface_finish(&(*old)->surf);
 				}
-				wlr_drm_surface_finish(&new->surf);
+				drm_surface_finish(&new->surf);
 				*old = new;
 			}
 		}
@@ -461,7 +461,9 @@ error_conn:
 	return 0;
 }
 
-static bool wlr_drm_connector_set_mode(struct wlr_output *output,
+static void drm_connector_cleanup(struct wlr_drm_connector *conn);
+
+static bool drm_connector_set_mode(struct wlr_output *output,
 		struct wlr_output_mode *mode) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
 	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend;
@@ -513,28 +515,28 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output,
 			continue;
 		}
 
-		if (!wlr_drm_plane_surfaces_init(crtc->primary, drm,
+		if (!drm_plane_surfaces_init(crtc->primary, drm,
 				mode->width, mode->height, GBM_FORMAT_XRGB8888)) {
 			wlr_log(L_ERROR, "Failed to initialize renderer for plane");
 			goto error_conn;
 		}
 
-		wlr_drm_connector_start_renderer(conn);
+		drm_connector_start_renderer(conn);
 	}
 
 	return true;
 
 error_conn:
-	wlr_drm_connector_cleanup(conn);
+	drm_connector_cleanup(conn);
 	return false;
 }
 
-static void wlr_drm_connector_transform(struct wlr_output *output,
+static void drm_connector_transform(struct wlr_output *output,
 		enum wl_output_transform transform) {
 	output->transform = transform;
 }
 
-static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
+static bool drm_connector_set_cursor(struct wlr_output *output,
 		const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height,
 		int32_t hotspot_x, int32_t hotspot_y, bool update_pixels) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
@@ -570,7 +572,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
 			return false;
 		}
 
-		if (!wlr_drm_surface_init(&plane->surf, renderer, w, h,
+		if (!drm_surface_init(&plane->surf, renderer, w, h,
 				GBM_FORMAT_ARGB8888, 0)) {
 			wlr_log(L_ERROR, "Cannot allocate cursor resources");
 			return false;
@@ -629,7 +631,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
 			return false;
 		}
 
-		wlr_drm_surface_make_current(&plane->surf, NULL);
+		drm_surface_make_current(&plane->surf, NULL);
 
 		struct wlr_renderer *rend = plane->surf.renderer->wlr_rend;
 
@@ -648,7 +650,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
 		wlr_renderer_read_pixels(rend, WL_SHM_FORMAT_ARGB8888, bo_stride,
 			plane->surf.width, plane->surf.height, 0, 0, 0, 0, bo_data);
 
-		wlr_drm_surface_swap_buffers(&plane->surf, NULL);
+		drm_surface_swap_buffers(&plane->surf, NULL);
 
 		wlr_texture_destroy(texture);
 		gbm_bo_unmap(plane->cursor_bo, bo_data);
@@ -666,7 +668,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
 	return ok;
 }
 
-static bool wlr_drm_connector_move_cursor(struct wlr_output *output,
+static bool drm_connector_move_cursor(struct wlr_output *output,
 		int x, int y) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
 	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend;
@@ -703,25 +705,25 @@ static bool wlr_drm_connector_move_cursor(struct wlr_output *output,
 	return ok;
 }
 
-static void wlr_drm_connector_destroy(struct wlr_output *output) {
+static void drm_connector_destroy(struct wlr_output *output) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
-	wlr_drm_connector_cleanup(conn);
+	drm_connector_cleanup(conn);
 	wl_event_source_remove(conn->retry_pageflip);
 	wl_list_remove(&conn->link);
 	free(conn);
 }
 
-static struct wlr_output_impl output_impl = {
-	.enable = wlr_drm_connector_enable,
-	.set_mode = wlr_drm_connector_set_mode,
-	.transform = wlr_drm_connector_transform,
-	.set_cursor = wlr_drm_connector_set_cursor,
-	.move_cursor = wlr_drm_connector_move_cursor,
-	.destroy = wlr_drm_connector_destroy,
-	.make_current = wlr_drm_connector_make_current,
-	.swap_buffers = wlr_drm_connector_swap_buffers,
-	.set_gamma = wlr_drm_connector_set_gamma,
-	.get_gamma_size = wlr_drm_connector_get_gamma_size,
+static const struct wlr_output_impl output_impl = {
+	.enable = drm_connector_enable,
+	.set_mode = drm_connector_set_mode,
+	.transform = drm_connector_transform,
+	.set_cursor = drm_connector_set_cursor,
+	.move_cursor = drm_connector_move_cursor,
+	.destroy = drm_connector_destroy,
+	.make_current = drm_connector_make_current,
+	.swap_buffers = drm_connector_swap_buffers,
+	.set_gamma = drm_connector_set_gamma,
+	.get_gamma_size = drm_connector_get_gamma_size,
 };
 
 bool wlr_output_is_drm(struct wlr_output *output) {
@@ -731,7 +733,7 @@ bool wlr_output_is_drm(struct wlr_output *output) {
 static int retry_pageflip(void *data) {
 	struct wlr_drm_connector *conn = data;
 	wlr_log(L_INFO, "%s: Retrying pageflip", conn->output.name);
-	wlr_drm_connector_start_renderer(conn);
+	drm_connector_start_renderer(conn);
 	return 0;
 }
 
@@ -744,7 +746,7 @@ static const int32_t subpixel_map[] = {
 	[DRM_MODE_SUBPIXEL_NONE] = WL_OUTPUT_SUBPIXEL_NONE,
 };
 
-void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
+void drm_scan_connectors(struct wlr_drm_backend *drm) {
 	wlr_log(L_INFO, "Scanning DRM connectors");
 
 	drmModeRes *res = drmModeGetResources(drm->fd);
@@ -834,10 +836,10 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 				wlr_conn->output.phys_width, wlr_conn->output.phys_height);
 			wlr_conn->output.subpixel = subpixel_map[drm_conn->subpixel];
 
-			wlr_drm_get_connector_props(drm->fd, wlr_conn->id, &wlr_conn->props);
+			drm_get_connector_props(drm->fd, wlr_conn->id, &wlr_conn->props);
 
 			size_t edid_len = 0;
-			uint8_t *edid = wlr_drm_get_prop_blob(drm->fd,
+			uint8_t *edid = drm_get_prop_blob(drm->fd,
 				wlr_conn->id, wlr_conn->props.edid, &edid_len);
 			parse_edid(&wlr_conn->output, edid_len, edid);
 			free(edid);
@@ -874,7 +876,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 			wlr_log(L_INFO, "'%s' disconnected", wlr_conn->output.name);
 
 			wlr_output_update_enabled(&wlr_conn->output, false);
-			wlr_drm_connector_cleanup(wlr_conn);
+			drm_connector_cleanup(wlr_conn);
 		}
 
 		drmModeFreeEncoder(curr_enc);
@@ -892,7 +894,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 		}
 
 		wlr_log(L_INFO, "'%s' disappeared", conn->output.name);
-		wlr_drm_connector_cleanup(conn);
+		drm_connector_cleanup(conn);
 
 		drmModeFreeCrtc(conn->old_crtc);
 		wl_event_source_remove(conn->retry_pageflip);
@@ -911,9 +913,9 @@ static void page_flip_handler(int fd, unsigned seq,
 		return;
 	}
 
-	wlr_drm_surface_post(&conn->crtc->primary->surf);
+	drm_surface_post(&conn->crtc->primary->surf);
 	if (drm->parent) {
-		wlr_drm_surface_post(&conn->crtc->primary->mgpu_surf);
+		drm_surface_post(&conn->crtc->primary->mgpu_surf);
 	}
 
 	if (drm->session->active) {
@@ -921,7 +923,7 @@ static void page_flip_handler(int fd, unsigned seq,
 	}
 }
 
-int wlr_drm_event(int fd, uint32_t mask, void *data) {
+int drm_event(int fd, uint32_t mask, void *data) {
 	drmEventContext event = {
 		.version = DRM_EVENT_CONTEXT_VERSION,
 		.page_flip_handler = page_flip_handler,
@@ -931,7 +933,7 @@ int wlr_drm_event(int fd, uint32_t mask, void *data) {
 	return 1;
 }
 
-void wlr_drm_restore_outputs(struct wlr_drm_backend *drm) {
+void drm_restore_outputs(struct wlr_drm_backend *drm) {
 	uint64_t to_close = (1 << wl_list_length(&drm->outputs)) - 1;
 
 	struct wlr_drm_connector *conn;
@@ -944,7 +946,7 @@ void wlr_drm_restore_outputs(struct wlr_drm_backend *drm) {
 	time_t timeout = time(NULL) + 5;
 
 	while (to_close && time(NULL) < timeout) {
-		wlr_drm_event(drm->fd, 0, NULL);
+		drm_event(drm->fd, 0, NULL);
 		size_t i = 0;
 		struct wlr_drm_connector *conn;
 		wl_list_for_each(conn, &drm->outputs, link) {
@@ -971,7 +973,7 @@ void wlr_drm_restore_outputs(struct wlr_drm_backend *drm) {
 	}
 }
 
-void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn) {
+static void drm_connector_cleanup(struct wlr_drm_connector *conn) {
 	if (!conn) {
 		return;
 	}
@@ -985,8 +987,8 @@ void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn) {
 				continue;
 			}
 
-			wlr_drm_surface_finish(&crtc->planes[i]->surf);
-			wlr_drm_surface_finish(&crtc->planes[i]->mgpu_surf);
+			drm_surface_finish(&crtc->planes[i]->surf);
+			drm_surface_finish(&crtc->planes[i]->mgpu_surf);
 			if (crtc->planes[i]->id == 0) {
 				free(crtc->planes[i]);
 				crtc->planes[i] = NULL;
diff --git a/backend/drm/properties.c b/backend/drm/properties.c
index 3d35beb5..c424989a 100644
--- a/backend/drm/properties.c
+++ b/backend/drm/properties.c
@@ -87,22 +87,22 @@ static bool scan_properties(int fd, uint32_t id, uint32_t type, uint32_t *result
 	return true;
 }
 
-bool wlr_drm_get_connector_props(int fd, uint32_t id, union wlr_drm_connector_props *out) {
+bool drm_get_connector_props(int fd, uint32_t id, union wlr_drm_connector_props *out) {
 	return scan_properties(fd, id, DRM_MODE_OBJECT_CONNECTOR, out->props,
 		connector_info, sizeof(connector_info) / sizeof(connector_info[0]));
 }
 
-bool wlr_drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out) {
+bool drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out) {
 	return scan_properties(fd, id, DRM_MODE_OBJECT_CRTC, out->props,
 		crtc_info, sizeof(crtc_info) / sizeof(crtc_info[0]));
 }
 
-bool wlr_drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out) {
+bool drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out) {
 	return scan_properties(fd, id, DRM_MODE_OBJECT_PLANE, out->props,
 		plane_info, sizeof(plane_info) / sizeof(plane_info[0]));
 }
 
-bool wlr_drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret) {
+bool drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret) {
 	drmModeObjectProperties *props = drmModeObjectGetProperties(fd, obj, DRM_MODE_OBJECT_ANY);
 	if (!props) {
 		return false;
@@ -122,9 +122,9 @@ bool wlr_drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret) {
 	return found;
 }
 
-void *wlr_drm_get_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len) {
+void *drm_get_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len) {
 	uint64_t blob_id;
-	if (!wlr_drm_get_prop(fd, obj, prop, &blob_id)) {
+	if (!drm_get_prop(fd, obj, prop, &blob_id)) {
 		return NULL;
 	}
 
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index ea46a5e9..d86dc629 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -18,7 +18,7 @@
 #define DRM_FORMAT_MOD_LINEAR 0
 #endif
 
-bool wlr_drm_renderer_init(struct wlr_drm_backend *drm,
+bool drm_renderer_init(struct wlr_drm_backend *drm,
 		struct wlr_drm_renderer *renderer) {
 	renderer->gbm = gbm_create_device(drm->fd);
 	if (!renderer->gbm) {
@@ -47,7 +47,7 @@ error_gbm:
 	return false;
 }
 
-void wlr_drm_renderer_finish(struct wlr_drm_renderer *renderer) {
+void drm_renderer_finish(struct wlr_drm_renderer *renderer) {
 	if (!renderer) {
 		return;
 	}
@@ -57,7 +57,7 @@ void wlr_drm_renderer_finish(struct wlr_drm_renderer *renderer) {
 	gbm_device_destroy(renderer->gbm);
 }
 
-bool wlr_drm_surface_init(struct wlr_drm_surface *surf,
+bool drm_surface_init(struct wlr_drm_surface *surf,
 		struct wlr_drm_renderer *renderer, uint32_t width, uint32_t height,
 		uint32_t format, uint32_t flags) {
 	if (surf->width == width && surf->height == height) {
@@ -103,7 +103,7 @@ error_zero:
 	return false;
 }
 
-void wlr_drm_surface_finish(struct wlr_drm_surface *surf) {
+void drm_surface_finish(struct wlr_drm_surface *surf) {
 	if (!surf || !surf->renderer) {
 		return;
 	}
@@ -123,12 +123,12 @@ void wlr_drm_surface_finish(struct wlr_drm_surface *surf) {
 	memset(surf, 0, sizeof(*surf));
 }
 
-bool wlr_drm_surface_make_current(struct wlr_drm_surface *surf,
+bool drm_surface_make_current(struct wlr_drm_surface *surf,
 		int *buffer_damage) {
 	return wlr_egl_make_current(&surf->renderer->egl, surf->egl, buffer_damage);
 }
 
-struct gbm_bo *wlr_drm_surface_swap_buffers(struct wlr_drm_surface *surf,
+struct gbm_bo *drm_surface_swap_buffers(struct wlr_drm_surface *surf,
 		pixman_region32_t *damage) {
 	if (surf->front) {
 		gbm_surface_release_buffer(surf->gbm, surf->front);
@@ -141,20 +141,20 @@ struct gbm_bo *wlr_drm_surface_swap_buffers(struct wlr_drm_surface *surf,
 	return surf->back;
 }
 
-struct gbm_bo *wlr_drm_surface_get_front(struct wlr_drm_surface *surf) {
+struct gbm_bo *drm_surface_get_front(struct wlr_drm_surface *surf) {
 	if (surf->front) {
 		return surf->front;
 	}
 
-	wlr_drm_surface_make_current(surf, NULL);
+	drm_surface_make_current(surf, NULL);
 	struct wlr_renderer *renderer = surf->renderer->wlr_rend;
 	wlr_renderer_begin(renderer, surf->width, surf->height);
 	wlr_renderer_clear(renderer, (float[]){ 0.0, 0.0, 0.0, 1.0 });
 	wlr_renderer_end(renderer);
-	return wlr_drm_surface_swap_buffers(surf, NULL);
+	return drm_surface_swap_buffers(surf, NULL);
 }
 
-void wlr_drm_surface_post(struct wlr_drm_surface *surf) {
+void drm_surface_post(struct wlr_drm_surface *surf) {
 	if (surf->front) {
 		gbm_surface_release_buffer(surf->gbm, surf->front);
 		surf->front = NULL;
@@ -208,9 +208,9 @@ static struct wlr_texture *get_tex_for_bo(struct wlr_drm_renderer *renderer,
 	return tex->tex;
 }
 
-struct gbm_bo *wlr_drm_surface_mgpu_copy(struct wlr_drm_surface *dest,
+struct gbm_bo *drm_surface_mgpu_copy(struct wlr_drm_surface *dest,
 		struct gbm_bo *src) {
-	wlr_drm_surface_make_current(dest, NULL);
+	drm_surface_make_current(dest, NULL);
 
 	struct wlr_texture *tex = get_tex_for_bo(dest->renderer, src);
 	assert(tex);
@@ -224,25 +224,25 @@ struct gbm_bo *wlr_drm_surface_mgpu_copy(struct wlr_drm_surface *dest,
 	wlr_render_texture_with_matrix(renderer, tex, mat, 1.0f);
 	wlr_renderer_end(renderer);
 
-	return wlr_drm_surface_swap_buffers(dest, NULL);
+	return drm_surface_swap_buffers(dest, NULL);
 }
 
-bool wlr_drm_plane_surfaces_init(struct wlr_drm_plane *plane,
+bool drm_plane_surfaces_init(struct wlr_drm_plane *plane,
 		struct wlr_drm_backend *drm, int32_t width, uint32_t height,
 		uint32_t format) {
 	if (!drm->parent) {
-		return wlr_drm_surface_init(&plane->surf, &drm->renderer, width, height,
+		return drm_surface_init(&plane->surf, &drm->renderer, width, height,
 			format, GBM_BO_USE_SCANOUT);
 	}
 
-	if (!wlr_drm_surface_init(&plane->surf, &drm->parent->renderer,
+	if (!drm_surface_init(&plane->surf, &drm->parent->renderer,
 			width, height, format, GBM_BO_USE_LINEAR)) {
 		return false;
 	}
 
-	if (!wlr_drm_surface_init(&plane->mgpu_surf, &drm->renderer,
+	if (!drm_surface_init(&plane->mgpu_surf, &drm->renderer,
 			width, height, format, GBM_BO_USE_SCANOUT)) {
-		wlr_drm_surface_finish(&plane->surf);
+		drm_surface_finish(&plane->surf);
 		return false;
 	}
 
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index ef33df0a..72da03da 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -32,7 +32,7 @@ static int wlr_libinput_readable(int fd, uint32_t mask, void *_backend) {
 	}
 	struct libinput_event *event;
 	while ((event = libinput_get_event(backend->libinput_context))) {
-		wlr_libinput_event(backend, event);
+		libinput_handle_event(backend, event);
 		libinput_event_destroy(event);
 	}
 	return 0;
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index da7b2be4..a136d1e6 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -86,7 +86,7 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
 		if (!wlr_dev) {
 			goto fail;
 		}
-		wlr_dev->keyboard = wlr_libinput_keyboard_create(libinput_dev);
+		wlr_dev->keyboard = libinput_keyboard_create(libinput_dev);
 		if (!wlr_dev->keyboard) {
 			free(wlr_dev);
 			goto fail;
@@ -99,7 +99,7 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
 		if (!wlr_dev) {
 			goto fail;
 		}
-		wlr_dev->pointer = wlr_libinput_pointer_create(libinput_dev);
+		wlr_dev->pointer = libinput_pointer_create(libinput_dev);
 		if (!wlr_dev->pointer) {
 			free(wlr_dev);
 			goto fail;
@@ -112,7 +112,7 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
 		if (!wlr_dev) {
 			goto fail;
 		}
-		wlr_dev->touch = wlr_libinput_touch_create(libinput_dev);
+		wlr_dev->touch = libinput_touch_create(libinput_dev);
 		if (!wlr_dev->touch) {
 			free(wlr_dev);
 			goto fail;
@@ -125,7 +125,7 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
 		if (!wlr_dev) {
 			goto fail;
 		}
-		wlr_dev->tablet_tool = wlr_libinput_tablet_tool_create(libinput_dev);
+		wlr_dev->tablet_tool = libinput_tablet_tool_create(libinput_dev);
 		if (!wlr_dev->tablet_tool) {
 			free(wlr_dev);
 			goto fail;
@@ -138,7 +138,7 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
 		if (!wlr_dev) {
 			goto fail;
 		}
-		wlr_dev->tablet_pad = wlr_libinput_tablet_pad_create(libinput_dev);
+		wlr_dev->tablet_pad = libinput_tablet_pad_create(libinput_dev);
 		if (!wlr_dev->tablet_pad) {
 			free(wlr_dev);
 			goto fail;
@@ -192,7 +192,7 @@ static void handle_device_removed(struct wlr_libinput_backend *backend,
 	free(wlr_devices);
 }
 
-void wlr_libinput_event(struct wlr_libinput_backend *backend,
+void libinput_handle_event(struct wlr_libinput_backend *backend,
 		struct libinput_event *event) {
 	assert(backend && event);
 	struct libinput_device *libinput_dev = libinput_event_get_device(event);
diff --git a/backend/libinput/keyboard.c b/backend/libinput/keyboard.c
index b44bc892..32cedd98 100644
--- a/backend/libinput/keyboard.c
+++ b/backend/libinput/keyboard.c
@@ -28,7 +28,7 @@ struct wlr_keyboard_impl impl = {
 	.led_update = wlr_libinput_keyboard_set_leds
 };
 
-struct wlr_keyboard *wlr_libinput_keyboard_create(
+struct wlr_keyboard *libinput_keyboard_create(
 		struct libinput_device *libinput_dev) {
 	assert(libinput_dev);
 	struct wlr_libinput_keyboard *wlr_libinput_kb;
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index 9ccda634..219de189 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -8,7 +8,7 @@
 #include "backend/libinput.h"
 #include "util/signal.h"
 
-struct wlr_pointer *wlr_libinput_pointer_create(
+struct wlr_pointer *libinput_pointer_create(
 		struct libinput_device *libinput_dev) {
 	assert(libinput_dev);
 	struct wlr_pointer *wlr_pointer = calloc(1, sizeof(struct wlr_pointer));
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index f71e1efa..d98f40c0 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -8,7 +8,7 @@
 #include "backend/libinput.h"
 #include "util/signal.h"
 
-struct wlr_tablet_pad *wlr_libinput_tablet_pad_create(
+struct wlr_tablet_pad *libinput_tablet_pad_create(
 		struct libinput_device *libinput_dev) {
 	assert(libinput_dev);
 	struct wlr_tablet_pad *wlr_tablet_pad = calloc(1, sizeof(struct wlr_tablet_pad));
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 815c4daf..50cea65a 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -8,7 +8,7 @@
 #include "backend/libinput.h"
 #include "util/signal.h"
 
-struct wlr_tablet_tool *wlr_libinput_tablet_tool_create(
+struct wlr_tablet_tool *libinput_tablet_tool_create(
 		struct libinput_device *libinput_dev) {
 	assert(libinput_dev);
 	struct wlr_tablet_tool *wlr_tablet_tool = calloc(1, sizeof(struct wlr_tablet_tool));
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index 419c11ea..c61ca3d3 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -8,7 +8,7 @@
 #include "backend/libinput.h"
 #include "util/signal.h"
 
-struct wlr_touch *wlr_libinput_touch_create(
+struct wlr_touch *libinput_touch_create(
 		struct libinput_device *libinput_dev) {
 	assert(libinput_dev);
 	struct wlr_touch *wlr_touch = calloc(1, sizeof(struct wlr_touch));
diff --git a/backend/multi/backend.c b/backend/multi/backend.c
index 50563892..b70d7003 100644
--- a/backend/multi/backend.c
+++ b/backend/multi/backend.c
@@ -1,10 +1,10 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <wlr/backend/drm.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/session.h>
 #include <wlr/util/log.h>
-#include "backend/drm/drm.h"
 #include "backend/multi.h"
 #include "util/signal.h"
 
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 4bcb9360..35aaef49 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -43,7 +43,7 @@ static bool wlr_wl_backend_start(struct wlr_backend *_backend) {
 	struct wlr_wl_backend *backend = (struct wlr_wl_backend *)_backend;
 	wlr_log(L_INFO, "Initializating wayland backend");
 
-	wlr_wl_registry_poll(backend);
+	wl_registry_poll(backend);
 	if (!backend->compositor || !backend->shell) {
 		wlr_log_errno(L_ERROR, "Could not obtain retrieve required globals");
 		return false;
@@ -126,7 +126,7 @@ bool wlr_backend_is_wl(struct wlr_backend *b) {
 	return b->impl == &backend_impl;
 }
 
-struct wlr_wl_backend_output *wlr_wl_output_for_surface(
+struct wlr_wl_backend_output *wl_output_for_surface(
 		struct wlr_wl_backend *backend, struct wl_surface *surface) {
 	struct wlr_wl_backend_output *output;
 	wl_list_for_each(output, &backend->outputs, link) {
@@ -137,7 +137,7 @@ struct wlr_wl_backend_output *wlr_wl_output_for_surface(
 	return NULL;
 }
 
-void wlr_wl_output_layout_get_box(struct wlr_wl_backend *backend,
+void wl_output_layout_get_box(struct wlr_wl_backend *backend,
 		struct wlr_box *box) {
 	int min_x = INT_MAX, min_y = INT_MAX;
 	int max_x = INT_MIN, max_y = INT_MIN;
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 9391f07f..270056ab 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -84,7 +84,7 @@ static bool wlr_wl_output_set_cursor(struct wlr_output *_output,
 
 	if (!update_pixels) {
 		// Update hotspot without changing cursor image
-		wlr_wl_output_update_cursor(output);
+		wl_output_update_cursor(output);
 		return true;
 	}
 	if (!buf) {
@@ -95,7 +95,7 @@ static bool wlr_wl_output_set_cursor(struct wlr_output *_output,
 			output->cursor.surface = NULL;
 			output->cursor.buf_size = 0;
 		}
-		wlr_wl_output_update_cursor(output);
+		wl_output_update_cursor(output);
 		return true;
 	}
 
@@ -153,7 +153,7 @@ static bool wlr_wl_output_set_cursor(struct wlr_output *_output,
 	wl_surface_damage(output->cursor.surface, 0, 0, width, height);
 	wl_surface_commit(output->cursor.surface);
 
-	wlr_wl_output_update_cursor(output);
+	wl_output_update_cursor(output);
 	return true;
 }
 
@@ -192,7 +192,7 @@ static void wlr_wl_output_destroy(struct wlr_output *wlr_output) {
 	free(output);
 }
 
-void wlr_wl_output_update_cursor(struct wlr_wl_backend_output *output) {
+void wl_output_update_cursor(struct wlr_wl_backend_output *output) {
 	if (output->backend->pointer && output->enter_serial) {
 		wl_pointer_set_cursor(output->backend->pointer, output->enter_serial,
 			output->cursor.surface, output->cursor.hotspot_x,
@@ -200,7 +200,7 @@ void wlr_wl_output_update_cursor(struct wlr_wl_backend_output *output) {
 	}
 }
 
-bool wlr_wl_output_move_cursor(struct wlr_output *_output, int x, int y) {
+bool wl_output_move_cursor(struct wlr_output *_output, int x, int y) {
 	// TODO: only return true if x == current x and y == current y
 	return true;
 }
@@ -212,7 +212,7 @@ static struct wlr_output_impl output_impl = {
 	.make_current = wlr_wl_output_make_current,
 	.swap_buffers = wlr_wl_output_swap_buffers,
 	.set_cursor = wlr_wl_output_set_cursor,
-	.move_cursor = wlr_wl_output_move_cursor,
+	.move_cursor = wl_output_move_cursor,
 };
 
 bool wlr_output_is_wl(struct wlr_output *wlr_output) {
diff --git a/backend/wayland/registry.c b/backend/wayland/registry.c
index 4aa39f09..ce972161 100644
--- a/backend/wayland/registry.c
+++ b/backend/wayland/registry.c
@@ -48,7 +48,7 @@ static const struct wl_registry_listener registry_listener = {
 	.global_remove = registry_global_remove
 };
 
-void wlr_wl_registry_poll(struct wlr_wl_backend *backend) {
+void wl_registry_poll(struct wlr_wl_backend *backend) {
 	wl_registry_add_listener(backend->registry, &registry_listener, backend);
 	wl_display_dispatch(backend->remote_display);
 	wl_display_roundtrip(backend->remote_display);
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
index c6982fce..d951494b 100644
--- a/backend/wayland/wl_seat.c
+++ b/backend/wayland/wl_seat.c
@@ -21,7 +21,7 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
 	assert(dev && dev->pointer);
 	struct wlr_wl_pointer *wlr_wl_pointer = (struct wlr_wl_pointer *)dev->pointer;
 	struct wlr_wl_backend_output *output =
-		wlr_wl_output_for_surface(wlr_wl_dev->backend, surface);
+		wl_output_for_surface(wlr_wl_dev->backend, surface);
 	if (!output) {
 		// GNOME sends a pointer enter when the surface is being destroyed
 		return;
@@ -33,7 +33,7 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
 		&wlr_wl_pointer->output_destroy_listener);
 	wlr_wl_pointer->current_output = output;
 	output->enter_serial = serial;
-	wlr_wl_output_update_cursor(output);
+	wl_output_update_cursor(output);
 }
 
 static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer,
@@ -70,7 +70,7 @@ static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
 	box.y /= wlr_output->scale;
 
 	struct wlr_box layout_box;
-	wlr_wl_output_layout_get_box(wlr_wl_pointer->current_output->backend,
+	wl_output_layout_get_box(wlr_wl_pointer->current_output->backend,
 		&layout_box);
 
 	double ox = wlr_output->lx / (double)layout_box.width;