diff --git a/sys/dev/asr/osd_unix.h b/sys/dev/asr/osd_unix.h
index ad745802002e..0a3a76096b6f 100644
--- a/sys/dev/asr/osd_unix.h
+++ b/sys/dev/asr/osd_unix.h
@@ -402,7 +402,7 @@ typedef struct EATACommandPacket {
 #endif  /* _DPT_SOLARIS else */
 
 				  } EATA_CP;
-#endif // SNI_MIPS
+#endif /* SNI_MIPS */
 
 
                       /* Control Flags 1 Definitions */
@@ -509,7 +509,7 @@ typedef struct {
 	       } HbaInfo;
 
 #endif  /* _DPT_UNIXWARE */
-#endif // SNI_MIPS
+#endif /* SNI_MIPS */
 
 
 #ifdef _DPT_AIX
diff --git a/sys/dev/asr/osd_util.h b/sys/dev/asr/osd_util.h
index 150ba1fcbb88..4cf049cd175f 100644
--- a/sys/dev/asr/osd_util.h
+++ b/sys/dev/asr/osd_util.h
@@ -219,12 +219,12 @@
   /* Reverses the byte ordering of a 2 byte variable */
 #if (!defined(osdSwap2))
  uSHORT       osdSwap2(DPT_UNALIGNED uSHORT *);
-#endif  // !osdSwap2
+#endif  /* !osdSwap2 */
 
   /* Reverses the byte ordering of a 4 byte variable and shifts left 8 bits */
 #if (!defined(osdSwap3))
  uLONG        osdSwap3(DPT_UNALIGNED uLONG *);
-#endif  // !osdSwap3
+#endif  /* !osdSwap3 */
 
 
 #ifdef  _DPT_NETWARE
@@ -236,12 +236,12 @@
 	 }
    #else
 	 #define osdSwap4(inLong)       DPT_Bswapl(inLong)
-   #endif  // cplusplus
+   #endif  /* cplusplus */
 #else
 	/* Reverses the byte ordering of a 4 byte variable */
 # if (!defined(osdSwap4))
    uLONG        osdSwap4(DPT_UNALIGNED uLONG *);
-# endif  // !osdSwap4
+# endif  /* !osdSwap4 */
 
   /* The following functions ALWAYS swap regardless of the *
    * presence of DPT_BIG_ENDIAN                            */
@@ -249,7 +249,7 @@
    uSHORT       trueSwap2(DPT_UNALIGNED uSHORT *);
    uLONG        trueSwap4(DPT_UNALIGNED uLONG *);
 
-#endif  // netware
+#endif  /* netware */
 
 
 /*-------------------------------------*
@@ -269,15 +269,15 @@ uLONG	netSwap4(uLONG val);
 
 #if defined (_DPT_BIG_ENDIAN)
 
-// for big-endian we need to swap
+/* for big-endian we need to swap */
 
 #ifndef NET_SWAP_2
 #define NET_SWAP_2(x) (((x) >> 8) | ((x) << 8))
-#endif  // NET_SWAP_2
+#endif  /* NET_SWAP_2 */
 
 #ifndef NET_SWAP_4
 #define NET_SWAP_4(x) netSwap4((x))
-#endif  // NET_SWAP_4
+#endif  /* NET_SWAP_4 */
 
 #else
 
@@ -285,13 +285,13 @@ uLONG	netSwap4(uLONG val);
 
 #ifndef NET_SWAP_2
 #define NET_SWAP_2(x) (x)
-#endif  // NET_SWAP_2
+#endif  /* NET_SWAP_2 */
 
 #ifndef NET_SWAP_4
 #define NET_SWAP_4(x) (x)
-#endif  // NET_SWAP_4
+#endif  /* NET_SWAP_4 */
 
-#endif  // big endian
+#endif  /* big endian */
 
 
 
diff --git a/sys/dev/asr/sys_info.h b/sys/dev/asr/sys_info.h
index 24a5eca29f49..a51a8b45d2b7 100644
--- a/sys/dev/asr/sys_info.h
+++ b/sys/dev/asr/sys_info.h
@@ -69,7 +69,7 @@
 #else
 #pragma pack(1)
 #endif  /* aix */
-#endif  // no unpack
+#endif  /* no unpack */
 
 
 /*struct - driveParam_S - start
@@ -98,7 +98,7 @@
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
-#endif // DPT PORTABLE
+#endif /* DPT PORTABLE */
 //--------------------------------------------
 
    };
@@ -176,7 +176,7 @@
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
-#endif // DPT PORTABLE
+#endif /* DPT PORTABLE */
 //--------------------------------------------
 
    };
@@ -217,7 +217,7 @@
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
-#endif // DPT PORTABLE
+#endif /* DPT PORTABLE */
 //--------------------------------------------
 
    };
@@ -265,7 +265,7 @@
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
-#endif // DPT PORTABLE
+#endif /* DPT PORTABLE */
 //--------------------------------------------
 
    };
@@ -299,7 +299,7 @@
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
-#endif // DPT PORTABLE
+#endif /* DPT PORTABLE */
 //--------------------------------------------
 
    };
@@ -333,7 +333,7 @@
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
-#endif // DPT PORTABLE
+#endif /* DPT PORTABLE */
 //--------------------------------------------
 
    };
@@ -367,7 +367,7 @@
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
-#endif // DPT PORTABLE
+#endif /* DPT PORTABLE */
 //--------------------------------------------
 
    };
@@ -401,7 +401,7 @@
 #ifdef DPT_PORTABLE
 	uSHORT		netInsert(dptBuffer_S *buffer);
 	uSHORT		netExtract(dptBuffer_S *buffer);
-#endif // DPT PORTABLE
+#endif /* DPT PORTABLE */
 //--------------------------------------------
 
    };
@@ -420,7 +420,7 @@
 #else
 #pragma pack()
 #endif  /* aix */
-#endif  // no unpack
+#endif  /* no unpack */
 
 #ifdef DPT_MEASURE_PERFORMANCE
 typedef struct dpt_metrics {
@@ -478,5 +478,5 @@ typedef struct dpt_metrics {
 } dpt_perf_t;
 #endif
 
-#endif  // __SYS_INFO_H
+#endif  /* __SYS_INFO_H */