diff --git a/bepascal/source/bepascal/cpp/include/be/interface/font.h b/bepascal/source/bepascal/cpp/include/be/interface/font.h
index 438dbd5..6e60ac0 100644
--- a/bepascal/source/bepascal/cpp/include/be/interface/font.h
+++ b/bepascal/source/bepascal/cpp/include/be/interface/font.h
@@ -30,4 +30,4 @@ class BPFont : public BFont, public BPasObject
 		BPFont(TPasObject PasObject, const BFont &font);
 };
 
-#endif _FONT_H_P /* _FONT_H_P */
+#endif /* _FONT_H_P */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Point.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Point.cpp
index e4bd6d2..40c7687 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Point.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Point.cpp
@@ -91,4 +91,4 @@ float BPoint_Get_Y(TCPlusObject Point)
 #endif
 
 
-#endif _POINT_CPP_ /* _POINT_CPP_ */
+#endif /* _POINT_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Rect.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Rect.cpp
index b6a9724..1d7c751 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Rect.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Rect.cpp
@@ -434,4 +434,4 @@ BRect_Contains_1
 #endif
 
 
-#endif _RECT_CPP_ /* _RECT_CPP_ */
+#endif /* _RECT_CPP_ */
diff --git a/bepascal/source/bepascal/cpp/src/be/interface/Shape.cpp b/bepascal/source/bepascal/cpp/src/be/interface/Shape.cpp
index 793c900..d58b5c6 100644
--- a/bepascal/source/bepascal/cpp/src/be/interface/Shape.cpp
+++ b/bepascal/source/bepascal/cpp/src/be/interface/Shape.cpp
@@ -338,4 +338,4 @@ BShape_Close(BShape *Shape)
 #endif
 
 
-#endif _SHAPE_CPP_ /* _SHAPE_CPP_ */
+#endif /* _SHAPE_CPP_ */