diff --git a/chronos/drivers/display.c b/chronos/drivers/display.c
index 39774279b3..063ade5855 100644
--- a/chronos/drivers/display.c
+++ b/chronos/drivers/display.c
@@ -57,7 +57,7 @@ void display_symbol(uint8_t symbol, uint8_t mode);
  * Global Variable section */
 
 /* Display flags */
-volatile s_display_flags display;
+volatile s_display_flags_t display;
 
 /* Global return string for itoa function */
 char itoa_str[8];
diff --git a/chronos/drivers/include/display.h b/chronos/drivers/include/display.h
index 805d801d2e..3b7c2e131f 100644
--- a/chronos/drivers/include/display.h
+++ b/chronos/drivers/include/display.h
@@ -67,9 +67,9 @@ typedef union {
     uint16_t update_acceleration		: 1; 	// 1 = Acceleration data was updated
   } flag;
   uint16_t all_flags;            // Shortcut to all display flags (for reset)
-} s_display_flags;
+} s_display_flags_t;
 
-extern volatile s_display_flags display;
+extern volatile s_display_flags_t display;
 
 // Constants defined in library
 extern const uint8_t lcd_font[];
diff --git a/msba2-common/drivers/msba2-uart0.c b/msba2-common/drivers/msba2-uart0.c
index 3107e8d40c..31a9870aaf 100644
--- a/msba2-common/drivers/msba2-uart0.c
+++ b/msba2-common/drivers/msba2-uart0.c
@@ -49,13 +49,13 @@ and the mailinglist (subscription via web site)
  * @note    $Id$
  */
 
-typedef struct toprint {
+typedef struct toprint_t {
     unsigned int len;
     char content[];
-}toprint;
+}toprint_t;
 
 #define QUEUESIZE 255
-static volatile toprint* queue[QUEUESIZE];
+static volatile toprint_t* queue[QUEUESIZE];
 static volatile unsigned char queue_head = 0;
 static volatile unsigned char queue_tail = 0;
 static volatile unsigned char queue_items = 0;
@@ -64,7 +64,7 @@ static volatile unsigned int actual_pos = 0;
 static volatile unsigned int running = 0;
 static volatile unsigned int fifo = 0;
 
-static volatile toprint* actual = NULL;
+static volatile toprint_t* actual = NULL;
 
 static inline void enqueue(void) {
     queue_items++;