diff --git a/draw.h b/draw.h
index 1bae996e4..b2ed36669 100644
--- a/draw.h
+++ b/draw.h
@@ -90,10 +90,10 @@ typedef struct
 {
     xcb_pixmap_t pixmap;
     xcb_visualtype_t *visual;
-    int width;
-    int height;
+    uint16_t width;
+    uint16_t height;
     int phys_screen;
-    int depth;
+    uint8_t depth;
     cairo_t *cr;
     cairo_surface_t *surface;
     PangoLayout *layout;
diff --git a/structs.h b/structs.h
index 334317f1f..65f2856ff 100644
--- a/structs.h
+++ b/structs.h
@@ -87,7 +87,7 @@ typedef struct
     /** Wibox name */
     char *name;
     /** Box width and height */
-    int width, height;
+    uint16_t width, height;
     /** Box position */
     position_t position;
     /** Alignment */
diff --git a/swindow.c b/swindow.c
index 9d632acee..75c8184c3 100644
--- a/swindow.c
+++ b/swindow.c
@@ -45,9 +45,9 @@ extern awesome_t globalconf;
 void
 simplewindow_init(simple_window_t *sw,
                   int phys_screen,
-                  int x, int y,
-                  unsigned int w, unsigned int h,
-                  unsigned int border_width,
+                  int16_t x, int16_t y,
+                  uint16_t w, uint16_t h,
+                  uint16_t border_width,
                   position_t position,
                   const xcolor_t *fg, const xcolor_t *bg)
 {
diff --git a/swindow.h b/swindow.h
index f17b9fb9a..74daa8b0d 100644
--- a/swindow.h
+++ b/swindow.h
@@ -40,7 +40,7 @@ typedef struct simple_window_t
     struct
     {
         /** The window border width */
-        int width;
+        uint16_t width;
         /** The window border color */
         xcolor_t color;
     } border;
@@ -51,7 +51,7 @@ typedef struct simple_window_t
 } simple_window_t;
 
 void simplewindow_init(simple_window_t *s,
-                       int, int, int, unsigned int, unsigned int, unsigned int,
+                       int, int16_t, int16_t, uint16_t, uint16_t, uint16_t,
                        position_t, const xcolor_t *, const xcolor_t *);
 
 void simplewindow_wipe(simple_window_t *);