10 files changed, 13 insertions, 15 deletions
diff --git a/usr/src/lib/sun_fc/common/FCSyseventBridge.cc b/usr/src/lib/sun_fc/common/FCSyseventBridge.cc
index 58972aec5b..a132fd770e 100644
--- a/usr/src/lib/sun_fc/common/FCSyseventBridge.cc
+++ b/usr/src/lib/sun_fc/common/FCSyseventBridge.cc
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-
-
 #include "FCSyseventBridge.h"
 #include "Exceptions.h"
 #include "Trace.h"
@@ -36,7 +34,7 @@
 #include "sun_fc.h"
 #include <libnvpair.h>
 #include <iostream>
-#include <limits.h>
+#include <climits>
 
 using namespace std;
 
diff --git a/usr/src/lib/sun_fc/common/HBA.cc b/usr/src/lib/sun_fc/common/HBA.cc
index 7a218d3213..074a522705 100644
--- a/usr/src/lib/sun_fc/common/HBA.cc
+++ b/usr/src/lib/sun_fc/common/HBA.cc
@@ -37,8 +37,8 @@
 #include <unistd.h>
 #include <stropts.h>
 #include <errno.h>
-#include <limits.h>
-#include <string.h>
+#include <climits>
+#include <cstring>
 
 #define	    NSECS_PER_SEC	1000000000l
 #define	    BUSY_SLEEP		NSECS_PER_SEC/10 /* 1/10 second */
diff --git a/usr/src/lib/sun_fc/common/HBAList.cc b/usr/src/lib/sun_fc/common/HBAList.cc
index b6a3f50464..842fd3ef07 100644
--- a/usr/src/lib/sun_fc/common/HBAList.cc
+++ b/usr/src/lib/sun_fc/common/HBAList.cc
@@ -33,9 +33,9 @@
 #include <sstream>
 #include "FCHBA.h"
 #include "TgtFCHBA.h"
-#include <string.h>
-#include <limits.h>
-#include <stdlib.h>
+#include <cstring>
+#include <climits>
+#include <cstdlib>
 
 using namespace std;
 
diff --git a/usr/src/lib/sun_fc/common/Lockable.cc b/usr/src/lib/sun_fc/common/Lockable.cc
index e6cbc856f7..e6ca1c160b 100644
--- a/usr/src/lib/sun_fc/common/Lockable.cc
+++ b/usr/src/lib/sun_fc/common/Lockable.cc
@@ -29,7 +29,7 @@
 #include <cstdio>
 #include <cerrno>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 
 using namespace std;
 
diff --git a/usr/src/lib/sun_fc/common/Sun_fcGetAdapterName.cc b/usr/src/lib/sun_fc/common/Sun_fcGetAdapterName.cc
index e395406fff..641d86b929 100644
--- a/usr/src/lib/sun_fc/common/Sun_fcGetAdapterName.cc
+++ b/usr/src/lib/sun_fc/common/Sun_fcGetAdapterName.cc
@@ -28,7 +28,7 @@
 #include "HBAList.h"
 #include "Trace.h"
 #include "Exceptions.h"
-#include <string.h>
+#include <cstring>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/usr/src/lib/sun_fc/common/Sun_fcGetTgtAdapterName.cc b/usr/src/lib/sun_fc/common/Sun_fcGetTgtAdapterName.cc
index 6c585da32c..ea9084fe25 100644
--- a/usr/src/lib/sun_fc/common/Sun_fcGetTgtAdapterName.cc
+++ b/usr/src/lib/sun_fc/common/Sun_fcGetTgtAdapterName.cc
@@ -28,7 +28,7 @@
 #include "HBAList.h"
 #include "Trace.h"
 #include "Exceptions.h"
-#include <string.h>
+#include <cstring>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/usr/src/lib/sun_fc/common/Sun_fcGetVendorLibraryAttributes.cc b/usr/src/lib/sun_fc/common/Sun_fcGetVendorLibraryAttributes.cc
index 1525770b2e..72e30ab0ea 100644
--- a/usr/src/lib/sun_fc/common/Sun_fcGetVendorLibraryAttributes.cc
+++ b/usr/src/lib/sun_fc/common/Sun_fcGetVendorLibraryAttributes.cc
@@ -29,7 +29,7 @@
 #include "Exceptions.h"
 #include "sun_fc_version.h"
 #include "HBAList.h"
-#include <string.h>
+#include <cstring>
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/usr/src/lib/sun_fc/common/TgtFCHBA.cc b/usr/src/lib/sun_fc/common/TgtFCHBA.cc
index 0ebf112464..7d162b2dbd 100644
--- a/usr/src/lib/sun_fc/common/TgtFCHBA.cc
+++ b/usr/src/lib/sun_fc/common/TgtFCHBA.cc
@@ -43,7 +43,7 @@
 #include <TgtFCHBAPort.h>
 #include <HBAList.h>
 #include <sun_fc.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 using namespace std;
 const string TgtFCHBA::FCT_DRIVER_PATH = "/devices/pseudo/fct@0:admin";
diff --git a/usr/src/lib/sun_fc/common/TgtFCHBAPort.cc b/usr/src/lib/sun_fc/common/TgtFCHBAPort.cc
index f941e5bf29..04161a75eb 100644
--- a/usr/src/lib/sun_fc/common/TgtFCHBAPort.cc
+++ b/usr/src/lib/sun_fc/common/TgtFCHBAPort.cc
@@ -48,7 +48,7 @@
 #include <sys/scsi/generic/inquiry.h>
 #include <sys/scsi/generic/status.h>
 #include <errno.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 
 using namespace std;
diff --git a/usr/src/lib/sun_fc/common/Trace.cc b/usr/src/lib/sun_fc/common/Trace.cc
index 38330acfec..3ea6c663b1 100644
--- a/usr/src/lib/sun_fc/common/Trace.cc
+++ b/usr/src/lib/sun_fc/common/Trace.cc
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 
 using namespace std;