diff --git a/include/libopenstm32/nvic.h b/include/libopenstm32/nvic.h
index e814e693..0a740a02 100644
--- a/include/libopenstm32/nvic.h
+++ b/include/libopenstm32/nvic.h
@@ -113,4 +113,4 @@ void nvic_set_pending_irq(s32 irqn);
 void nvic_clear_pending_irq(s32 irqn);
 s32 nvic_get_active(s32 irqn);
 
-#endif /* LIBOPENSTM32_NVIC_H */
+#endif
diff --git a/include/libopenstm32/rtc.h b/include/libopenstm32/rtc.h
index 076c8a23..fbe738b3 100644
--- a/include/libopenstm32/rtc.h
+++ b/include/libopenstm32/rtc.h
@@ -121,4 +121,4 @@
 
 /* TODO */
 
-#endif /* LIBOPENSTM32_RTC_H */
+#endif
diff --git a/include/libopenstm32/timer.h b/include/libopenstm32/timer.h
index 8434d3da..20392e35 100644
--- a/include/libopenstm32/timer.h
+++ b/include/libopenstm32/timer.h
@@ -802,4 +802,4 @@
 
 /* DMAB[15:0]: DMA register for burst accesses */
 
-#endif /* LIBOPENSTM32_TIMER_H */
+#endif
diff --git a/include/libopenstm32/tools.h b/include/libopenstm32/tools.h
index 91c16b54..246477a0 100644
--- a/include/libopenstm32/tools.h
+++ b/include/libopenstm32/tools.h
@@ -55,4 +55,4 @@
         SET_REG(REG, toggle_mask);                                      \
     }
 
-#endif /* LIBOPENSTM32_TOOLS_H */
+#endif
diff --git a/include/libopenstm32/usart.h b/include/libopenstm32/usart.h
index 74fb5159..f3a98787 100644
--- a/include/libopenstm32/usart.h
+++ b/include/libopenstm32/usart.h
@@ -292,4 +292,4 @@ void usart_disable(u32 usart);
 void usart_send(u32 usart, u16 data);
 u16 usart_recv(u32 usart);
 
-#endif /* LIBOPENSTM32_USART_H */
+#endif
diff --git a/include/libopenstm32/usb.h b/include/libopenstm32/usb.h
index 660833e8..342b9a6e 100644
--- a/include/libopenstm32/usb.h
+++ b/include/libopenstm32/usb.h
@@ -293,4 +293,4 @@
     (USB_PMA_BASE +                             \
      (u8 *)(USB_GET_EP_RX_ADDR(EP) * 2))
 
-#endif /* LIBOPENSTM32_USB_H */
+#endif
diff --git a/include/libopenstm32/usb_desc.h b/include/libopenstm32/usb_desc.h
index 8b476e8e..c560808f 100644
--- a/include/libopenstm32/usb_desc.h
+++ b/include/libopenstm32/usb_desc.h
@@ -97,4 +97,4 @@ struct usb_string_desc {
     u16 string[];      /* String UTF16 encoded */
 };
 
-#endif /* LIBOPENSTM32_USB_DESC */
+#endif