diff --git a/headers/build/private/storage/DiskDeviceVisitor.h b/headers/build/private/storage/DiskDeviceVisitor.h
index e89a1c8f99..785b3ed28f 100644
--- a/headers/build/private/storage/DiskDeviceVisitor.h
+++ b/headers/build/private/storage/DiskDeviceVisitor.h
@@ -22,4 +22,4 @@ public:
 	virtual bool Visit(BPartition *partition, int32 level);
 };
 
-#endif _DISK_DEVICE_VISITOR_H
+#endif // _DISK_DEVICE_VISITOR_H
diff --git a/headers/build/private/textencoding/CharacterSet.h b/headers/build/private/textencoding/CharacterSet.h
index 2df290e897..a465615fc2 100644
--- a/headers/build/private/textencoding/CharacterSet.h
+++ b/headers/build/private/textencoding/CharacterSet.h
@@ -86,4 +86,4 @@ private:
 
 }
 
-#endif CHARACTER_SET_H
+#endif // CHARACTER_SET_H
diff --git a/headers/build/private/textencoding/CharacterSetRoster.h b/headers/build/private/textencoding/CharacterSetRoster.h
index 51742042f5..5f8b1fc4b1 100644
--- a/headers/build/private/textencoding/CharacterSetRoster.h
+++ b/headers/build/private/textencoding/CharacterSetRoster.h
@@ -88,4 +88,4 @@ private:
 
 }
 
-#endif CHARACTER_SET_ROSTER_H
+#endif // CHARACTER_SET_ROSTER_H
diff --git a/headers/private/disk_scanner/partition.h b/headers/private/disk_scanner/partition.h
index 9c149fa8e5..1a7bd229b2 100644
--- a/headers/private/disk_scanner/partition.h
+++ b/headers/private/disk_scanner/partition.h
@@ -122,4 +122,4 @@ typedef struct partition_module_info {
 	Returns B_OK, if everything went fine, an error code otherwise.
 */
 
-#endif _PARTSCAN_PARTITION_H
+#endif // _PARTSCAN_PARTITION_H
diff --git a/headers/private/print/PictureIterator.h b/headers/private/print/PictureIterator.h
index 98cd2fe588..09d883bb32 100644
--- a/headers/private/print/PictureIterator.h
+++ b/headers/private/print/PictureIterator.h
@@ -90,4 +90,4 @@ public:
 		virtual void		Iterate(BPicture* picture);
 };
 
-#endif _PICTURE_ITERATOR_H
+#endif // _PICTURE_ITERATOR_H
diff --git a/headers/private/print/PicturePrinter.h b/headers/private/print/PicturePrinter.h
index b539f13275..7d0dd40d64 100644
--- a/headers/private/print/PicturePrinter.h
+++ b/headers/private/print/PicturePrinter.h
@@ -121,4 +121,4 @@ private:
 	PicturePrinter* fPrinter;
 };
 
-#endif _PICTURE_PRINTER_H
+#endif // _PICTURE_PRINTER_H