diff --git a/src/module/module_qt_window.cc b/src/module/module_qt_window.cc
index a1cb86d2d5cd3489abd37d5a4904f2dd49d7f392..20794c08563792d60635aec777ea105c155df2b0 100644
--- a/src/module/module_qt_window.cc
+++ b/src/module/module_qt_window.cc
@@ -13,9 +13,9 @@
  * Function definitions *
  ************************/
 
-static void module_qt_window_free(struct module_qt_window_s *);
-static void module_qt_window_close(struct module_qt_window_s *);
-static bool module_qt_window_new(struct module_qt_window_s **, struct queue *, lkt_db *);
+static void module_qt_window_free(module_qt_window_s *);
+static void module_qt_window_close(module_qt_window_s *);
+static bool module_qt_window_new(module_qt_window_s **, queue *, lkt_db *);
 
 /*********************
  * Private functions *
@@ -30,9 +30,9 @@ mod_new(va_list *va)
 {
     va_list copy;
     va_copy(copy, *va);
-    struct module_qt_window_s **win =
-        reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
-    struct queue *queue = va_arg(copy, struct queue *);
+    module_qt_window_s **win =
+        reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
+    queue *queue = va_arg(copy, struct queue *);
     lkt_db *db          = va_arg(copy, lkt_db *);
     bool ret            = module_qt_window_new(win, queue, db);
     va_end(copy);
@@ -44,8 +44,8 @@ mod_close(va_list *va)
 {
     va_list copy;
     va_copy(copy, *va);
-    struct module_qt_window_s **win =
-        reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+    module_qt_window_s **win =
+        reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
     module_qt_window_close(*win);
     va_end(copy);
     return 0;
@@ -56,8 +56,8 @@ mod_free(va_list *va)
 {
     va_list copy;
     va_copy(copy, *va);
-    struct module_qt_window_s **win =
-        reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+    module_qt_window_s **win =
+        reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
     module_qt_window_free(*win);
     va_end(copy);
     return 0;
@@ -68,8 +68,8 @@ mod_toggle_pause(va_list *va)
 {
     va_list copy;
     va_copy(copy, *va);
-    struct module_qt_window_s **win =
-        reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+    module_qt_window_s **win =
+        reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
     bool ret = (*win)->mpv_widget->toggle_pause();
     va_end(copy);
     return !ret;
@@ -80,8 +80,8 @@ mod_load_file(va_list *va)
 {
     va_list copy;
     va_copy(copy, *va);
-    struct module_qt_window_s **win =
-        reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+    module_qt_window_s **win =
+        reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
     const char *file = va_arg(copy, const char *);
     const bool ret   = (*win)->mpv_widget->load_file(file);
     va_end(copy);
@@ -93,8 +93,8 @@ mod_set_volume(va_list *va)
 {
     va_list copy;
     va_copy(copy, *va);
-    struct module_qt_window_s **win =
-        reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+    module_qt_window_s **win =
+        reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
     const int volume = va_arg(copy, int);
     const bool ret   = (*win)->mpv_widget->set_volume(volume);
     va_end(copy);
@@ -106,8 +106,8 @@ mod_set_paused(va_list *va)
 {
     va_list copy;
     va_copy(copy, *va);
-    struct module_qt_window_s **win =
-        reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+    module_qt_window_s **win =
+        reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
     const int state = va_arg(copy, int);
     const bool ret  = (*win)->mpv_widget->set_paused(state);
     va_end(copy);
@@ -119,8 +119,8 @@ mod_set_position(va_list *va)
 {
     va_list copy;
     va_copy(copy, *va);
-    struct module_qt_window_s **win =
-        reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+    module_qt_window_s **win =
+        reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
     const int seconds = va_arg(copy, int);
     const bool ret    = (*win)->mpv_widget->set_position(seconds);
     va_end(copy);
@@ -132,8 +132,8 @@ mod_get_duration(va_list *va)
 {
     va_list copy;
     va_copy(copy, *va);
-    struct module_qt_window_s **win =
-        reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+    module_qt_window_s **win =
+        reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
     int *duration = va_arg(copy, int *);
     bool ret      = (*win)->mpv_widget->get_duration(duration);
     va_end(copy);
@@ -144,9 +144,9 @@ static int
 mod_get_elapsed(va_list *va)
 {
     va_list copy;
-    struct module_qt_window_s **win;
+    module_qt_window_s **win;
     va_copy(copy, *va);
-    win            = reinterpret_cast<struct module_qt_window_s **>(va_arg(copy, void **));
+    win            = reinterpret_cast<module_qt_window_s **>(va_arg(copy, void **));
     int *elapsed   = va_arg(copy, int *);
     const bool ret = (*win)->mpv_widget->get_elapsed(elapsed);
     va_end(copy);
@@ -202,7 +202,7 @@ ___create_mpv_widget(void *arg)
  ***************************/
 
 static bool
