3 files changed, 11 insertions, 11 deletions
diff --git a/os/lib/include/chlib.h b/os/lib/include/chlib.h
index 6a1944e53..674561cb8 100644
--- a/os/lib/include/chlib.h
+++ b/os/lib/include/chlib.h
@@ -210,9 +210,9 @@
 #include "chbsem.h"
 #include "chmboxes.h"
 #include "chmemcore.h"
-#include "chheap.h"
+#include "chmemheaps.h"
 #include "chmempools.h"
-#include "chfifo.h"
+#include "chobjfifos.h"
 //#include "chpipes.h"
 #include "chfactory.h"
 
diff --git a/os/lib/include/chheap.h b/os/lib/include/chmemheaps.h
index 24e8e4761..59248a89e 100644
--- a/os/lib/include/chheap.h
+++ b/os/lib/include/chmemheaps.h
@@ -18,15 +18,15 @@
 */
 
 /**
- * @file    chheap.h
- * @brief   Heaps macros and structures.
+ * @file    chmemheaps.h
+ * @brief   Memory heaps macros and structures.
  *
  * @addtogroup heaps
  * @{
  */
 
-#ifndef CHHEAP_H
-#define CHHEAP_H
+#ifndef CHMEMHEAPS_H
+#define CHMEMHEAPS_H
 
 #if (CH_CFG_USE_HEAP == TRUE) || defined(__DOXYGEN__)
 
@@ -173,6 +173,6 @@ static inline size_t chHeapGetSize(const void *p) {
 
 #endif /* CH_CFG_USE_HEAP == TRUE */
 
-#endif /* CHHEAP_H */
+#endif /* CHMEMHEAPS_H */
 
 /** @} */
diff --git a/os/lib/include/chfifo.h b/os/lib/include/chobjfifos.h
index 066de53e6..51e7bf0a8 100644
--- a/os/lib/include/chfifo.h
+++ b/os/lib/include/chobjfifos.h
@@ -18,7 +18,7 @@
 */
 
 /**
- * @file    chfifo.h
+ * @file    chobjfifos.h
  * @brief   Objects FIFO structures and macros.
  * @details This module implements a generic FIFO queue of objects by
  *          coupling a Guarded Memory Pool (for objects storage) and
@@ -41,8 +41,8 @@
  * @{
  */
 
-#ifndef CHFIFO_H
-#define CHFIFO_H
+#ifndef CHOBJFIFOS_H
+#define CHOBJFIFOS_H
 
 #if (CH_CFG_USE_OBJ_FIFOS == TRUE) || defined(__DOXYGEN__)
 
@@ -333,6 +333,6 @@ static inline msg_t chFifoReceiveObjectTimeout(objects_fifo_t *ofp,
 }
 #endif /* CH_CFG_USE_OBJ_FIFOS == TRUE */
 
-#endif /* CHFIFO_H */
+#endif /* CHOBJFIFOS_H */
 
 /** @} */