diff --git a/configure.ac b/configure.ac
index 0c006eb7..8107a70e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([testdisk],[7.2-WIP],[grenier@cgsecurity.org])
 AC_LANG(C)
 sinclude(acx_pthread.m4)
 sinclude(mkdir.m4)
-TESTDISKDATE="September 2020"
+TESTDISKDATE="October 2020"
 AC_SUBST(TESTDISKDATE)
 AC_DEFINE_UNQUOTED([TESTDISKDATE],"$TESTDISKDATE",[Date of release])
 AC_CONFIG_AUX_DIR(config)
diff --git a/src/fnctdsk.h b/src/fnctdsk.h
index 1c8a611a..9131a345 100644
--- a/src/fnctdsk.h
+++ b/src/fnctdsk.h
@@ -19,6 +19,8 @@
     Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  */
+#ifndef _FNCTDSK_H
+#define _FNCTDSK_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -210,3 +212,4 @@ void log_disk_list(list_disk_t *list_disk);
 #ifdef __cplusplus
 } /* closing brace for extern "C" */
 #endif
+#endif
diff --git a/src/hdaccess.h b/src/hdaccess.h
index 0aa7f0db..f1431b03 100644
--- a/src/hdaccess.h
+++ b/src/hdaccess.h
@@ -19,6 +19,8 @@
     Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  */
+#ifndef _HDACCESS_H
+#define _HDACCESS_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -109,3 +111,4 @@ void generic_clean(disk_t *disk);
 #ifdef __cplusplus
 } /* closing brace for extern "C" */
 #endif
+#endif
diff --git a/src/ntfs_utl.h b/src/ntfs_utl.h
index dc68ea19..b3d4c3d5 100644
--- a/src/ntfs_utl.h
+++ b/src/ntfs_utl.h
@@ -19,13 +19,14 @@
     Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  */
+#ifndef _NTFS_UTL_H
+#define _NTFS_UTL_H
+
 #ifdef __FRAMAC__
 #undef HAVE_LIBNTFS
 #undef HAVE_LIBNTFS3G
 #endif
 
-#ifndef _NTFS_UTL_H
-#define _NTFS_UTL_H
 #if defined(HAVE_LIBNTFS) || defined(HAVE_LIBNTFS3G)
 #ifdef __cplusplus
 extern "C" {