diff --git a/include/ap_common.h b/include/ap_common.h
index 84e58f0..7080c14 100644
--- a/include/ap_common.h
+++ b/include/ap_common.h
@@ -720,9 +720,6 @@ INLINE half rawBitsToHalf(unsigned short pi) {
 }
 #endif
 
-#endif // ifndef __AP_COMMON_H__ else
+#endif // ifndef __AP_COMMON_H__
 
 // -*- cpp -*-
-// vim: fdm=marker:foldmarker=#if,#endif:nofoldenable
-
-// 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689
diff --git a/include/ap_decl.h b/include/ap_decl.h
index b1c4511..ddd00f1 100644
--- a/include/ap_decl.h
+++ b/include/ap_decl.h
@@ -209,4 +209,4 @@ enum {
 
 #endif // !defined(__AP_DECL_H__)
 
-// 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689
+// -*- cpp -*-
diff --git a/include/ap_fixed.h b/include/ap_fixed.h
index f7c72ad..bae3089 100644
--- a/include/ap_fixed.h
+++ b/include/ap_fixed.h
@@ -349,6 +349,6 @@ INLINE void sc_trace(sc_core::sc_trace_file* tf,
 // image part automatically zero-initialized when only real part is provided.
 #include <ap_fixed_special.h>
 
-#endif // ifndef __AP_FIXED_H__ else
+#endif // ifndef __AP_FIXED_H__
 
 // -*- cpp -*-
diff --git a/include/ap_fixed_base.h b/include/ap_fixed_base.h
index 149c26e..e99c839 100644
--- a/include/ap_fixed_base.h
+++ b/include/ap_fixed_base.h
@@ -2354,5 +2354,3 @@ INLINE bool operator<=(
 #endif // ifndef __AP_FIXED_BASE_H__ else
 
 // -*- cpp -*-
-
-// 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689
diff --git a/include/ap_fixed_ref.h b/include/ap_fixed_ref.h
index 0bc9626..b968e4a 100644
--- a/include/ap_fixed_ref.h
+++ b/include/ap_fixed_ref.h
@@ -716,5 +716,3 @@ AF_REF_REL_OP_WITH_AP_INT(!=)
 #endif // ifndef __AP_FIXED_REF_H__
 
 // -*- cpp -*-
-
-// 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689
diff --git a/include/ap_fixed_special.h b/include/ap_fixed_special.h
index 6fa79c2..64853b3 100644
--- a/include/ap_fixed_special.h
+++ b/include/ap_fixed_special.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef AP_FIXED_SPECIAL_H
-#define AP_FIXED_SPECIAL_H
+#ifndef __AP_FIXED_SPECIAL_H__
+#define __AP_FIXED_SPECIAL_H__
 #ifndef __SYNTHESIS__
 #include <cstdio>
 #include <cstdlib>
@@ -219,6 +219,6 @@ inline bool operator!=(
 
 }  // namespace std
 
-#endif  // ifndef AP_FIXED_SPECIAL_H
+#endif  // ifndef __AP_FIXED_SPECIAL_H__
 
-// 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689
+// -*- cpp -*-
diff --git a/include/ap_int_base.h b/include/ap_int_base.h
index e17c59f..4f1198d 100644
--- a/include/ap_int_base.h
+++ b/include/ap_int_base.h
@@ -1884,7 +1884,7 @@ OP_REL_WITH_CONCAT(<=)
 
 #undef OP_REL_WITH_CONCAT
 
-#endif // ifndef __cplusplus else
-#endif // ifndef __AP_INT_BASE_H__ else
+#endif // ifndef __cplusplus
+#endif // ifndef __AP_INT_BASE_H__
 
-// 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689
+// -*- cpp -*-
diff --git a/include/ap_int_ref.h b/include/ap_int_ref.h
index 6bae90b..dec614c 100644
--- a/include/ap_int_ref.h
+++ b/include/ap_int_ref.h
@@ -1336,9 +1336,7 @@ CONCAT_SHIFT_WITH_INT(unsigned long, >>)
 CONCAT_SHIFT_WITH_INT(ap_slong, >>)
 CONCAT_SHIFT_WITH_INT(ap_ulong, >>)
 
-#endif // ifndef __cplusplus else
-#endif // ifndef __AP_INT_REF_H__ else
+#endif // ifndef __cplusplus
+#endif // ifndef __AP_INT_REF_H__
 
 // -*- cpp -*-
-
-// 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689
diff --git a/include/ap_int_special.h b/include/ap_int_special.h
index 8647a79..802f484 100644
--- a/include/ap_int_special.h
+++ b/include/ap_int_special.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef AP_INT_SPECIAL_H
-#define AP_INT_SPECIAL_H
+#ifndef __AP_INT_SPECIAL_H__
+#define __AP_INT_SPECIAL_H__
 #ifndef __SYNTHESIS__
 #include <cstdio>
 #include <cstdlib>
@@ -212,6 +212,6 @@ inline bool operator!=(const ap_int<_AP_W> &__x, const complex<ap_int<_AP_W> > &
 
 }  // namespace std
 
-#endif  // ifndef AP_INT_SPECIAL_H
+#endif  // ifndef __AP_INT_SPECIAL_H__
 
-// 67d7842dbbe25473c3c32b93c0da8047785f30d78e8a024de1b57352245f9689
+// -*- cpp -*-
diff --git a/include/etc/ap_private.h b/include/etc/ap_private.h
index 71cca24..ed22c4b 100644
--- a/include/etc/ap_private.h
+++ b/include/etc/ap_private.h
@@ -7187,3 +7187,5 @@ REF_BIN_OP(<<, arg1)
 //************************************************************************
 
 #endif // ifndef __AP_PRIVATE_H__
+
+// -*- cpp -*-