diff --git a/src/include/condvars.h b/src/include/condvars.h
index f5d3f56a6..30e40fc10 100644
--- a/src/include/condvars.h
+++ b/src/include/condvars.h
@@ -27,12 +27,10 @@
 
 #ifdef CH_USE_CONDVARS
 
-typedef struct CondVar CondVar;
-
-struct CondVar {
+typedef struct CondVar {
   /** Queue of the threads sleeping on this CondVar. */
   ThreadsQueue  c_queue;
-};
+} CondVar;
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,7 +46,6 @@ extern "C" {
 }
 #endif
 
-
 #endif /* CH_USE_CONDVARS */
 
 #endif /* _CONDVARS_H_ */