diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_alias.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_alias.h
index 4c4e12bc519178c035ea08ec71e98a7f4b5217e5..5f16d6975aaea7dad89c275e4c6ab9a26bc0587a 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_alias.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_alias.h
@@ -26,8 +26,8 @@
  * \brief Function aliasing
 ***************************************************************************/
 
-#ifndef E_ACSL_ALIAS
-#define E_ACSL_ALIAS
+#ifndef E_ACSL_ALIAS_H
+#define E_ACSL_ALIAS_H
 
 /* Concatenation of 2 tokens */
 # define preconcat(x,y) x ## y
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_assert.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_assert.h
index 7311ffe670d7f739f1271bd2ed88acfcaa6e57a7..3685c9d990b78cdff2404a3d11b55759c493e107 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_assert.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_assert.h
@@ -25,8 +25,8 @@
  * \brief E-ACSL assertions and abort statements.
 ***************************************************************************/
 
-#ifndef E_ACSL_ASSERT
-#define E_ACSL_ASSERT
+#ifndef E_ACSL_ASSERT_H
+#define E_ACSL_ASSERT_H
 
 #include <sys/types.h>
 #include <signal.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_bits.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_bits.h
index 01b17be76f90ca3af271e5f30d00ae8229214241..2933e096cc4d32458c56828c3070bd6f3b23f59a 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_bits.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_bits.h
@@ -35,8 +35,8 @@
  * assume little-endian byte order.
 ***************************************************************************/
 
-#ifndef E_ACSL_BITS
-#define E_ACSL_BITS
+#ifndef E_ACSL_BITS_H
+#define E_ACSL_BITS_H
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_debug.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_debug.h
index 12596867e962a9c28f88d62b7d22cc7604e8018f..86cecc698ddc870ecdec07f4c571178e2780d75b 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_debug.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_debug.h
@@ -24,6 +24,8 @@
  * \file   e_acsl_debug.h
  * \brief  Debug-level functions and macros
 ***************************************************************************/
+#ifndef E_ACSL_DEBUG_H
+#define E_ACSL_DEBUG_H
 
 static void vabort(char *fmt, ...);
 
@@ -109,4 +111,5 @@ int getchar(void);
 #  define DASSERT(_e)
 #  define DVASSERT(_expr, _fmt, ...)
 #endif
+#endif
 // }}}
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_gmp_api.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_gmp_api.h
index 7f9b5d8b685e0a1c2e34e83818e2862052d4a0e8..f274621f893b3d04b6a95a36b6d9a9d5b680644b 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_gmp_api.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_gmp_api.h
@@ -30,8 +30,8 @@
 /* GMP prototypes */
 /******************/
 
-#ifndef E_ACSL_GMP_API
-#define E_ACSL_GMP_API
+#ifndef E_ACSL_GMP_API_H
+#define E_ACSL_GMP_API_H
 
 #include "stdlib.h"
 #include "e_acsl_alias.h"
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_leak.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_leak.h
index f01fd4d58f03ab0b47e82ed773a576482f1f730f..40a265a8d378a5eec45dd45dd495ac93e40074a7 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_leak.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_leak.h
@@ -26,8 +26,8 @@
  * \brief Functionality to report/track memory leaks. Shared between models
 ***************************************************************************/
 
-#ifndef E_ACSL_HEAP_LEAK
-#define E_ACSL_HEAP_LEAK
+#ifndef E_ACSL_HEAP_LEAK_H
+#define E_ACSL_HEAP_LEAK_H
 
 #include "e_acsl_mmodel_api.h"
 
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_malloc.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_malloc.h
index e31c605d0fbe328e1e3b210ee89a42260f7c5de9..eb34eed35e374675978888dce0cb36373f68db88 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_malloc.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_malloc.h
@@ -26,8 +26,8 @@
  * \brief E-ACSL memory allocation bindings.
 ***************************************************************************/
 
-#ifndef E_ACSL_MALLOC
-#define E_ACSL_MALLOC
+#ifndef E_ACSL_MALLOC_H
+#define E_ACSL_MALLOC_H
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_mmodel_api.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_mmodel_api.h
index 04eb97f4078ddc4ca126b4b3f02ae6c3e49640f2..649e522b7013341996e72aef67b2b285e8d6dea4 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_mmodel_api.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_mmodel_api.h
@@ -27,8 +27,8 @@
  * Functions and variables with non-static linkage used for instrumentation.
 ***************************************************************************/
 
