From f7f8b1639f5de938bdcaace2e6996200002ade4a Mon Sep 17 00:00:00 2001
From: Seunghun Lee <shiin.lee@samsung.com>
Date: Wed, 2 Mar 2022 11:03:37 +0900
Subject: [PATCH] Remove _t suffix from struct

Change-Id: I166e2fc310f3bf6ee2ae5986c85b06a74314d468
---
 include/libds/backend.h                     |  2 +-
 include/libds/buffer.h                      |  4 +--
 src/libds/addon.c                           | 18 ++++++-------
 src/libds/addon.h                           | 32 ++++++++++-------------
 src/libds/allocator/shm.c                   | 24 ++++++++---------
 src/libds/backend/wayland/backend.c         | 30 +++++++++++-----------
 src/libds/backend/wayland/backend.h         | 16 +++---------
 src/libds/backend/wayland/output.c          | 40 ++++++++++++++---------------
 src/libds/buffer.c                          |  2 +-
 src/libds/client_buffer.h                   |  4 +--
 src/libds/client_buffer/shm_client_buffer.c | 24 ++++++++---------
 src/libds/compositor.c                      |  2 +-
 src/libds/subcompositor.c                   |  6 ++---
 src/libds/subcompositor.h                   |  6 ++---
 src/libds/surface/surface-private.h         |  6 ++---
 src/libds/xdg_shell/xdg_shell.h             |  6 ++---
 16 files changed, 101 insertions(+), 121 deletions(-)

diff --git a/include/libds/backend.h b/include/libds/backend.h
index 71d9e63..6b587d2 100644
--- a/include/libds/backend.h
+++ b/include/libds/backend.h
@@ -20,7 +20,7 @@ ds_backend_destroy(struct ds_backend *backend);
 int
 ds_backend_get_drm_fd(struct ds_backend *backend);
 
-ds_buffer_caps_t
+enum ds_buffer_caps
 ds_backend_get_buffer_caps(struct ds_backend *backend);
 
 void
diff --git a/include/libds/buffer.h b/include/libds/buffer.h
index eac5146..c91cba7 100644
--- a/include/libds/buffer.h
+++ b/include/libds/buffer.h
@@ -12,12 +12,12 @@ extern "C" {
 
 struct ds_buffer;
 
-typedef enum
+enum ds_buffer_caps
 {
     DS_BUFFER_CAP_DATA_PTR = 1 << 0,
     DS_BUFFER_CAP_DMABUF = 1 << 1,
     DS_BUFFER_CAP_SHM = 1 << 2,
-} ds_buffer_caps_t;
+};
 
 enum ds_buffer_data_ptr_access_flag
 {
diff --git a/src/libds/addon.c b/src/libds/addon.c
index 9b34b11..e1858ff 100644
--- a/src/libds/addon.c
+++ b/src/libds/addon.c
@@ -9,9 +9,9 @@ ds_addon_set_init(struct ds_addon_set *set)
 }
 
 void
