diff --git a/config.c b/config.c
index 83b072d5d..bb469533e 100644
--- a/config.c
+++ b/config.c
@@ -281,7 +281,7 @@ statusbar_widgets_create(cfg_t *cfg_statusbar, Statusbar *statusbar)
 }
 
 static void
-config_section_titlebar_init(cfg_t *cfg_titlebar, Titlebar *tb, int screen)
+config_section_titlebar_init(cfg_t *cfg_titlebar, titlebar_t *tb, int screen)
 {
     int phys_screen = screen_virttophys(screen);
     cfg_t *cfg_styles = cfg_getsec(cfg_titlebar, "styles");
diff --git a/structs.h b/structs.h
index 379887eb4..da4dbd60d 100644
--- a/structs.h
+++ b/structs.h
@@ -60,7 +60,7 @@ typedef struct
         style_t focus;
         style_t urgent;
     } styles;
-} Titlebar;
+} titlebar_t;
 
 /** Rule type */
 typedef struct Rule Rule;
@@ -71,7 +71,7 @@ struct Rule
     int screen;
     Fuzzy isfloating;
     Fuzzy ismaster;
-    Titlebar titlebar;
+    titlebar_t titlebar;
     double opacity;
     regex_t *prop_r;
     regex_t *tags_r;
@@ -222,8 +222,8 @@ struct Client
     int phys_screen;
     /** True if the client is a new one */
     bool newcomer;
-    /** Titlebar */
-    Titlebar titlebar;
+    /** titlebar_t */
+    titlebar_t titlebar;
     /** layer in the stacking order */
     layer_t layer;
     layer_t oldlayer;
@@ -287,8 +287,8 @@ typedef struct
 typedef area_t (FloatingPlacement)(Client *);
 typedef struct
 {
-    /** Titlebar default parameters */
-    Titlebar titlebar_default;
+    /** titlebar_t default parameters */
+    titlebar_t titlebar_default;
     /** Number of pixels to snap windows */
     int snap;
     /** Border size */
diff --git a/titlebar.c b/titlebar.c
index 00108ca92..9114d41e9 100644
--- a/titlebar.c
+++ b/titlebar.c
@@ -83,7 +83,7 @@ titlebar_init(Client *c)
  * \return a new geometry bigger if the titlebar is visible
  */
 area_t
-titlebar_geometry_add(Titlebar *t, area_t geometry)
+titlebar_geometry_add(titlebar_t *t, area_t geometry)
 {
     if(!t->sw)
         return geometry;
@@ -117,7 +117,7 @@ titlebar_geometry_add(Titlebar *t, area_t geometry)
  * \return a new geometry smaller if the titlebar is visible
  */
 area_t
-titlebar_geometry_remove(Titlebar *t, area_t geometry)
+titlebar_geometry_remove(titlebar_t *t, area_t geometry)
 {
     if(!t->sw)
         return geometry;
@@ -449,7 +449,7 @@ titlebar_update_geometry(Client *c, area_t geometry)
 }
 
 void
-titlebar_position_set(Titlebar *t, Position p)
+titlebar_position_set(titlebar_t *t, Position p)
 {
     if(!t->sw)
         return;
diff --git a/titlebar.h b/titlebar.h
index af4aaedce..98d31e89e 100644
--- a/titlebar.h
+++ b/titlebar.h
@@ -28,9 +28,9 @@ void titlebar_init(Client *);
 void titlebar_draw(Client *);
 void titlebar_update_geometry_floating(Client *);
 void titlebar_update_geometry(Client *, area_t);
-area_t titlebar_geometry_add(Titlebar *, area_t);
-area_t titlebar_geometry_remove(Titlebar *, area_t);
-void titlebar_position_set(Titlebar *, Position);
+area_t titlebar_geometry_add(titlebar_t *, area_t);
+area_t titlebar_geometry_remove(titlebar_t *, area_t);
+void titlebar_position_set(titlebar_t *, Position);
 
 Uicb uicb_client_toggletitlebar;