-module_qt_window_new(struct module_qt_window_s **win, struct queue *queue, lkt_db *db)
+module_qt_window_new(module_qt_window_s **win, queue *queue, lkt_db *db)
 {
     (void)mod_new;
     (void)mod_free;
@@ -212,7 +212,7 @@ module_qt_window_new(struct module_qt_window_s **win, struct queue *queue, lkt_d
     if (*win == nullptr) {
         *win = LKT_ALLOC_STRUCT(module_qt_window_s);
         RETURN_UNLESS(*win, "Out of memory", false);
-        memset(*win, 0, sizeof(struct module_qt_window_s));
+        memset(*win, 0, sizeof(module_qt_window_s));
 
         (*win)->queue    = queue;
         (*win)->db       = db;
@@ -231,14 +231,14 @@ module_qt_window_new(struct module_qt_window_s **win, struct queue *queue, lkt_d
 }
 
 static void
-module_qt_window_close(struct module_qt_window_s *win)
+module_qt_window_close(module_qt_window_s *win)
 {
     RETURN_UNLESS(win && win->mpv_widget && win->main_window, "Invalid arguments", NOTHING);
     win->mpv_widget->stop();
 }
 
 static void
-module_qt_window_free(struct module_qt_window_s *win)
+module_qt_window_free(module_qt_window_s *win)
 {
     RETURN_UNLESS(win, "Invalid arguments", NOTHING);
     module_qt_window_close(win);
diff --git a/src/module/qt_window/mpvwidget.cc b/src/module/qt_window/mpvwidget.cc
index ddaf8ce85bf6e9f99835090ace36bcb9daf7bce9..7024f133bd3eb24674f61ce374b5359d0e459b39 100644
--- a/src/module/qt_window/mpvwidget.cc
+++ b/src/module/qt_window/mpvwidget.cc
@@ -28,7 +28,7 @@ get_proc_address(void *ctx, const char *name)
     return reinterpret_cast<void *>(glctx->getProcAddress(QByteArray(name)));
 }
 
-MpvWidget::MpvWidget(struct queue *queue, lkt_db *db, struct module_reg *reg, bool *launched,
+MpvWidget::MpvWidget(queue *queue, lkt_db *db, module_reg *reg, bool *launched,
                      QWidget *parent)
     : QOpenGLWidget(parent)
     , m_queue(queue)
@@ -273,7 +273,7 @@ MpvWidget::load_file(const char *filepath)
 void
 MpvWidget::update_window_title()
 {
-    struct kara_metadata kara_mdt;
+    kara_metadata kara_mdt;
     int changed_kara = 0;
     char *kara_title = nullptr;
     char window_title[LKT_LINE_MAX];
diff --git a/src/module/qt_window/mpvwidget.hh b/src/module/qt_window/mpvwidget.hh
index 93aee66b32e66c160947c3b3c11a9a7b0e2785e4..4814bd79eb7acad16d9cde4ee977f400dd956a49 100644
--- a/src/module/qt_window/mpvwidget.hh
+++ b/src/module/qt_window/mpvwidget.hh
@@ -34,9 +34,9 @@ public:
 private:
     enum { PLAY, PAUSE, STOP, NONSTOPPED } m_state = STOP;
 
-    struct queue *m_queue;
+    queue *m_queue;
     lkt_db *m_db;
-    struct module_reg *m_reg;
+    module_reg *m_reg;
     bool *m_launched;
 
     int m_position;