diff --git a/logger/logger_header.h b/logger/logger_header.h
index 8b88ab0c7e510c6795d5673d8739ea7ade9d781f..c388ef65cda21d00f53ddc54e97f43671edf1aeb 100644
--- a/logger/logger_header.h
+++ b/logger/logger_header.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef __LOGGER_LOGGER_HEADER_H__
-#define __LOGGER_LOGGER_HEADER_H__
+#ifndef LOGGER_LOGGER_HEADER_H
+#define LOGGER_LOGGER_HEADER_H
 
 #include "logger_tools.h"
 
@@ -116,4 +116,4 @@ __attribute__((always_inline)) INLINE static int header_is_corrupted(
   return h->offset_direction == logger_offset_corrupted;
 }
 
-#endif  // __LOGGER_LOGGER_HEADER_H__
+#endif  // LOGGER_LOGGER_HEADER_H
diff --git a/logger/logger_loader_io.h b/logger/logger_loader_io.h
index dde5ac8b8a38b1d0a50cdfe9837def498253c517..d44fea673017644306e73261afdbc6dec26948c6 100644
--- a/logger/logger_loader_io.h
+++ b/logger/logger_loader_io.h
@@ -20,8 +20,8 @@
  * @file logger_loader_io.h
  * @brief This file contains basic IO function.
  */
-#ifndef __LOGGER_LOGGER_LOADER_IO_H__
-#define __LOGGER_LOGGER_LOADER_IO_H__
+#ifndef LOGGER_LOGGER_LOADER_IO_H
+#define LOGGER_LOGGER_LOADER_IO_H
 
 #include "logger_header.h"
 #include "logger_tools.h"
@@ -95,4 +95,4 @@ __attribute__((always_inline)) INLINE static void *logger_loader_io_write_data(
   return data + size;
 };
 
-#endif  // __LOGGER_LOGGER_LOADER_IO_H__
+#endif  // LOGGER_LOGGER_LOADER_IO_H
diff --git a/logger/logger_logfile.h b/logger/logger_logfile.h
index 2ffcf741698df3278c6bd012ca7f880543b1e91d..0b6ef728d524bb104b83fc28b9250c51a764dfd4 100644
--- a/logger/logger_logfile.h
+++ b/logger/logger_logfile.h
@@ -20,8 +20,8 @@
  * @file logger_logfile.h
  * @brief This file contains the high level function for the log.
  */
-#ifndef __LOGGER_LOGGER_LOGFILE_H__
-#define __LOGGER_LOGGER_LOGFILE_H__
+#ifndef LOGGER_LOGGER_LOGFILE_H
+#define LOGGER_LOGGER_LOGFILE_H
 
 #include "logger_header.h"
 #include "logger_time.h"
@@ -66,4 +66,4 @@ void logger_logfile_init_from_file(struct logger_logfile *log, char *filename,
 void logger_logfile_reverse_offset(struct logger_logfile *log, char *filename);
 void logger_logfile_free(struct logger_logfile *log);
 
-#endif  // __LOGGER_LOGGER_LOGFILE_H__
+#endif  // LOGGER_LOGGER_LOGFILE_H
diff --git a/logger/logger_particle.h b/logger/logger_particle.h
index ffc664d8a30447477534e4ed89ed61c0510e3168..8906fd346298cb79393d0a1c347b9d0c2d4221bd 100644
--- a/logger/logger_particle.h
+++ b/logger/logger_particle.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef __LOGGER_LOGGER_PARTICLE_H__
-#define __LOGGER_LOGGER_PARTICLE_H__
+#ifndef LOGGER_LOGGER_PARTICLE_H
+#define LOGGER_LOGGER_PARTICLE_H
 
 #include "logger_header.h"
 #include "logger_time.h"
@@ -104,4 +104,4 @@ void logger_particle_interpolate(struct logger_particle *part_curr,
                                  const struct logger_particle *part_next,
                                  const double time);
 
-#endif  //__LOGGER_LOGGER_PARTICLE_H__
+#endif  //LOGGER_LOGGER_PARTICLE_H
diff --git a/logger/logger_reader.h b/logger/logger_reader.h
index c4a3ba8912676cf332344e6ec4ebd2943a8afa79..124d271f57587a26dbfb59299678f0ce5cfbdf79 100644
--- a/logger/logger_reader.h
+++ b/logger/logger_reader.h
@@ -44,8 +44,8 @@
  * record for this particle.
  */
 
-#ifndef __LOGGER_LOGGER_READER_H__
-#define __LOGGER_LOGGER_READER_H__
+#ifndef LOGGER_LOGGER_READER_H
+#define LOGGER_LOGGER_READER_H
 
 #include "logger_loader_io.h"
 #include "logger_logfile.h"
@@ -78,4 +78,4 @@ void logger_reader_free(struct logger_reader *reader);
 size_t reader_read_record(struct logger_reader *reader,
                           struct logger_particle *lp, double *time,
                           int *is_particle, size_t offset);
-#endif  // __LOGGER_LOGGER_READER_H__
+#endif  // LOGGER_LOGGER_READER_H
diff --git a/logger/logger_time.h b/logger/logger_time.h
index c84b505d584868706c34c96f7bc3c82febbac2fe..b27abffb9c1b3aa02c82c1739d1206b43f3ac431 100644
--- a/logger/logger_time.h
+++ b/logger/logger_time.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  ******************************************************************************/
-#ifndef __LOGGER_LOGGER_TIMELINE_H__
-#define __LOGGER_LOGGER_TIMELINE_H__
+#ifndef LOGGER_LOGGER_TIMELINE_H
+#define LOGGER_LOGGER_TIMELINE_H
 
 #include "logger_header.h"
 #include "logger_tools.h"
@@ -92,4 +92,4 @@ void time_array_print_offset(const struct time_array *t);
 
 size_t time_offset_first_record(const struct header *h);
 
-#endif  // __LOGGER_LOGGER_TIMELINE_H__
+#endif  // LOGGER_LOGGER_TIMELINE_H
diff --git a/logger/logger_tools.h b/logger/logger_tools.h
index 06f25cba852d310ef2b4fd35f772c25d9e0da953..21a59e42fca144a0381b15e8771ca14ceed46b33 100644
--- a/logger/logger_tools.h
+++ b/logger/logger_tools.h
@@ -19,8 +19,8 @@
 /**
  * @brief This file contains functions that help to navigate in the logs.
  */
-#ifndef __LOGGER_LOGGER_TOOLS_H__
-#define __LOGGER_LOGGER_TOOLS_H__
+#ifndef LOGGER_LOGGER_TOOLS_H
+#define LOGGER_LOGGER_TOOLS_H
 
 #include "../config.h"
 
@@ -56,4 +56,4 @@ size_t tools_reverse_offset(const struct header *h, void *map, size_t offset);
 size_t tools_check_record_consistency(const struct logger_reader *reader,
                                       size_t offset);
 
-#endif  //__LOGGER_LOGGER_TOOLS_H__
+#endif  // LOGGER_LOGGER_TOOLS_H