-ds_addon_set_finish(ds_addon_set_t *set)
+ds_addon_set_finish(struct ds_addon_set *set)
 {
-    ds_addon_t *addon, *tmp;
+    struct ds_addon *addon, *tmp;
 
     wl_list_for_each_safe(addon, tmp, &set->addons, link) {
         ds_addon_finish(addon);
@@ -20,10 +20,10 @@ ds_addon_set_finish(ds_addon_set_t *set)
 }
 
 void
-ds_addon_init(ds_addon_t *addon, ds_addon_set_t *set,
-        const void *owner, const ds_addon_interface_t *impl)
+ds_addon_init(struct ds_addon *addon, struct ds_addon_set *set,
+        const void *owner, const struct ds_addon_interface *impl)
 {
-    ds_addon_t *iter;
+    struct ds_addon *iter;
 
     assert(owner && impl);
 
@@ -39,15 +39,15 @@ ds_addon_init(ds_addon_t *addon, ds_addon_set_t *set,
 }
 
 void
-ds_addon_finish(ds_addon_t *addon)
+ds_addon_finish(struct ds_addon *addon)
 {
     wl_list_remove(&addon->link);
     wl_list_init(&addon->link);
 }
 
-ds_addon_t *
-ds_addon_find(ds_addon_set_t *set, const void *owner,
-        const ds_addon_interface_t *impl)
+struct ds_addon *
+ds_addon_find(struct ds_addon_set *set, const void *owner,
+        const struct ds_addon_interface *impl)
 {
     struct ds_addon *addon;
 
diff --git a/src/libds/addon.h b/src/libds/addon.h
index bb04e7b..2e7b0e1 100644
--- a/src/libds/addon.h
+++ b/src/libds/addon.h
@@ -3,40 +3,36 @@
 
 #include <wayland-util.h>
 
-typedef struct ds_addon_set ds_addon_set_t;
-typedef struct ds_addon_interface ds_addon_interface_t;
-typedef struct ds_addon ds_addon_t;
-
 struct ds_addon_set {
     struct wl_list addons;
 };
 
-struct ds_addon_interface {
-    const char *name;
-    void (*destroy)(struct ds_addon *addon);
-};
-
 struct ds_addon {
-    const ds_addon_interface_t *impl;
+    const struct ds_addon_interface *impl;
     const void *owner;
     struct wl_list link;
 };
 
+struct ds_addon_interface {
+    const char *name;
+    void (*destroy)(struct ds_addon *addon);
+};
+
 void
-ds_addon_set_init(ds_addon_set_t *set);
+ds_addon_set_init(struct ds_addon_set *set);
 
 void
-ds_addon_set_finish(ds_addon_set_t *set);
+ds_addon_set_finish(struct ds_addon_set *set);
 
 void
-ds_addon_init(ds_addon_t *addon, ds_addon_set_t *set,
-        const void *owner, const ds_addon_interface_t *impl);
+ds_addon_init(struct ds_addon *addon, struct ds_addon_set *set,
+        const void *owner, const struct ds_addon_interface *impl);
 
 void
-ds_addon_finish(ds_addon_t *addon);
+ds_addon_finish(struct ds_addon *addon);
 
-ds_addon_t *
-ds_addon_find(ds_addon_set_t *set, const void *owner,
-        const ds_addon_interface_t *impl);
+struct ds_addon *
+ds_addon_find(struct ds_addon_set *set, const void *owner,
+        const struct ds_addon_interface *impl);
 
 #endif
diff --git a/src/libds/allocator/shm.c b/src/libds/allocator/shm.c
index 3b9e219..a0acd0c 100644
--- a/src/libds/allocator/shm.c
+++ b/src/libds/allocator/shm.c
@@ -11,10 +11,6 @@
 #include "libds/log.h"
 #include "util.h"
 
-typedef struct ds_shm_allocator ds_shm_allocator_t;
-
-typedef struct ds_shm_buffer ds_shm_buffer_t;
-
 struct ds_shm_allocator
 {
     struct ds_allocator base;
@@ -33,7 +29,7 @@ static const struct ds_allocator_interface shm_allocator_iface;
 WL_EXPORT struct ds_allocator *
 ds_shm_allocator_create(void)
 {
-    ds_shm_allocator_t *alloc;
+    struct ds_shm_allocator *alloc;
 
     alloc = calloc(1, sizeof *alloc);
     if (!alloc)
@@ -47,17 +43,17 @@ ds_shm_allocator_create(void)
     return &alloc->base;
 }
 
-static ds_shm_allocator_t *
+static struct ds_shm_allocator *
 shm_allocator_from_allocator(struct ds_allocator *ds_allocator)
 {
     assert(ds_allocator->iface == &shm_allocator_iface);
-    return (ds_shm_allocator_t *)ds_allocator;
+    return (struct ds_shm_allocator *)ds_allocator;
 }
 
 static void
 shm_allocator_destroy(struct ds_allocator *ds_allocator)
 {
-    ds_shm_allocator_t *alloc;
+    struct ds_shm_allocator *alloc;
 
     alloc = shm_allocator_from_allocator(ds_allocator);
     ds_dbg("Destroy Shm allocator(%p)", alloc);
@@ -66,17 +62,17 @@ shm_allocator_destroy(struct ds_allocator *ds_allocator)
 
 static const struct ds_buffer_interface shm_buffer_interface;
 
-static ds_shm_buffer_t *
+static struct ds_shm_buffer *
 shm_buffer_from_buffer(struct ds_buffer *buffer)
 {
     assert(buffer->iface == &shm_buffer_interface);
-    return (ds_shm_buffer_t *)buffer;
+    return (struct ds_shm_buffer *)buffer;
 }
 
 static void
 shm_buffer_destroy(struct ds_buffer *ds_buffer)
 {
-    ds_shm_buffer_t *buffer;
+    struct ds_shm_buffer *buffer;
 
     buffer = shm_buffer_from_buffer(ds_buffer);
 
@@ -90,7 +86,7 @@ shm_buffer_destroy(struct ds_buffer *ds_buffer)
 static bool
 shm_buffer_get_shm(struct ds_buffer *ds_buffer, struct ds_shm_attributes *shm)
 {
-    ds_shm_buffer_t *buffer;
+    struct ds_shm_buffer *buffer;
 
     buffer = shm_buffer_from_buffer(ds_buffer);
     memcpy(shm, &buffer->shm, sizeof *shm);
@@ -101,7 +97,7 @@ static bool
 shm_buffer_begin_data_ptr_access(struct ds_buffer *ds_buffer, uint32_t flags,
         void **data, uint32_t *format, size_t *stride)
 {
-    ds_shm_buffer_t *buffer;
+    struct ds_shm_buffer *buffer;
 
     buffer = shm_buffer_from_buffer(ds_buffer);
     *data = buffer->data;
@@ -130,7 +126,7 @@ static struct ds_buffer *
 shm_allocator_create_buffer(struct ds_allocator *ds_allocator,
         int width, int height, uint32_t format)
 {
-    ds_shm_buffer_t *buffer;
+    struct ds_shm_buffer *buffer;
 
     buffer = calloc(1, sizeof *buffer);
     if (!buffer)
diff --git a/src/libds/backend/wayland/backend.c b/src/libds/backend/wayland/backend.c
index faa2c64..9b6cd3a 100644
--- a/src/libds/backend/wayland/backend.c
+++ b/src/libds/backend/wayland/backend.c
@@ -13,16 +13,16 @@
 static const struct ds_backend_interface wl_backend_interface;
 static void wl_backend_handle_display_destroy(struct wl_listener *listener,
         void *data);
-static bool wl_backend_server_init(ds_wl_backend_server_t *server,
+static bool wl_backend_server_init(struct ds_wl_backend_server *server,
         const char *name);
-static void wl_backend_server_finish(ds_wl_backend_server_t *server);
+static void wl_backend_server_finish(struct ds_wl_backend_server *server);
 static int wl_backend_handle_dispatch_events(int fd, uint32_t mask,
         void *data);
 
 WL_EXPORT struct ds_backend *
 ds_wl_backend_create(struct wl_display *display, const char *server_name)
 {
-    ds_wl_backend_t *wl_backend;
+    struct ds_wl_backend *wl_backend;
     struct wl_event_loop *loop;
     int fd;
 
@@ -71,18 +71,18 @@ err_server:
     return NULL;
 }
 
-ds_wl_backend_t *
+struct ds_wl_backend *
 wl_backend_from_backend(struct ds_backend *backend)
 {
     assert(backend->iface == &wl_backend_interface);
-    return (ds_wl_backend_t *)backend;
+    return (struct ds_wl_backend *)backend;
 }
 
 static void
-wl_backend_destroy(ds_wl_backend_t *backend)
+wl_backend_destroy(struct ds_wl_backend *backend)
 {
-    ds_wl_output_t *output, *tmp_output;
-    ds_wl_buffer_t *buffer, *tmp_buffer;
+    struct ds_wl_output *output, *tmp_output;
+    struct ds_wl_buffer *buffer, *tmp_buffer;
 
     ds_dbg("Destroy wayland backend(%p)", backend);
 
@@ -108,7 +108,7 @@ wl_backend_destroy(ds_wl_backend_t *backend)
 static void
 wl_backend_iface_destroy(struct ds_backend *backend)
 {
-    ds_wl_backend_t *wl_backend;
+    struct ds_wl_backend *wl_backend;
 
     if (!backend)
         return;
@@ -127,7 +127,7 @@ static const struct ds_backend_interface wl_backend_interface = {
 static void
 wl_backend_handle_display_destroy(struct wl_listener *listener, void *data)
 {
-    ds_wl_backend_t *wl_backend;
+    struct ds_wl_backend *wl_backend;
 
     wl_backend = wl_container_of(listener, wl_backend, display_destroy);
     wl_backend_destroy(wl_backend);
@@ -158,7 +158,7 @@ static void
 registry_handle_global(void *data, struct wl_registry *registry,
         uint32_t name, const char *iface, uint32_t version)
 {
-    ds_wl_backend_server_t *server = data;
+    struct ds_wl_backend_server *server = data;
 
     ds_log(DS_DBG, "Wayland global: %s v%d", iface, version);
 
@@ -191,7 +191,7 @@ static const struct wl_registry_listener registry_listener = {
 };
 
 static bool
-wl_backend_server_init(ds_wl_backend_server_t *server, const char *name)
+wl_backend_server_init(struct ds_wl_backend_server *server, const char *name)
 {
     server->display = wl_display_connect(name);
     if (!server->display) {
@@ -236,7 +236,7 @@ err_reg:
 }
 
 static void
-wl_backend_server_finish(ds_wl_backend_server_t *server)
+wl_backend_server_finish(struct ds_wl_backend_server *server)
 {
     xdg_wm_base_destroy(server->xdg_wm_base);
     wl_compositor_destroy(server->compositor);
@@ -247,8 +247,8 @@ wl_backend_server_finish(ds_wl_backend_server_t *server)
 static int
 wl_backend_handle_dispatch_events(int fd, uint32_t mask, void *data)
 {
-    ds_wl_backend_t *wl_backend = data;
-    ds_wl_backend_server_t *server = &wl_backend->server;
+    struct ds_wl_backend *wl_backend = data;
+    struct ds_wl_backend_server *server = &wl_backend->server;
     int count = 0;
 
     if ((mask & WL_EVENT_HANGUP) || (mask & WL_EVENT_ERROR)) {
diff --git a/src/libds/backend/wayland/backend.h b/src/libds/backend/wayland/backend.h
index 1c3cd5b..ab37ec0 100644
--- a/src/libds/backend/wayland/backend.h
+++ b/src/libds/backend/wayland/backend.h
@@ -4,14 +4,6 @@
 #include "libds/interfaces/backend.h"
 #include "libds/interfaces/output.h"
 
-typedef struct ds_wl_backend_server ds_wl_backend_server_t;
-
-typedef struct ds_wl_backend ds_wl_backend_t;
-
-typedef struct ds_wl_buffer ds_wl_buffer_t;
-
-typedef struct ds_wl_output ds_wl_output_t;
-
 struct ds_wl_backend_server
 {
     struct wl_display *display;
@@ -33,7 +25,7 @@ struct ds_wl_backend
     struct wl_list buffers; // ds_wl_buffer.link
 
     struct wl_event_source *server_event_source;
-    ds_wl_backend_server_t server;
+    struct ds_wl_backend_server server;
 };
 
 struct ds_wl_buffer
@@ -50,7 +42,7 @@ struct ds_wl_output
 {
     struct ds_output base;
 
-    ds_wl_backend_t *backend;
+    struct ds_wl_backend *backend;
 
     struct wl_surface *surface;
     struct xdg_surface *xdg_surface;
@@ -60,10 +52,10 @@ struct ds_wl_output
     struct wl_list link;
 };
 
-ds_wl_backend_t *
+struct ds_wl_backend *
 wl_backend_from_backend(struct ds_backend *backend);
 
 void
-destroy_wl_buffer(ds_wl_buffer_t *buffer);
+destroy_wl_buffer(struct ds_wl_buffer *buffer);
 
 #endif
diff --git a/src/libds/backend/wayland/output.c b/src/libds/backend/wayland/output.c
index a995dbf..b411dad 100644
--- a/src/libds/backend/wayland/output.c
+++ b/src/libds/backend/wayland/output.c
@@ -15,8 +15,8 @@ static const struct xdg_toplevel_listener wl_output_xdg_toplevel_listener;
 struct ds_output *
 ds_wl_backend_create_output(struct ds_backend *ds_backend)
 {
-    ds_wl_backend_t *backend;
-    ds_wl_output_t *output;
+    struct ds_wl_backend *backend;
+    struct ds_wl_output *output;
 
     backend = wl_backend_from_backend(ds_backend);
 
@@ -78,7 +78,7 @@ err:
 }
 
 void
-destroy_wl_buffer(ds_wl_buffer_t *buffer)
+destroy_wl_buffer(struct ds_wl_buffer *buffer)
 {
     if (buffer == NULL)
         return;
@@ -89,17 +89,17 @@ destroy_wl_buffer(ds_wl_buffer_t *buffer)
     free(buffer);
 }
 
-static ds_wl_output_t *
+static struct ds_wl_output *
 wl_output_from_output(struct ds_output *ds_output)
 {
     assert(ds_output->iface == &wl_output_iface);
-    return (ds_wl_output_t *)ds_output;
+    return (struct ds_wl_output *)ds_output;
 }
 
 static void
 wl_output_iface_destroy(struct ds_output *ds_output)
 {
-    ds_wl_output_t *output;
+    struct ds_wl_output *output;
 
     output = wl_output_from_output(ds_output);
 
@@ -125,7 +125,7 @@ wl_output_iface_destroy(struct ds_output *ds_output)
 }
 
 static struct wl_buffer *
-import_shm(ds_wl_backend_t *backend, struct ds_shm_attributes *shm)
+import_shm(struct ds_wl_backend *backend, struct ds_shm_attributes *shm)
 {
     enum wl_shm_format wl_shm_format = WL_SHM_FORMAT_XRGB8888;
     struct wl_shm_pool *pool;
@@ -147,7 +147,7 @@ import_shm(ds_wl_backend_t *backend, struct ds_shm_attributes *shm)
 static void
 buffer_handle_release(void *data, struct wl_buffer *wl_buffer)
 {
-    ds_wl_buffer_t *buffer = data;
+    struct ds_wl_buffer *buffer = data;
 
     ds_dbg("Wayland output: Buffer(%p) released.", buffer->buffer);
     buffer->released = true;
@@ -161,17 +161,17 @@ static const struct wl_buffer_listener buffer_listener = {
 static void
 buffer_handle_buffer_destroy(struct wl_listener *listener, void *data)
 {
-    ds_wl_buffer_t *buffer;
+    struct ds_wl_buffer *buffer;
 
     buffer = wl_container_of(listener, buffer, buffer_destroy);
     destroy_wl_buffer(buffer);
 }
 
-static ds_wl_buffer_t *
-create_wl_buffer(ds_wl_backend_t *backend, struct ds_buffer *ds_buffer)
+static struct ds_wl_buffer *
+create_wl_buffer(struct ds_wl_backend *backend, struct ds_buffer *ds_buffer)
 {
     struct ds_shm_attributes shm;
-    ds_wl_buffer_t *buffer;
+    struct ds_wl_buffer *buffer;
     struct wl_buffer *wl_buffer;
 
     if (ds_buffer_get_shm(ds_buffer, &shm)) {
@@ -196,10 +196,10 @@ create_wl_buffer(ds_wl_backend_t *backend, struct ds_buffer *ds_buffer)
     return buffer;
 }
 
-static ds_wl_buffer_t *
-get_or_create_wl_buffer(ds_wl_backend_t *backend, struct ds_buffer *ds_buffer)
+static struct ds_wl_buffer *
+get_or_create_wl_buffer(struct ds_wl_backend *backend, struct ds_buffer *ds_buffer)
 {
-    ds_wl_buffer_t *buffer;
+    struct ds_wl_buffer *buffer;
 
     wl_list_for_each(buffer, &backend->buffers, link) {
         if (buffer->buffer == ds_buffer && buffer->released) {
@@ -215,7 +215,7 @@ get_or_create_wl_buffer(ds_wl_backend_t *backend, struct ds_buffer *ds_buffer)
 static void
 surface_frame_callback(void *data, struct wl_callback *cb, uint32_t time)
 {
-    ds_wl_output_t *output = data;
+    struct ds_wl_output *output = data;
 
     wl_callback_destroy(cb);
     output->frame_callback = NULL;
@@ -230,8 +230,8 @@ static const struct wl_callback_listener frame_listener = {
 static bool
 wl_output_iface_commit(struct ds_output *ds_output)
 {
-    ds_wl_output_t *output;
-    ds_wl_buffer_t *buffer;
+    struct ds_wl_output *output;
+    struct ds_wl_buffer *buffer;
     struct ds_buffer *ds_buffer;
 
     output = wl_output_from_output(ds_output);
@@ -287,7 +287,7 @@ wl_output_xdg_toplevel_handle_configure(void *data,
         int32_t width, int32_t height, struct wl_array *states)
 {
     // TODO
-    // ds_wl_output_t *output = data;
+    // struct ds_wl_output *output = data;
 
     if (width == 0 || height == 0)
         return;
@@ -297,7 +297,7 @@ static void
 wl_output_xdg_toplevel_handle_close(void *data,
         struct xdg_toplevel *xdg_toplevel)
 {
-    ds_wl_output_t *output = data;
+    struct ds_wl_output *output = data;
 
     ds_output_destroy(&output->base);
 }
diff --git a/src/libds/buffer.c b/src/libds/buffer.c
index 96edec5..70de23f 100644
--- a/src/libds/buffer.c
+++ b/src/libds/buffer.c
@@ -29,7 +29,7 @@ ds_buffer_from_resource(struct wl_resource *resource)
     assert(resource && ds_resource_is_buffer(resource));
 
     if (wl_shm_buffer_get(resource) != NULL) {
-        ds_shm_client_buffer_t *shm_client_buffer =
+        struct ds_shm_client_buffer *shm_client_buffer =
             ds_shm_client_buffer_get_or_create(resource);
         if (!shm_client_buffer) {
             ds_err("Failed to create shm client buffer");
diff --git a/src/libds/client_buffer.h b/src/libds/client_buffer.h
index f21ea7c..cf390aa 100644
--- a/src/libds/client_buffer.h
+++ b/src/libds/client_buffer.h
@@ -7,8 +7,6 @@
 #include "libds/buffer.h"
 #include "libds/interfaces/buffer.h"
 
-typedef struct ds_shm_client_buffer ds_shm_client_buffer_t;
-
 struct ds_shm_client_buffer
 {
     struct ds_buffer base;
@@ -25,7 +23,7 @@ struct ds_shm_client_buffer
     } listener;
 };
 
-ds_shm_client_buffer_t *
+struct ds_shm_client_buffer *
 ds_shm_client_buffer_get_or_create(struct wl_resource *resource);
 
 #endif
diff --git a/src/libds/client_buffer/shm_client_buffer.c b/src/libds/client_buffer/shm_client_buffer.c
index e2c4308..14bb745 100644
--- a/src/libds/client_buffer/shm_client_buffer.c
+++ b/src/libds/client_buffer/shm_client_buffer.c
@@ -10,13 +10,13 @@
 static void
 shm_client_buffer_resource_handle_destroy(struct wl_listener *listener,
         void *data);
-static ds_shm_client_buffer_t *
+static struct ds_shm_client_buffer *
 shm_client_buffer_create(struct wl_resource *resource);
 
-ds_shm_client_buffer_t *
+struct ds_shm_client_buffer *
 ds_shm_client_buffer_get_or_create(struct wl_resource *resource)
 {
-    ds_shm_client_buffer_t *buffer;
+    struct ds_shm_client_buffer *buffer;
     struct wl_listener *resource_destroy_listener;
 
     resource_destroy_listener = wl_resource_get_destroy_listener(resource,
@@ -34,7 +34,7 @@ static void
 shm_client_buffer_resource_handle_destroy(struct wl_listener *listener,
         void *data)
 {
-    ds_shm_client_buffer_t *buffer;
+    struct ds_shm_client_buffer *buffer;
 
     buffer = wl_container_of(listener, buffer, listener.resource_destroy);
 
@@ -48,17 +48,17 @@ shm_client_buffer_resource_handle_destroy(struct wl_listener *listener,
 
 static const struct ds_buffer_interface shm_client_buffer_iface;
 
-static ds_shm_client_buffer_t *
+static struct ds_shm_client_buffer *
 shm_client_buffer_from_buffer(struct ds_buffer *buffer)
 {
     assert(buffer->iface == &shm_client_buffer_iface);
-    return (ds_shm_client_buffer_t *)buffer;
+    return (struct ds_shm_client_buffer *)buffer;
 }
 
 static void
 shm_client_buffer_destroy(struct ds_buffer *ds_buffer)
 {
-    ds_shm_client_buffer_t *buffer;
+    struct ds_shm_client_buffer *buffer;
 
     buffer = shm_client_buffer_from_buffer(ds_buffer);
 
@@ -74,7 +74,7 @@ shm_client_buffer_begin_data_ptr_access(struct ds_buffer *ds_buffer,
         enum ds_buffer_data_ptr_access_flag flags, void **data,
         uint32_t *format, size_t *stride)
 {
-    ds_shm_client_buffer_t *buffer;
+    struct ds_shm_client_buffer *buffer;
 
     buffer = shm_client_buffer_from_buffer(ds_buffer);
     *format = buffer->format;
@@ -92,7 +92,7 @@ shm_client_buffer_begin_data_ptr_access(struct ds_buffer *ds_buffer,
 static void
 shm_client_buffer_end_data_ptr_access(struct ds_buffer *ds_buffer)
 {
-    ds_shm_client_buffer_t *buffer;
+    struct ds_shm_client_buffer *buffer;
 
     buffer = shm_client_buffer_from_buffer(ds_buffer);
     if (buffer->shm_buffer)
@@ -108,17 +108,17 @@ static const struct ds_buffer_interface shm_client_buffer_iface = {
 static void
 shm_client_buffer_handle_release(struct wl_listener *listener, void *data)
 {
-    ds_shm_client_buffer_t *buffer;
+    struct ds_shm_client_buffer *buffer;
 
     buffer = wl_container_of(listener, buffer, listener.buffer_release);
     if (buffer->resource)
         wl_buffer_send_release(buffer->resource);
 }
 
-static ds_shm_client_buffer_t *
+static struct ds_shm_client_buffer *
 shm_client_buffer_create(struct wl_resource *resource)
 {
-    ds_shm_client_buffer_t *buffer;
+    struct ds_shm_client_buffer *buffer;
     struct wl_shm_buffer *shm_buffer;
     enum wl_shm_format wl_shm_format;
     int32_t width;
diff --git a/src/libds/compositor.c b/src/libds/compositor.c
index a073405..64dd363 100644
--- a/src/libds/compositor.c
+++ b/src/libds/compositor.c
@@ -11,7 +11,7 @@
 struct ds_compositor
 {
     struct wl_global *global;
-    ds_subcompositor_t subcompositor;
+    struct ds_subcompositor subcompositor;
 
     struct {
         struct wl_signal new_surface;
diff --git a/src/libds/subcompositor.c b/src/libds/subcompositor.c
index 483fefb..717fd33 100644
--- a/src/libds/subcompositor.c
+++ b/src/libds/subcompositor.c
@@ -8,7 +8,7 @@ static void subcompositor_bind(struct wl_client *client, void *data,
         uint32_t version, uint32_t id);
 
 bool
-ds_subcompositor_init(ds_subcompositor_t *subcomp,
+ds_subcompositor_init(struct ds_subcompositor *subcomp,
         struct wl_display *display)
 {
     subcomp->global = wl_global_create(display, &wl_subcompositor_interface,
@@ -22,7 +22,7 @@ ds_subcompositor_init(ds_subcompositor_t *subcomp,
 }
 
 void
-ds_subcompositor_finish(ds_subcompositor_t *subcomp)
+ds_subcompositor_finish(struct ds_subcompositor *subcomp)
 {
     wl_global_destroy(subcomp->global);
 }
@@ -84,7 +84,7 @@ static void
 subcompositor_bind(struct wl_client *client, void *data,
         uint32_t version, uint32_t id)
 {
-    ds_subcompositor_t *subcomp = data;
+    struct ds_subcompositor *subcomp = data;
     struct wl_resource *resource;
 
     resource = wl_resource_create(client, &wl_subcompositor_interface, 1, id);
diff --git a/src/libds/subcompositor.h b/src/libds/subcompositor.h
index 362727e..71265d0 100644
--- a/src/libds/subcompositor.h
+++ b/src/libds/subcompositor.h
@@ -3,18 +3,16 @@
 
 #include <wayland-server.h>
 
-typedef struct ds_subcompositor ds_subcompositor_t;
-
 struct ds_subcompositor
 {
     struct wl_global *global;
 };
 
 bool
-ds_subcompositor_init(ds_subcompositor_t *subcomp,
+ds_subcompositor_init(struct ds_subcompositor *subcomp,
         struct wl_display *display);
 
 void
-ds_subcompositor_finish(ds_subcompositor_t *subcomp);
+ds_subcompositor_finish(struct ds_subcompositor *subcomp);
 
 #endif
diff --git a/src/libds/surface/surface-private.h b/src/libds/surface/surface-private.h
index 570dcc2..78b2900 100644
--- a/src/libds/surface/surface-private.h
+++ b/src/libds/surface/surface-private.h
@@ -9,7 +9,7 @@
 #include "buffer.h"
 #include "surface.h"
 
-typedef enum
+enum ds_surface_state_field
 {
     DS_SURFACE_STATE_BUFFER = 1 << 0,
     DS_SURFACE_STATE_SURFACE_DAMAGE = 1 << 1,
@@ -20,11 +20,11 @@ typedef enum
     DS_SURFACE_STATE_SCALE = 1 << 6,
     DS_SURFACE_STATE_FRAME_CALLBACK_LIST = 1 << 7,
     DS_SURFACE_STATE_VIEWPORT = 1 << 8,
-} ds_surface_state_field_t;
+};
 
 struct ds_surface_state
 {
-    ds_surface_state_field_t committed;
+    enum ds_surface_state_field committed;
 
     struct ds_buffer *buffer;
     int32_t dx, dy;
diff --git a/src/libds/xdg_shell/xdg_shell.h b/src/libds/xdg_shell/xdg_shell.h
index 0f99d6d..6596ea2 100644
--- a/src/libds/xdg_shell/xdg_shell.h
+++ b/src/libds/xdg_shell/xdg_shell.h
@@ -8,12 +8,12 @@
 #include "surface.h"
 #include "libds/output.h"
 
-typedef enum
+enum ds_xdg_surface_role
 {
     DS_XDG_SURFACE_ROLE_NONE,
     DS_XDG_SURFACE_ROLE_TOPLEVEL,
     DS_XDG_SURFACE_ROLE_POPUP,
-} ds_xdg_surface_role_t;
+};
 
 struct ds_xdg_shell
 {
@@ -117,7 +117,7 @@ struct ds_xdg_surface
     struct ds_xdg_client *client;
     struct ds_surface *ds_surface;
 
-    ds_xdg_surface_role_t role;
+    enum ds_xdg_surface_role role;
 
     union {
         struct ds_xdg_toplevel *toplevel;
-- 
2.7.4