-#ifndef E_ACSL_MMODEL
-#define E_ACSL_MMODEL
+#ifndef E_ACSL_MMODEL_H
+#define E_ACSL_MMODEL_H
 
 #include <stddef.h>
 #include "e_acsl_alias.h"
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_printf.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_printf.h
index dcf4a9f5de6bf0186589c843625c6b637cf8974b..e439fdd5420ae01445a1c40fe9c48d39b0f4a531 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_printf.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_printf.h
@@ -66,8 +66,8 @@
  *      field-width of 8 is used.
 ***************************************************************************/
 
-#ifndef E_ACSL_PRINTF
-#define E_ACSL_PRINTF
+#ifndef E_ACSL_PRINTF_H
+#define E_ACSL_PRINTF_H
 
 #include <unistd.h>
 #include <stdint.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_safe_locations.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_safe_locations.h
index 094a4e69a9c60c37f33929978af718beeb581915..4ec13c6ed589aef84dfc17faecfa83d2a3d8ba97 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_safe_locations.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_safe_locations.h
@@ -30,8 +30,8 @@
  * Most of these should be declared somewhere in start procedures of c
  * and gcc libraries. One example of a safe location is errno. */
 
-#ifndef E_ACSL_SAFE_LOCATIONS
-#define E_ACSL_SAFE_LOCATIONS
+#ifndef E_ACSL_SAFE_LOCATIONS_H
+#define E_ACSL_SAFE_LOCATIONS_H
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_shexec.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_shexec.h
index 88b1f7b03629155c82337dcf04182e70f8ff4611..7f7231ae33ae3734245e1fb8f4f1bca0d4c15a16 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_shexec.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_shexec.h
@@ -25,8 +25,8 @@
  * \brief Interface for running shell commands
 ***************************************************************************/
 
-#ifndef E_ACSL_SHEXEC
-#define E_ACSL_SHEXEC
+#ifndef E_ACSL_SHEXEC_H
+#define E_ACSL_SHEXEC_H
 
 #include <stddef.h>
 #include <sys/types.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_string.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_string.h
index d73c54e06199d6b20fdc3e997be25ff981c50f29..de31ec5b93c80d271035d86ec7a9ee306210d345 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_string.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_string.h
@@ -36,8 +36,8 @@
  *    of string.h functions use GLIBC-based implementations.
 ***************************************************************************/
 
-#ifndef E_ACSL_STD_STRING
-#define E_ACSL_STD_STRING
+#ifndef E_ACSL_STD_STRING_H
+#define E_ACSL_STD_STRING_H
 
 #ifndef E_ACSL_NO_COMPILER_BUILTINS
 # define memset  __builtin_memset
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal.h
index d728eeb614065f6754d77d47ee44ebb946fb4718..c31d8197a84ffedefe46120ae7acbc5edc489cff 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal.h
@@ -24,6 +24,8 @@
  * \file  e_acsl_temporal.h
  * \brief Implementation of the tenporal API shared by all models
 ***************************************************************************/
+#ifndef E_ACSL_TEMPORAL_H
+#define E_ACSL_TEMPORAL_H
 
 #include "e_acsl_temporal_timestamp.h"
 
@@ -158,3 +160,4 @@ int temporal_valid(void *ptr, void *addr_of_ptr) {
 #else
 #  define E_ACSL_TEMPORAL_DESC "disabled"
 #endif
+#endif
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal_timestamp.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal_timestamp.h
index 38728ca73d702f88dc7da9658e206b826704605f..40b7a006c17e9b78f904cf762f14211e5365439f 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal_timestamp.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal_timestamp.h
@@ -25,8 +25,8 @@
  * \brief Generating temporal timestamps
 ***************************************************************************/
 
-#ifndef E_ACSL_TEMPORAL_TIMESTAMP /*{{{*/
-#define E_ACSL_TEMPORAL_TIMESTAMP
+#ifndef E_ACSL_TEMPORAL_TIMESTAMP_H /*{{{*/
+#define E_ACSL_TEMPORAL_TIMESTAMP_H
 
 #include <stdint.h>
 
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_trace.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_trace.h
index 0c6a3fda5204029f66d2efb01f6bcbbd280fd997..a8a46fffe164472c670609263bd763a2b3672092 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_trace.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_trace.h
@@ -25,8 +25,8 @@
  * \brief Interface for producing backtrace. Requires GLIBC.
 ***************************************************************************/
 
-#ifndef E_ACSL_TRACE
-#define E_ACSL_TRACE
+#ifndef E_ACSL_TRACE_H
+#define E_ACSL_TRACE_H
 
 #include <stddef.h>
 #include <limits.h>