diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake
index 61885fae65b..99dfa442187 100644
--- a/cmake/FindReadline.cmake
+++ b/cmake/FindReadline.cmake
@@ -24,7 +24,7 @@ else( READLINE_INCLUDE_DIR AND READLINE_LIBRARY )
     set( CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR} )
     check_cxx_source_compiles(
       "
-      #include <stdio.h>
+      #include <cstdio>
       #include <readline/readline.h>
       int main()
       {
diff --git a/src/XProtocol/XProtocol.cc b/src/XProtocol/XProtocol.cc
index 9d8c4bf5dd3..dd15990c060 100644
--- a/src/XProtocol/XProtocol.cc
+++ b/src/XProtocol/XProtocol.cc
@@ -50,12 +50,12 @@
 /*    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.    */
 /******************************************************************************/
 
-#include <inttypes.h>
+#include <cinttypes>
 #include <netinet/in.h>
 #include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/XProtocol/XProtocol.hh b/src/XProtocol/XProtocol.hh
index 9a30417957e..854fbe62286 100644
--- a/src/XProtocol/XProtocol.hh
+++ b/src/XProtocol/XProtocol.hh
@@ -1312,7 +1312,7 @@ struct ALIGN_CHECK {char chkszreq[25-sizeof(ClientRequest)];
 /*                   X P r o t o c o l   U t i l i t i e s                    */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #if defined(WIN32)
 #if !defined(ENOTBLK)
 #  define ENOTBLK 15
diff --git a/src/Xrd/XrdBuffXL.cc b/src/Xrd/XrdBuffXL.cc
index 80026e0005e..f84ef77cbb0 100644
--- a/src/Xrd/XrdBuffXL.cc
+++ b/src/Xrd/XrdBuffXL.cc
@@ -28,8 +28,8 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/types.h>
 
 #include "XrdOuc/XrdOucUtils.hh"
diff --git a/src/Xrd/XrdBuffer.cc b/src/Xrd/XrdBuffer.cc
index be5ea28701d..28d71aa9fb2 100644
--- a/src/Xrd/XrdBuffer.cc
+++ b/src/Xrd/XrdBuffer.cc
@@ -27,10 +27,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <time.h>
+#include <ctime>
 #include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/types.h>
 
 #include "XrdOuc/XrdOucUtils.hh"
diff --git a/src/Xrd/XrdBuffer.hh b/src/Xrd/XrdBuffer.hh
index 7c2a2722c6d..9426994213b 100644
--- a/src/Xrd/XrdBuffer.hh
+++ b/src/Xrd/XrdBuffer.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/Xrd/XrdConfig.cc b/src/Xrd/XrdConfig.cc
index caceb152df0..450c82c47a6 100644
--- a/src/Xrd/XrdConfig.cc
+++ b/src/Xrd/XrdConfig.cc
@@ -35,13 +35,13 @@
 */
   
 #include <unistd.h>
-#include <ctype.h>
+#include <cctype>
 #include <fcntl.h>
 #include <pwd.h>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/resource.h>
 #include <sys/types.h>
diff --git a/src/Xrd/XrdInet.cc b/src/Xrd/XrdInet.cc
index 9f32c3ca412..d24869692ba 100644
--- a/src/Xrd/XrdInet.cc
+++ b/src/Xrd/XrdInet.cc
@@ -27,10 +27,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <netdb.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/Xrd/XrdJob.hh b/src/Xrd/XrdJob.hh
index 5c68696c649..80a8e024011 100644
--- a/src/Xrd/XrdJob.hh
+++ b/src/Xrd/XrdJob.hh
@@ -29,10 +29,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
-#include <time.h>
+#include <ctime>
   
 // The XrdJob class is a super-class that is inherited by any class that needs
 // to schedule work on behalf of itself. The XrdJob class is optimized for
diff --git a/src/Xrd/XrdLink.cc b/src/Xrd/XrdLink.cc
index 9841973967e..a23c81bf6a3 100644
--- a/src/Xrd/XrdLink.cc
+++ b/src/Xrd/XrdLink.cc
@@ -29,8 +29,8 @@
 
 #include <poll.h>
 #include <signal.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/uio.h>
 
diff --git a/src/Xrd/XrdLinkCtl.cc b/src/Xrd/XrdLinkCtl.cc
index 2480df73f67..30f8847b0b2 100644
--- a/src/Xrd/XrdLinkCtl.cc
+++ b/src/Xrd/XrdLinkCtl.cc
@@ -29,7 +29,7 @@
   
 #include <sys/types.h>
 #include <fcntl.h>
-#include <time.h>
+#include <ctime>
 
 #include "Xrd/XrdInet.hh"
 #include "Xrd/XrdLinkCtl.hh"
diff --git a/src/Xrd/XrdLinkInfo.hh b/src/Xrd/XrdLinkInfo.hh
index 0f2e8de9d45..a56a92f54a4 100644
--- a/src/Xrd/XrdLinkInfo.hh
+++ b/src/Xrd/XrdLinkInfo.hh
@@ -29,9 +29,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
-#include <time.h>
+#include <ctime>
 
 #include "XrdSys/XrdSysPthread.hh"
 
diff --git a/src/Xrd/XrdLinkMatch.cc b/src/Xrd/XrdLinkMatch.cc
index 4ed9110c369..e82cc815886 100644
--- a/src/Xrd/XrdLinkMatch.cc
+++ b/src/Xrd/XrdLinkMatch.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "Xrd/XrdLinkMatch.hh"
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/Xrd/XrdLinkMatch.hh b/src/Xrd/XrdLinkMatch.hh
index cfa0a3ac81c..1bd36e5add9 100644
--- a/src/Xrd/XrdLinkMatch.hh
+++ b/src/Xrd/XrdLinkMatch.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <strings.h>
-#include <stdlib.h>
+#include <cstdlib>
   
 class XrdLinkMatch
 {
diff --git a/src/Xrd/XrdLinkXeq.cc b/src/Xrd/XrdLinkXeq.cc
index 27586f611c9..489f032ade9 100644
--- a/src/Xrd/XrdLinkXeq.cc
+++ b/src/Xrd/XrdLinkXeq.cc
@@ -30,8 +30,8 @@
 #include <limits.h>
 #include <poll.h>
 #include <signal.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/src/Xrd/XrdLinkXeq.hh b/src/Xrd/XrdLinkXeq.hh
index 7fab1467c0d..2148b9d0ce8 100644
--- a/src/Xrd/XrdLinkXeq.hh
+++ b/src/Xrd/XrdLinkXeq.hh
@@ -31,7 +31,7 @@
 
 #include <sys/types.h>
 #include <fcntl.h>
-#include <time.h>
+#include <ctime>
 
 #include "Xrd/XrdLink.hh"
 #include "Xrd/XrdLinkInfo.hh"
diff --git a/src/Xrd/XrdMain.cc b/src/Xrd/XrdMain.cc
index 99b0ea99344..29446a5ca12 100644
--- a/src/Xrd/XrdMain.cc
+++ b/src/Xrd/XrdMain.cc
@@ -59,14 +59,14 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdint.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdint>
 #include <signal.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 
 #include "Xrd/XrdConfig.hh"
diff --git a/src/Xrd/XrdObject.hh b/src/Xrd/XrdObject.hh
index 97df1f37e16..ee688c5e5ee 100644
--- a/src/Xrd/XrdObject.hh
+++ b/src/Xrd/XrdObject.hh
@@ -29,9 +29,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <strings.h>
-#include <time.h>
+#include <ctime>
 #include <sys/types.h>
 
 #include "Xrd/XrdJob.hh"
diff --git a/src/Xrd/XrdPoll.cc b/src/Xrd/XrdPoll.cc
index 8b8d723c32a..ec3b0734239 100644
--- a/src/Xrd/XrdPoll.cc
+++ b/src/Xrd/XrdPoll.cc
@@ -28,8 +28,8 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
   
 #include "XrdSys/XrdSysError.hh"
 #include "XrdSys/XrdSysFD.hh"
diff --git a/src/Xrd/XrdPollE.icc b/src/Xrd/XrdPollE.icc
index a71d734c844..f3604c8e54c 100644
--- a/src/Xrd/XrdPollE.icc
+++ b/src/Xrd/XrdPollE.icc
@@ -29,7 +29,7 @@
 /******************************************************************************/
 
 #include <fcntl.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/epoll.h>
diff --git a/src/Xrd/XrdPollPoll.icc b/src/Xrd/XrdPollPoll.icc
index dea62fd3e7d..da6e03ef1ab 100644
--- a/src/Xrd/XrdPollPoll.icc
+++ b/src/Xrd/XrdPollPoll.icc
@@ -28,7 +28,7 @@
 /******************************************************************************/
 
 #include <signal.h>
-#include <stdlib.h>
+#include <cstdlib>
   
 #include "Xrd/XrdLinkCtl.hh"
 #include "Xrd/XrdPollPoll.hh"
diff --git a/src/Xrd/XrdScheduler.cc b/src/Xrd/XrdScheduler.cc
index 3806ff7d5e8..75925a9456d 100644
--- a/src/Xrd/XrdScheduler.cc
+++ b/src/Xrd/XrdScheduler.cc
@@ -27,10 +27,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <signal.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/Xrd/XrdSendQ.cc b/src/Xrd/XrdSendQ.cc
index 36def214c2b..377fb018266 100644
--- a/src/Xrd/XrdSendQ.cc
+++ b/src/Xrd/XrdSendQ.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <sys/uio.h>
   
diff --git a/src/Xrd/XrdSendQ.hh b/src/Xrd/XrdSendQ.hh
index 6ddc0dab06d..f7923d8ba0e 100644
--- a/src/Xrd/XrdSendQ.hh
+++ b/src/Xrd/XrdSendQ.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <sys/uio.h>
   
diff --git a/src/Xrd/XrdStats.cc b/src/Xrd/XrdStats.cc
index eb92deaa2c8..103ca13a6f9 100644
--- a/src/Xrd/XrdStats.cc
+++ b/src/Xrd/XrdStats.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/time.h>
 #include <sys/resource.h>
   
diff --git a/src/Xrd/XrdStats.hh b/src/Xrd/XrdStats.hh
index 32b66f19398..3c53527bb99 100644
--- a/src/Xrd/XrdStats.hh
+++ b/src/Xrd/XrdStats.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdSys/XrdSysPthread.hh"
 
diff --git a/src/XrdAcc/XrdAccAccess.cc b/src/XrdAcc/XrdAccAccess.cc
index ff574608046..f853a280d25 100644
--- a/src/XrdAcc/XrdAccAccess.cc
+++ b/src/XrdAcc/XrdAccAccess.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdio.h>
-#include <time.h>
+#include <cctype>
+#include <cstdio>
+#include <ctime>
 #include <sys/param.h>
 
 #include "XrdVersion.hh"
diff --git a/src/XrdAcc/XrdAccAudit.cc b/src/XrdAcc/XrdAccAudit.cc
index 9c15a3e50b8..4f00229fb7e 100644
--- a/src/XrdAcc/XrdAccAudit.cc
+++ b/src/XrdAcc/XrdAccAudit.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "XrdAcc/XrdAccAudit.hh"
 #include "XrdSys/XrdSysError.hh"
diff --git a/src/XrdAcc/XrdAccAuthFile.cc b/src/XrdAcc/XrdAccAuthFile.cc
index f16fc902c43..1f9601af480 100644
--- a/src/XrdAcc/XrdAccAuthFile.cc
+++ b/src/XrdAcc/XrdAccAuthFile.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <string.h>
+#include <cstring>
 #include <strings.h>
 #include <sys/stat.h>
 
diff --git a/src/XrdAcc/XrdAccCapability.hh b/src/XrdAcc/XrdAccCapability.hh
index 59aaa20c96c..9ff336d3293 100644
--- a/src/XrdAcc/XrdAccCapability.hh
+++ b/src/XrdAcc/XrdAccCapability.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
 
 #include "XrdAcc/XrdAccPrivs.hh"
diff --git a/src/XrdAcc/XrdAccConfig.cc b/src/XrdAcc/XrdAccConfig.cc
index bf2682520ef..e6450666c44 100644
--- a/src/XrdAcc/XrdAccConfig.cc
+++ b/src/XrdAcc/XrdAccConfig.cc
@@ -29,12 +29,12 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
+#include <cctype>
 #include <fcntl.h>
 #include <map>
 #include <strings.h>
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdAcc/XrdAccEntity.cc b/src/XrdAcc/XrdAccEntity.cc
index ce563e774b1..6d04a04ec9f 100644
--- a/src/XrdAcc/XrdAccEntity.cc
+++ b/src/XrdAcc/XrdAccEntity.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdAcc/XrdAccEntity.hh"
 #include "XrdOuc/XrdOucTokenizer.hh"
diff --git a/src/XrdAcc/XrdAccEntity.hh b/src/XrdAcc/XrdAccEntity.hh
index 85766ee1422..2b0bb339e91 100644
--- a/src/XrdAcc/XrdAccEntity.hh
+++ b/src/XrdAcc/XrdAccEntity.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <vector>
 
 #include "XrdSec/XrdSecAttr.hh"
diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
index d6f500c847a..e663fdd35aa 100644
--- a/src/XrdAcc/XrdAccGroups.cc
+++ b/src/XrdAcc/XrdAccGroups.cc
@@ -29,12 +29,12 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <limits.h>
 #include <netdb.h>
 #include <pwd.h>
-#include <string.h>
+#include <cstring>
 #include <strings.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdApps/XrdAccTest.cc b/src/XrdApps/XrdAccTest.cc
index d472fd7377e..9a4a3a30302 100644
--- a/src/XrdApps/XrdAccTest.cc
+++ b/src/XrdApps/XrdAccTest.cc
@@ -29,11 +29,11 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <grp.h>
 #include <arpa/inet.h>
 #include <sys/param.h>
diff --git a/src/XrdApps/XrdAppsCconfig.cc b/src/XrdApps/XrdAppsCconfig.cc
index 937643fd516..b5e9b480651 100644
--- a/src/XrdApps/XrdAppsCconfig.cc
+++ b/src/XrdApps/XrdAppsCconfig.cc
@@ -29,7 +29,7 @@
 /******************************************************************************/
 
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdApps/XrdClProxyPlugin/ProxyPrefixPlugin.cc b/src/XrdApps/XrdClProxyPlugin/ProxyPrefixPlugin.cc
index 421b06883ed..53318f6a3bc 100644
--- a/src/XrdApps/XrdClProxyPlugin/ProxyPrefixPlugin.cc
+++ b/src/XrdApps/XrdClProxyPlugin/ProxyPrefixPlugin.cc
@@ -27,7 +27,7 @@
 #include "XrdVersion.hh"
 #include "XrdCl/XrdClDefaultEnv.hh"
 #include "XrdCl/XrdClLog.hh"
-#include <stdlib.h>
+#include <cstdlib>
 #include <cstdio>
 
 XrdVERSIONINFO(XrdClGetPlugIn, XrdClGetPlugIn)
diff --git a/src/XrdApps/XrdCpConfig.cc b/src/XrdApps/XrdCpConfig.cc
index e1237b631f7..5e79cdbc17b 100644
--- a/src/XrdApps/XrdCpConfig.cc
+++ b/src/XrdApps/XrdCpConfig.cc
@@ -30,9 +30,9 @@
   
 #include <fcntl.h>
 #include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 
diff --git a/src/XrdApps/XrdCpConfig.hh b/src/XrdApps/XrdCpConfig.hh
index 770ec064dd3..ad319736831 100644
--- a/src/XrdApps/XrdCpConfig.hh
+++ b/src/XrdApps/XrdCpConfig.hh
@@ -32,8 +32,8 @@
 
 #include "XrdCks/XrdCksData.hh"
 
-#include <ctype.h>
-#include <stdint.h>
+#include <cctype>
+#include <cstdint>
 
 #include <string>
 #include <vector>
diff --git a/src/XrdApps/XrdCpFile.cc b/src/XrdApps/XrdCpFile.cc
index 1dc512c85dc..a6f8a6496e2 100644
--- a/src/XrdApps/XrdCpFile.cc
+++ b/src/XrdApps/XrdCpFile.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <string.h>
+#include <cstring>
 #include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdApps/XrdCpFile.hh b/src/XrdApps/XrdCpFile.hh
index 0805424a3e2..ef09301b56c 100644
--- a/src/XrdApps/XrdCpFile.hh
+++ b/src/XrdApps/XrdCpFile.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 class XrdCpFile
 {
diff --git a/src/XrdApps/XrdCrc32c.cc b/src/XrdApps/XrdCrc32c.cc
index 2fc05e6b10c..420aba1342c 100644
--- a/src/XrdApps/XrdCrc32c.cc
+++ b/src/XrdApps/XrdCrc32c.cc
@@ -31,11 +31,11 @@
 #include <iostream>
 
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 #include <sys/stat.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/uio.h>
 
diff --git a/src/XrdApps/XrdMapCluster.cc b/src/XrdApps/XrdMapCluster.cc
index c755905cc0a..395f2d7c2a7 100644
--- a/src/XrdApps/XrdMapCluster.cc
+++ b/src/XrdApps/XrdMapCluster.cc
@@ -38,11 +38,11 @@
 /*                         i n c l u d e   f i l e s                          */
 /******************************************************************************/
   
-#include <errno.h>
+#include <cerrno>
 #include <getopt.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 #include <unistd.h>
 #include <sys/param.h>
diff --git a/src/XrdApps/XrdMpxStats.cc b/src/XrdApps/XrdMpxStats.cc
index 8e7a03bbd8e..8268a652853 100644
--- a/src/XrdApps/XrdMpxStats.cc
+++ b/src/XrdApps/XrdMpxStats.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/src/XrdApps/XrdMpxXml.cc b/src/XrdApps/XrdMpxXml.cc
index f8a39530ee9..dc6083afdd7 100644
--- a/src/XrdApps/XrdMpxXml.cc
+++ b/src/XrdApps/XrdMpxXml.cc
@@ -30,12 +30,12 @@
 
 #include <iostream>
 #include <map>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/uio.h>
-#include <time.h>
+#include <ctime>
 
 #include "XrdApps/XrdMpxXml.hh"
 #include "XrdOuc/XrdOucTokenizer.hh"
diff --git a/src/XrdApps/XrdPinls.cc b/src/XrdApps/XrdPinls.cc
index 10b9e41c3ee..f533a961d96 100644
--- a/src/XrdApps/XrdPinls.cc
+++ b/src/XrdApps/XrdPinls.cc
@@ -37,11 +37,11 @@
 /*                         i n c l u d e   f i l e s                          */
 /******************************************************************************/
   
-#include <ctype.h>
+#include <cctype>
 #include <iostream>
 #include <map>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdVersionPlugin.hh"
 
diff --git a/src/XrdApps/XrdQStats.cc b/src/XrdApps/XrdQStats.cc
index 2a9e9442a61..394f309acd7 100644
--- a/src/XrdApps/XrdQStats.cc
+++ b/src/XrdApps/XrdQStats.cc
@@ -29,7 +29,7 @@
 /******************************************************************************/
 
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/src/XrdApps/XrdWait41.cc b/src/XrdApps/XrdWait41.cc
index d7772cd469d..3b5b48d164e 100644
--- a/src/XrdApps/XrdWait41.cc
+++ b/src/XrdApps/XrdWait41.cc
@@ -39,13 +39,13 @@
 /*                         i n c l u d e   f i l e s                          */
 /******************************************************************************/
   
-#include <ctype.h>
+#include <cctype>
 #include <dirent.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 #include <unistd.h>
 #include <sys/param.h>
diff --git a/src/XrdApps/Xrdadler32.cc b/src/XrdApps/Xrdadler32.cc
index 4134d9bc0db..74b8842b8fa 100644
--- a/src/XrdApps/Xrdadler32.cc
+++ b/src/XrdApps/Xrdadler32.cc
@@ -35,14 +35,14 @@
 
 #define _FILE_OFFSET_BITS 64
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
   #include <sys/xattr.h>
 #endif
diff --git a/src/XrdBwm/XrdBwm.cc b/src/XrdBwm/XrdBwm.cc
index 191714dc92a..801ff67a02c 100644
--- a/src/XrdBwm/XrdBwm.cc
+++ b/src/XrdBwm/XrdBwm.cc
@@ -28,10 +28,10 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cerrno>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdBwm/XrdBwm.hh b/src/XrdBwm/XrdBwm.hh
index bf459b3a2ef..bac520c52e8 100644
--- a/src/XrdBwm/XrdBwm.hh
+++ b/src/XrdBwm/XrdBwm.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <dirent.h>
 #include <sys/types.h>
   
diff --git a/src/XrdBwm/XrdBwmConfig.cc b/src/XrdBwm/XrdBwmConfig.cc
index ec25d36e26e..77d653c40c6 100644
--- a/src/XrdBwm/XrdBwmConfig.cc
+++ b/src/XrdBwm/XrdBwmConfig.cc
@@ -29,12 +29,12 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 
 #include "XrdBwm/XrdBwm.hh"
diff --git a/src/XrdBwm/XrdBwmHandle.cc b/src/XrdBwm/XrdBwmHandle.cc
index c0834c1c863..4fd886154b8 100644
--- a/src/XrdBwm/XrdBwmHandle.cc
+++ b/src/XrdBwm/XrdBwmHandle.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdBwm/XrdBwmHandle.hh"
 #include "XrdBwm/XrdBwmLogger.hh"
diff --git a/src/XrdBwm/XrdBwmHandle.hh b/src/XrdBwm/XrdBwmHandle.hh
index 592f43760a3..9f4bf04de8b 100644
--- a/src/XrdBwm/XrdBwmHandle.hh
+++ b/src/XrdBwm/XrdBwmHandle.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdBwm/XrdBwmPolicy.hh"
 #include "XrdOuc/XrdOucErrInfo.hh"
diff --git a/src/XrdBwm/XrdBwmLogger.cc b/src/XrdBwm/XrdBwmLogger.cc
index ec42519c37d..0064f8b7e67 100644
--- a/src/XrdBwm/XrdBwmLogger.cc
+++ b/src/XrdBwm/XrdBwmLogger.cc
@@ -28,11 +28,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
+#include <cctype>
 #include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdBwm/XrdBwmLogger.hh"
 #include "XrdSys/XrdSysError.hh"
diff --git a/src/XrdBwm/XrdBwmPolicy1.cc b/src/XrdBwm/XrdBwmPolicy1.cc
index 28d9e79ad6a..b5a03c6c95c 100644
--- a/src/XrdBwm/XrdBwmPolicy1.cc
+++ b/src/XrdBwm/XrdBwmPolicy1.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdBwm/XrdBwmPolicy1.hh"
 
diff --git a/src/XrdCks/XrdCksAssist.cc b/src/XrdCks/XrdCksAssist.cc
index f0fc6394dbe..f04ac526e51 100644
--- a/src/XrdCks/XrdCksAssist.cc
+++ b/src/XrdCks/XrdCksAssist.cc
@@ -28,12 +28,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <string>
-#include <string.h>
+#include <cstring>
 #include <strings.h>
-#include <time.h>
+#include <ctime>
 #include <vector>
 #include <sys/types.h>
 
diff --git a/src/XrdCks/XrdCksCalcadler32.hh b/src/XrdCks/XrdCksCalcadler32.hh
index 71e488d3336..31070fed306 100644
--- a/src/XrdCks/XrdCksCalcadler32.hh
+++ b/src/XrdCks/XrdCksCalcadler32.hh
@@ -32,7 +32,7 @@
 
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include "XrdCks/XrdCksCalc.hh"
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/XrdCks/XrdCksCalccrc32.hh b/src/XrdCks/XrdCksCalccrc32.hh
index 4c427231098..729c5f3deb9 100644
--- a/src/XrdCks/XrdCksCalccrc32.hh
+++ b/src/XrdCks/XrdCksCalccrc32.hh
@@ -30,10 +30,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include "XrdCks/XrdCksCalc.hh"
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/XrdCks/XrdCksCalccrc32C.hh b/src/XrdCks/XrdCksCalccrc32C.hh
index 9972dead952..82f70bbecad 100644
--- a/src/XrdCks/XrdCksCalccrc32C.hh
+++ b/src/XrdCks/XrdCksCalccrc32C.hh
@@ -30,10 +30,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include "XrdCks/XrdCksCalc.hh"
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/XrdCks/XrdCksCalcmd5.cc b/src/XrdCks/XrdCksCalcmd5.cc
index b522fc5d9a8..0d6e15adbb2 100644
--- a/src/XrdCks/XrdCksCalcmd5.cc
+++ b/src/XrdCks/XrdCksCalcmd5.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdCks/XrdCksCalcmd5.hh"
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/XrdCks/XrdCksCalcmd5.hh b/src/XrdCks/XrdCksCalcmd5.hh
index 48f192f3750..59e68779230 100644
--- a/src/XrdCks/XrdCksCalcmd5.hh
+++ b/src/XrdCks/XrdCksCalcmd5.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdCks/XrdCksCalc.hh"
   
diff --git a/src/XrdCks/XrdCksCalczcrc32.cc b/src/XrdCks/XrdCksCalczcrc32.cc
index 5724ecc5881..69be4588fc6 100644
--- a/src/XrdCks/XrdCksCalczcrc32.cc
+++ b/src/XrdCks/XrdCksCalczcrc32.cc
@@ -32,7 +32,7 @@
 #include "XrdCks/XrdCksCalc.hh"
 #include "XrdSys/XrdSysError.hh"
 #include "XrdVersion.hh"
-#include <stdint.h>
+#include <cstdint>
 #include <zlib.h>
 
 //------------------------------------------------------------------------------
diff --git a/src/XrdCks/XrdCksConfig.cc b/src/XrdCks/XrdCksConfig.cc
index a1f715e6c9d..243f7187c39 100644
--- a/src/XrdCks/XrdCksConfig.cc
+++ b/src/XrdCks/XrdCksConfig.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
+#include <cerrno>
+#include <cstring>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdCks/XrdCksData.hh b/src/XrdCks/XrdCksData.hh
index b4873acf949..6ba8f27f183 100644
--- a/src/XrdCks/XrdCksData.hh
+++ b/src/XrdCks/XrdCksData.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 class XrdOucEnv;
 
diff --git a/src/XrdCks/XrdCksLoader.cc b/src/XrdCks/XrdCksLoader.cc
index 6899b972d6f..efc1bfb3bb2 100644
--- a/src/XrdCks/XrdCksLoader.cc
+++ b/src/XrdCks/XrdCksLoader.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
+#include <cerrno>
+#include <cstring>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdCks/XrdCksManOss.cc b/src/XrdCks/XrdCksManOss.cc
index d269cd9686e..154d8c4c7db 100644
--- a/src/XrdCks/XrdCksManOss.cc
+++ b/src/XrdCks/XrdCksManOss.cc
@@ -28,11 +28,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <string.h>
-#include <time.h>
-#include <stdio.h>
+#include <cstring>
+#include <ctime>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdCks/XrdCksManager.cc b/src/XrdCks/XrdCksManager.cc
index 9aca5564558..84d82de88b2 100644
--- a/src/XrdCks/XrdCksManager.cc
+++ b/src/XrdCks/XrdCksManager.cc
@@ -28,11 +28,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <string.h>
-#include <time.h>
-#include <stdio.h>
+#include <cstring>
+#include <ctime>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/types.h>
diff --git a/src/XrdCks/XrdCksXAttr.hh b/src/XrdCks/XrdCksXAttr.hh
index e7d6fe96e94..1fd54d1c5b8 100644
--- a/src/XrdCks/XrdCksXAttr.hh
+++ b/src/XrdCks/XrdCksXAttr.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <inttypes.h>
+#include <cinttypes>
 #include <netinet/in.h>
 #include <sys/types.h>
 
diff --git a/src/XrdCl/XrdClBuffer.hh b/src/XrdCl/XrdClBuffer.hh
index fbd035a65ce..5a6d771c432 100644
--- a/src/XrdCl/XrdClBuffer.hh
+++ b/src/XrdCl/XrdClBuffer.hh
@@ -20,7 +20,7 @@
 #define __XRD_CL_BUFFER_HH__
 
 #include <cstdlib>
-#include <stdint.h>
+#include <cstdint>
 #include <new>
 #include <cstring>
 #include <string>
diff --git a/src/XrdCl/XrdClChannel.hh b/src/XrdCl/XrdClChannel.hh
index 26729a0bc84..62dc8c167a9 100644
--- a/src/XrdCl/XrdClChannel.hh
+++ b/src/XrdCl/XrdClChannel.hh
@@ -19,7 +19,7 @@
 #ifndef __XRD_CL_POST_CHANNEL_HH__
 #define __XRD_CL_POST_CHANNEL_HH__
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include <ctime>
 #include <functional>
diff --git a/src/XrdCl/XrdClClassicCopyJob.cc b/src/XrdCl/XrdClClassicCopyJob.cc
index 43be4f2e998..726778ed37f 100644
--- a/src/XrdCl/XrdClClassicCopyJob.cc
+++ b/src/XrdCl/XrdClClassicCopyJob.cc
@@ -52,11 +52,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 #include <unistd.h>
 
 #if __cplusplus < 201103L
-#include <time.h>
+#include <ctime>
 #endif
 
 namespace
diff --git a/src/XrdCl/XrdClConstants.hh b/src/XrdCl/XrdClConstants.hh
index a5d17ccee60..d553168f48e 100644
--- a/src/XrdCl/XrdClConstants.hh
+++ b/src/XrdCl/XrdClConstants.hh
@@ -19,7 +19,7 @@
 #ifndef __XRD_CL_CONSTANTS_HH__
 #define __XRD_CL_CONSTANTS_HH__
 
-#include <stdint.h>
+#include <cstdint>
 #include <unordered_map>
 #include <string>
 #include <algorithm>
diff --git a/src/XrdCl/XrdClCopy.cc b/src/XrdCl/XrdClCopy.cc
index 6d077ff52d5..d081b9c0908 100644
--- a/src/XrdCl/XrdClCopy.cc
+++ b/src/XrdCl/XrdClCopy.cc
@@ -34,7 +34,7 @@
 #include "XrdSys/XrdSysE2T.hh"
 #include "XrdSys/XrdSysPthread.hh"
 
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
 #include <iomanip>
 #include <limits>
diff --git a/src/XrdCl/XrdClCopyProcess.hh b/src/XrdCl/XrdClCopyProcess.hh
index 081a489eb5f..64c6f4f1e04 100644
--- a/src/XrdCl/XrdClCopyProcess.hh
+++ b/src/XrdCl/XrdClCopyProcess.hh
@@ -28,7 +28,7 @@
 #include "XrdCl/XrdClURL.hh"
 #include "XrdCl/XrdClXRootDResponses.hh"
 #include "XrdCl/XrdClPropertyList.hh"
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 namespace XrdCl
diff --git a/src/XrdCl/XrdClDlgEnv.hh b/src/XrdCl/XrdClDlgEnv.hh
index a9491b37f88..9f229c5b09b 100644
--- a/src/XrdCl/XrdClDlgEnv.hh
+++ b/src/XrdCl/XrdClDlgEnv.hh
@@ -8,7 +8,7 @@
 #ifndef SRC_XRDCL_XRDCLDLGENV_HH_
 #define SRC_XRDCL_XRDCLDLGENV_HH_
 
-#include <stdlib.h>
+#include <cstdlib>
 
 
 namespace XrdCl
diff --git a/src/XrdCl/XrdClFile.hh b/src/XrdCl/XrdClFile.hh
index 0c27f81eb6c..28f375ee5e9 100644
--- a/src/XrdCl/XrdClFile.hh
+++ b/src/XrdCl/XrdClFile.hh
@@ -29,7 +29,7 @@
 #include "XrdCl/XrdClXRootDResponses.hh"
 #include "XrdCl/XrdClOptional.hh"
 #include "XrdOuc/XrdOucCompiler.hh"
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <sys/uio.h>
diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
index 80345aa18b0..0ebf9998afc 100644
--- a/src/XrdCl/XrdClFileStateHandler.hh
+++ b/src/XrdCl/XrdClFileStateHandler.hh
@@ -40,7 +40,7 @@
 #include <vector>
 
 #include <sys/uio.h>
-#include <stdint.h>
+#include <cstdint>
 
 namespace
 {
diff --git a/src/XrdCl/XrdClFileSystemUtils.hh b/src/XrdCl/XrdClFileSystemUtils.hh
index e59d60c4cfa..4b7e7c394e5 100644
--- a/src/XrdCl/XrdClFileSystemUtils.hh
+++ b/src/XrdCl/XrdClFileSystemUtils.hh
@@ -28,7 +28,7 @@
 #include "XrdCl/XrdClXRootDResponses.hh"
 
 #include <string>
-#include <stdint.h>
+#include <cstdint>
 #include <memory>
 
 namespace XrdCl
diff --git a/src/XrdCl/XrdClJobManager.hh b/src/XrdCl/XrdClJobManager.hh
index 2a83e8ee152..d56cb6c84b5 100644
--- a/src/XrdCl/XrdClJobManager.hh
+++ b/src/XrdCl/XrdClJobManager.hh
@@ -19,7 +19,7 @@
 #ifndef __XRD_CL_JOB_MANAGER_HH__
 #define __XRD_CL_JOB_MANAGER_HH__
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include <algorithm>
 #include <pthread.h>
diff --git a/src/XrdCl/XrdClLocalFileHandler.cc b/src/XrdCl/XrdClLocalFileHandler.cc
index 1a88c83ab96..0868b0367e1 100644
--- a/src/XrdCl/XrdClLocalFileHandler.cc
+++ b/src/XrdCl/XrdClLocalFileHandler.cc
@@ -34,8 +34,8 @@
 #include <stdexcept>
 
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <arpa/inet.h>
diff --git a/src/XrdCl/XrdClLog.hh b/src/XrdCl/XrdClLog.hh
index 5f40a7d46e9..3b4b50a7760 100644
--- a/src/XrdCl/XrdClLog.hh
+++ b/src/XrdCl/XrdClLog.hh
@@ -25,10 +25,10 @@
 #ifndef __XRD_CL_LOG_HH__
 #define __XRD_CL_LOG_HH__
 
-#include <stdarg.h>
+#include <cstdarg>
 #include <string>
 #include <map>
-#include <stdint.h>
+#include <cstdint>
 #include "XrdSys/XrdSysPthread.hh"
 
 //------------------------------------------------------------------------------
diff --git a/src/XrdCl/XrdClOperationTimeout.hh b/src/XrdCl/XrdClOperationTimeout.hh
index 0ff13208c1b..e658085c673 100644
--- a/src/XrdCl/XrdClOperationTimeout.hh
+++ b/src/XrdCl/XrdClOperationTimeout.hh
@@ -8,8 +8,8 @@
 #ifndef SRC_XRDCL_XRDCLOPERATIONTIMEOUT_HH_
 #define SRC_XRDCL_XRDCLOPERATIONTIMEOUT_HH_
 
-#include <stdint.h>
-#include <time.h>
+#include <cstdint>
+#include <ctime>
 #include <exception>
 
 namespace XrdCl
diff --git a/src/XrdCl/XrdClPoller.hh b/src/XrdCl/XrdClPoller.hh
index 928439f19ee..d8408c4c98c 100644
--- a/src/XrdCl/XrdClPoller.hh
+++ b/src/XrdCl/XrdClPoller.hh
@@ -19,7 +19,7 @@
 #ifndef __XRD_CL_POLLER_HH__
 #define __XRD_CL_POLLER_HH__
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 namespace XrdCl
diff --git a/src/XrdCl/XrdClPostMaster.hh b/src/XrdCl/XrdClPostMaster.hh
index 5e4b3d0dd98..ebb0f91d2d9 100644
--- a/src/XrdCl/XrdClPostMaster.hh
+++ b/src/XrdCl/XrdClPostMaster.hh
@@ -19,7 +19,7 @@
 #ifndef __XRD_CL_POST_MASTER_HH__
 #define __XRD_CL_POST_MASTER_HH__
 
-#include <stdint.h>
+#include <cstdint>
 #include <map>
 #include <vector>
 #include <functional>
diff --git a/src/XrdCl/XrdClPostMasterInterfaces.hh b/src/XrdCl/XrdClPostMasterInterfaces.hh
index e73320d437a..1bb5d6fec43 100644
--- a/src/XrdCl/XrdClPostMasterInterfaces.hh
+++ b/src/XrdCl/XrdClPostMasterInterfaces.hh
@@ -27,7 +27,7 @@
 
 #include "XrdCl/XrdClXRootDResponses.hh"
 
-#include <stdint.h>
+#include <cstdint>
 #include <ctime>
 
 #include "XrdCl/XrdClStatus.hh"
diff --git a/src/XrdCl/XrdClSIDManager.hh b/src/XrdCl/XrdClSIDManager.hh
index 4511e13a1fd..0fcdb11f5ce 100644
--- a/src/XrdCl/XrdClSIDManager.hh
+++ b/src/XrdCl/XrdClSIDManager.hh
@@ -24,7 +24,7 @@
 #include <memory>
 #include <unordered_map>
 #include <string>
-#include <stdint.h>
+#include <cstdint>
 #include "XrdSys/XrdSysPthread.hh"
 #include "XrdCl/XrdClStatus.hh"
 #include "XrdCl/XrdClURL.hh"
diff --git a/src/XrdCl/XrdClSocket.hh b/src/XrdCl/XrdClSocket.hh
index abf22f58b5b..4b509f2e6de 100644
--- a/src/XrdCl/XrdClSocket.hh
+++ b/src/XrdCl/XrdClSocket.hh
@@ -19,7 +19,7 @@
 #ifndef __XRD_CL_SOCKET_HH__
 #define __XRD_CL_SOCKET_HH__
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <sys/socket.h>
 #include <memory>
diff --git a/src/XrdCl/XrdClStatus.hh b/src/XrdCl/XrdClStatus.hh
index 233a377caf7..0d45a6e062e 100644
--- a/src/XrdCl/XrdClStatus.hh
+++ b/src/XrdCl/XrdClStatus.hh
@@ -19,8 +19,8 @@
 #ifndef __XRD_CL_STATUS_HH__
 #define __XRD_CL_STATUS_HH__
 
-#include <stdint.h>
-#include <errno.h>
+#include <cstdint>
+#include <cerrno>
 #include <sstream>
 
 namespace XrdCl
diff --git a/src/XrdCl/XrdClTaskManager.hh b/src/XrdCl/XrdClTaskManager.hh
index d0ad27b941e..f2c870e50ea 100644
--- a/src/XrdCl/XrdClTaskManager.hh
+++ b/src/XrdCl/XrdClTaskManager.hh
@@ -23,7 +23,7 @@
 #include <set>
 #include <list>
 #include <string>
-#include <stdint.h>
+#include <cstdint>
 #include <pthread.h>
 #include "XrdSys/XrdSysPthread.hh"
 
diff --git a/src/XrdCl/XrdClUtils.cc b/src/XrdCl/XrdClUtils.cc
index 41df62186fb..38a02f771a1 100644
--- a/src/XrdCl/XrdClUtils.cc
+++ b/src/XrdCl/XrdClUtils.cc
@@ -43,7 +43,7 @@
 #include <dirent.h>
 
 #if __cplusplus < 201103L
-#include <time.h>
+#include <ctime>
 #endif
 
 namespace
diff --git a/src/XrdCl/XrdClXCpCtx.hh b/src/XrdCl/XrdClXCpCtx.hh
index cbe04b2385f..67c9ced15fa 100644
--- a/src/XrdCl/XrdClXCpCtx.hh
+++ b/src/XrdCl/XrdClXCpCtx.hh
@@ -29,7 +29,7 @@
 #include "XrdCl/XrdClXRootDResponses.hh"
 #include "XrdSys/XrdSysPthread.hh"
 
-#include <stdint.h>
+#include <cstdint>
 #include <iostream>
 
 namespace XrdCl
diff --git a/src/XrdCms/XrdCmsAdmin.cc b/src/XrdCms/XrdCmsAdmin.cc
index 0e510a2bfd8..818e475f713 100644
--- a/src/XrdCms/XrdCmsAdmin.cc
+++ b/src/XrdCms/XrdCmsAdmin.cc
@@ -28,11 +28,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <limits.h>
 #include <string>
 #include <unistd.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <netinet/in.h>
 #include <sys/types.h>
 
diff --git a/src/XrdCms/XrdCmsAdmin.hh b/src/XrdCms/XrdCmsAdmin.hh
index 55dcaaeae11..8cad098b875 100644
--- a/src/XrdCms/XrdCmsAdmin.hh
+++ b/src/XrdCms/XrdCmsAdmin.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/uio.h>
 
 #include "XrdCms/XrdCmsProtocol.hh"
diff --git a/src/XrdCms/XrdCmsBaseFS.cc b/src/XrdCms/XrdCmsBaseFS.cc
index 4727e0006b9..bf0232667d3 100644
--- a/src/XrdCms/XrdCmsBaseFS.cc
+++ b/src/XrdCms/XrdCmsBaseFS.cc
@@ -28,11 +28,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <time.h>
+#include <cerrno>
+#include <ctime>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <stdio.h>
+#include <cstdio>
   
 #include "XProtocol/YProtocol.hh"
 #include "XProtocol/XPtypes.hh"
diff --git a/src/XrdCms/XrdCmsBaseFS.hh b/src/XrdCms/XrdCmsBaseFS.hh
index 240f2d8a8df..a198dda8658 100644
--- a/src/XrdCms/XrdCmsBaseFS.hh
+++ b/src/XrdCms/XrdCmsBaseFS.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdCms/XrdCmsPList.hh"
 #include "XrdCms/XrdCmsRRData.hh"
diff --git a/src/XrdCms/XrdCmsBlackList.cc b/src/XrdCms/XrdCmsBlackList.cc
index db10c2d32b8..ed5eda173c5 100644
--- a/src/XrdCms/XrdCmsBlackList.cc
+++ b/src/XrdCms/XrdCmsBlackList.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdio.h>
+#include <cstdio>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/XrdCms/XrdCmsCache.cc b/src/XrdCms/XrdCmsCache.cc
index db1f186dc4a..b1c88d48b31 100644
--- a/src/XrdCms/XrdCmsCache.cc
+++ b/src/XrdCms/XrdCmsCache.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdio.h>
+#include <cstdio>
 #include <sys/types.h>
 
 #include "XrdCms/XrdCmsCache.hh"
diff --git a/src/XrdCms/XrdCmsCache.hh b/src/XrdCms/XrdCmsCache.hh
index 6f67356f529..b365113ed01 100644
--- a/src/XrdCms/XrdCmsCache.hh
+++ b/src/XrdCms/XrdCmsCache.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
   
 #include "Xrd/XrdJob.hh"
 #include "Xrd/XrdScheduler.hh"
diff --git a/src/XrdCms/XrdCmsClientConfig.cc b/src/XrdCms/XrdCmsClientConfig.cc
index ee9a7149202..906740bdb39 100644
--- a/src/XrdCms/XrdCmsClientConfig.cc
+++ b/src/XrdCms/XrdCmsClientConfig.cc
@@ -30,7 +30,7 @@
 
 #include <unistd.h>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdCms/XrdCmsClientMan.cc b/src/XrdCms/XrdCmsClientMan.cc
index b8ae8d2fd70..9f529419518 100644
--- a/src/XrdCms/XrdCmsClientMan.cc
+++ b/src/XrdCms/XrdCmsClientMan.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <time.h>
+#include <ctime>
 
 #include "XrdCms/XrdCmsClientMan.hh"
 #include "XrdCms/XrdCmsClientMsg.hh"
diff --git a/src/XrdCms/XrdCmsClientMan.hh b/src/XrdCms/XrdCmsClientMan.hh
index 18340ed1cb9..4668335cc61 100644
--- a/src/XrdCms/XrdCmsClientMan.hh
+++ b/src/XrdCms/XrdCmsClientMan.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <sys/uio.h>
 
 #include "XProtocol/YProtocol.hh"
diff --git a/src/XrdCms/XrdCmsClientMsg.cc b/src/XrdCms/XrdCmsClientMsg.cc
index c602856a143..abfd2d7aa81 100644
--- a/src/XrdCms/XrdCmsClientMsg.cc
+++ b/src/XrdCms/XrdCmsClientMsg.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
   
 #include "XProtocol/YProtocol.hh"
 #include "XrdCms/XrdCmsClientMsg.hh"
diff --git a/src/XrdCms/XrdCmsClustID.cc b/src/XrdCms/XrdCmsClustID.cc
index 2f804f4fb2f..973593975ec 100644
--- a/src/XrdCms/XrdCmsClustID.cc
+++ b/src/XrdCms/XrdCmsClustID.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdCms/XrdCmsClustID.hh"
 #include "XrdCms/XrdCmsNode.hh"
diff --git a/src/XrdCms/XrdCmsClustID.hh b/src/XrdCms/XrdCmsClustID.hh
index 16a637555ec..cadd685d4d5 100644
--- a/src/XrdCms/XrdCmsClustID.hh
+++ b/src/XrdCms/XrdCmsClustID.hh
@@ -29,8 +29,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 class XrdLink;
 class XrdCmsNode;
diff --git a/src/XrdCms/XrdCmsCluster.cc b/src/XrdCms/XrdCmsCluster.cc
index 25b6c224e3e..7649ebdde6e 100644
--- a/src/XrdCms/XrdCmsCluster.cc
+++ b/src/XrdCms/XrdCmsCluster.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/types.h>
diff --git a/src/XrdCms/XrdCmsCluster.hh b/src/XrdCms/XrdCmsCluster.hh
index bf07b8c2544..70765e04e55 100644
--- a/src/XrdCms/XrdCmsCluster.hh
+++ b/src/XrdCms/XrdCmsCluster.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
 #include <netinet/in.h>
   
diff --git a/src/XrdCms/XrdCmsConfig.cc b/src/XrdCms/XrdCmsConfig.cc
index e0ce3d695b4..9512df778d6 100644
--- a/src/XrdCms/XrdCmsConfig.cc
+++ b/src/XrdCms/XrdCmsConfig.cc
@@ -34,10 +34,10 @@
   
 #include <string>
 #include <unistd.h>
-#include <ctype.h>
+#include <cctype>
 #include <fcntl.h>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
diff --git a/src/XrdCms/XrdCmsConfig.hh b/src/XrdCms/XrdCmsConfig.hh
index b5c5ece2ae2..8f2977029e7 100644
--- a/src/XrdCms/XrdCmsConfig.hh
+++ b/src/XrdCms/XrdCmsConfig.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "Xrd/XrdJob.hh"
 #include "XrdCms/XrdCmsPList.hh"
diff --git a/src/XrdCms/XrdCmsFinder.cc b/src/XrdCms/XrdCmsFinder.cc
index 3e822a5c152..6d3d85cd30b 100644
--- a/src/XrdCms/XrdCmsFinder.cc
+++ b/src/XrdCms/XrdCmsFinder.cc
@@ -28,13 +28,13 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cerrno>
 #include <fcntl.h>
 #include <limits.h>
 #include <strings.h>
-#include <time.h>
+#include <ctime>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/times.h>
@@ -42,7 +42,7 @@
 #include <sys/uio.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include "XrdVersion.hh"
   
diff --git a/src/XrdCms/XrdCmsJob.cc b/src/XrdCms/XrdCmsJob.cc
index 999ade7f592..964ca3b5a28 100644
--- a/src/XrdCms/XrdCmsJob.cc
+++ b/src/XrdCms/XrdCmsJob.cc
@@ -29,9 +29,9 @@
 /******************************************************************************/
  
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
 
 #include "Xrd/XrdLink.hh"
 #include "Xrd/XrdScheduler.hh"
diff --git a/src/XrdCms/XrdCmsKey.cc b/src/XrdCms/XrdCmsKey.cc
index 554f986d5a5..8e9024eaca3 100644
--- a/src/XrdCms/XrdCmsKey.cc
+++ b/src/XrdCms/XrdCmsKey.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 #include "XrdCms/XrdCmsKey.hh"
 #include "XrdCms/XrdCmsTrace.hh"
diff --git a/src/XrdCms/XrdCmsKey.hh b/src/XrdCms/XrdCmsKey.hh
index c72af0643e7..a5e3f8abfa6 100644
--- a/src/XrdCms/XrdCmsKey.hh
+++ b/src/XrdCms/XrdCmsKey.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdCms/XrdCmsTypes.hh"
 
diff --git a/src/XrdCms/XrdCmsManList.cc b/src/XrdCms/XrdCmsManList.cc
index c580c08b9c0..077050e6c00 100644
--- a/src/XrdCms/XrdCmsManList.cc
+++ b/src/XrdCms/XrdCmsManList.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
 #include <unistd.h>
 
 #include "XrdCms/XrdCmsManList.hh"
diff --git a/src/XrdCms/XrdCmsManTree.cc b/src/XrdCms/XrdCmsManTree.cc
index 0c7370c4d58..78fe0826abc 100644
--- a/src/XrdCms/XrdCmsManTree.cc
+++ b/src/XrdCms/XrdCmsManTree.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XProtocol/YProtocol.hh"
 
diff --git a/src/XrdCms/XrdCmsManager.cc b/src/XrdCms/XrdCmsManager.cc
index 43a78dd7a9a..472826acfac 100644
--- a/src/XrdCms/XrdCmsManager.cc
+++ b/src/XrdCms/XrdCmsManager.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/types.h>
diff --git a/src/XrdCms/XrdCmsManager.hh b/src/XrdCms/XrdCmsManager.hh
index 98d5147b97c..7ac8fc69812 100644
--- a/src/XrdCms/XrdCmsManager.hh
+++ b/src/XrdCms/XrdCmsManager.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
   
 #include "XProtocol/YProtocol.hh"
diff --git a/src/XrdCms/XrdCmsMeter.cc b/src/XrdCms/XrdCmsMeter.cc
index 9152030b469..6d4adef9e32 100644
--- a/src/XrdCms/XrdCmsMeter.cc
+++ b/src/XrdCms/XrdCmsMeter.cc
@@ -28,11 +28,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <signal.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdCms/XrdCmsNash.cc b/src/XrdCms/XrdCmsNash.cc
index 5d5f2978649..4a7599366e2 100644
--- a/src/XrdCms/XrdCmsNash.cc
+++ b/src/XrdCms/XrdCmsNash.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdCms/XrdCmsNash.hh"
 
diff --git a/src/XrdCms/XrdCmsNode.cc b/src/XrdCms/XrdCmsNode.cc
index 329046ee599..b453523b805 100644
--- a/src/XrdCms/XrdCmsNode.cc
+++ b/src/XrdCms/XrdCmsNode.cc
@@ -29,8 +29,8 @@
 /******************************************************************************/
   
 #include <limits.h>
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdCms/XrdCmsNode.hh b/src/XrdCms/XrdCmsNode.hh
index b757b1bae19..8facd107e9d 100644
--- a/src/XrdCms/XrdCmsNode.hh
+++ b/src/XrdCms/XrdCmsNode.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/uio.h>
diff --git a/src/XrdCms/XrdCmsPList.hh b/src/XrdCms/XrdCmsPList.hh
index a56d7e098ca..5d90c983ac9 100644
--- a/src/XrdCms/XrdCmsPList.hh
+++ b/src/XrdCms/XrdCmsPList.hh
@@ -30,9 +30,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <strings.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdCms/XrdCmsTypes.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdCms/XrdCmsParser.cc b/src/XrdCms/XrdCmsParser.cc
index 21f670ea568..d368adfc71e 100644
--- a/src/XrdCms/XrdCmsParser.cc
+++ b/src/XrdCms/XrdCmsParser.cc
@@ -28,13 +28,13 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdio.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cerrno>
+#include <cinttypes>
+#include <cstdarg>
 #include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <netinet/in.h>
 #include <sys/types.h>
 
diff --git a/src/XrdCms/XrdCmsPrepArgs.cc b/src/XrdCms/XrdCmsPrepArgs.cc
index dd8f155b77b..9a6d191cde1 100644
--- a/src/XrdCms/XrdCmsPrepArgs.cc
+++ b/src/XrdCms/XrdCmsPrepArgs.cc
@@ -29,7 +29,7 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 
 #include "XrdCms/XrdCmsConfig.hh"
diff --git a/src/XrdCms/XrdCmsPrepare.cc b/src/XrdCms/XrdCmsPrepare.cc
index 69b4ba0740e..91adcee4c23 100644
--- a/src/XrdCms/XrdCmsPrepare.cc
+++ b/src/XrdCms/XrdCmsPrepare.cc
@@ -29,7 +29,7 @@
 /******************************************************************************/
   
 #include <fcntl.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdCms/XrdCmsProtocol.cc b/src/XrdCms/XrdCmsProtocol.cc
index ef77254e89c..226c3eb317e 100644
--- a/src/XrdCms/XrdCmsProtocol.cc
+++ b/src/XrdCms/XrdCmsProtocol.cc
@@ -29,13 +29,13 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <signal.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <netinet/in.h>
 #include <sys/param.h>
 
diff --git a/src/XrdCms/XrdCmsRRData.hh b/src/XrdCms/XrdCmsRRData.hh
index 33f8e9a6dbb..7a299f600a1 100644
--- a/src/XrdCms/XrdCmsRRData.hh
+++ b/src/XrdCms/XrdCmsRRData.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XProtocol/YProtocol.hh"
 
diff --git a/src/XrdCms/XrdCmsRRQ.cc b/src/XrdCms/XrdCmsRRQ.cc
index 3c677348c86..3de1d17d02a 100644
--- a/src/XrdCms/XrdCmsRRQ.cc
+++ b/src/XrdCms/XrdCmsRRQ.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include "XrdCms/XrdCmsCluster.hh"
 #include "XrdCms/XrdCmsNode.hh"
@@ -40,7 +40,7 @@
 #include "XrdCms/XrdCmsTrace.hh"
 #include "XrdSys/XrdSysError.hh"
 #include "XrdSys/XrdSysTimer.hh"
-#include <stdio.h>
+#include <cstdio>
 
 using namespace XrdCms;
 
diff --git a/src/XrdCms/XrdCmsRTable.hh b/src/XrdCms/XrdCmsRTable.hh
index da6feb31165..45adb22cf26 100644
--- a/src/XrdCms/XrdCmsRTable.hh
+++ b/src/XrdCms/XrdCmsRTable.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdCms/XrdCmsNode.hh"
 #include "XrdCms/XrdCmsTypes.hh"
diff --git a/src/XrdCms/XrdCmsResp.cc b/src/XrdCms/XrdCmsResp.cc
index b00f4189f3f..07704d9317d 100644
--- a/src/XrdCms/XrdCmsResp.cc
+++ b/src/XrdCms/XrdCmsResp.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
   
 #include "XrdCms/XrdCmsClientMsg.hh"
 #include "XrdCms/XrdCmsParser.hh"
diff --git a/src/XrdCms/XrdCmsRole.hh b/src/XrdCms/XrdCmsRole.hh
index a6f5638ec7f..32964b47fb2 100644
--- a/src/XrdCms/XrdCmsRole.hh
+++ b/src/XrdCms/XrdCmsRole.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
   
 // This class centralizes the naming of various roles servers can have.
 
diff --git a/src/XrdCms/XrdCmsSecurity.cc b/src/XrdCms/XrdCmsSecurity.cc
index f37bdffe119..29f78185825 100644
--- a/src/XrdCms/XrdCmsSecurity.cc
+++ b/src/XrdCms/XrdCmsSecurity.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <string>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdCms/XrdCmsTalk.cc b/src/XrdCms/XrdCmsTalk.cc
index 0233e30a41a..c67750f8937 100644
--- a/src/XrdCms/XrdCmsTalk.cc
+++ b/src/XrdCms/XrdCmsTalk.cc
@@ -30,7 +30,7 @@
 
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include "XProtocol/YProtocol.hh"
 
diff --git a/src/XrdCms/XrdCmsUtils.cc b/src/XrdCms/XrdCmsUtils.cc
index 2545b655287..49c44884964 100644
--- a/src/XrdCms/XrdCmsUtils.cc
+++ b/src/XrdCms/XrdCmsUtils.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
 #include <unistd.h>
 
 #include "XrdCms/XrdCmsUtils.hh"
diff --git a/src/XrdCrypto/XrdCryptoAux.hh b/src/XrdCrypto/XrdCryptoAux.hh
index e80dc750708..b9555ad5749 100644
--- a/src/XrdCrypto/XrdCryptoAux.hh
+++ b/src/XrdCrypto/XrdCryptoAux.hh
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #ifndef WIN32
 #include "XrdSys/XrdSysHeaders.hh"
 #endif
diff --git a/src/XrdCrypto/XrdCryptoBasic.cc b/src/XrdCrypto/XrdCryptoBasic.cc
index dad428ab01e..2e4f2e5fdbe 100644
--- a/src/XrdCrypto/XrdCryptoBasic.cc
+++ b/src/XrdCrypto/XrdCryptoBasic.cc
@@ -33,8 +33,8 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdSut/XrdSutAux.hh"
 #include "XrdCrypto/XrdCryptoAux.hh"
diff --git a/src/XrdCrypto/XrdCryptoCipher.cc b/src/XrdCrypto/XrdCryptoCipher.cc
index 52475f43f71..db0a9bedfea 100644
--- a/src/XrdCrypto/XrdCryptoCipher.cc
+++ b/src/XrdCrypto/XrdCryptoCipher.cc
@@ -34,7 +34,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdCrypto/XrdCryptoAux.hh"
 #include "XrdCrypto/XrdCryptoCipher.hh"
diff --git a/src/XrdCrypto/XrdCryptoFactory.cc b/src/XrdCrypto/XrdCryptoFactory.cc
index 5c11e70a096..8e2a4f8c0c1 100644
--- a/src/XrdCrypto/XrdCryptoFactory.cc
+++ b/src/XrdCrypto/XrdCryptoFactory.cc
@@ -33,7 +33,7 @@
 /* (OpenSSL, Botan, ...)                                                      */
 /*                                                                            */
 /* ************************************************************************** */
-#include <string.h>
+#include <cstring>
 #include <dlfcn.h>
 
 #include "XrdCrypto/XrdCryptoAux.hh"
diff --git a/src/XrdCrypto/XrdCryptoLite.cc b/src/XrdCrypto/XrdCryptoLite.cc
index 6fb000c94b4..eed2f7c5913 100644
--- a/src/XrdCrypto/XrdCryptoLite.cc
+++ b/src/XrdCrypto/XrdCryptoLite.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 #include "XrdCrypto/XrdCryptoLite.hh"
 
diff --git a/src/XrdCrypto/XrdCryptoLite_bf32.cc b/src/XrdCrypto/XrdCryptoLite_bf32.cc
index 40b92d7abe8..8a608b0c827 100644
--- a/src/XrdCrypto/XrdCryptoLite_bf32.cc
+++ b/src/XrdCrypto/XrdCryptoLite_bf32.cc
@@ -33,12 +33,12 @@
 
 #ifdef HAVE_SSL
 
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <inttypes.h>
+#include <cinttypes>
 
 #include <openssl/blowfish.h>
 
diff --git a/src/XrdCrypto/XrdCryptoMsgDigest.cc b/src/XrdCrypto/XrdCryptoMsgDigest.cc
index ae7fce0043c..5f50196d4f1 100644
--- a/src/XrdCrypto/XrdCryptoMsgDigest.cc
+++ b/src/XrdCrypto/XrdCryptoMsgDigest.cc
@@ -34,7 +34,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdCrypto/XrdCryptoAux.hh"
 #include "XrdCrypto/XrdCryptoMsgDigest.hh"
diff --git a/src/XrdCrypto/XrdCryptoRSA.cc b/src/XrdCrypto/XrdCryptoRSA.cc
index c61883dfcf7..1ea712f89be 100644
--- a/src/XrdCrypto/XrdCryptoRSA.cc
+++ b/src/XrdCrypto/XrdCryptoRSA.cc
@@ -34,7 +34,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdCrypto/XrdCryptoRSA.hh"
 
diff --git a/src/XrdCrypto/XrdCryptoX509.cc b/src/XrdCrypto/XrdCryptoX509.cc
index 934a1033b6c..8ec8fd84733 100644
--- a/src/XrdCrypto/XrdCryptoX509.cc
+++ b/src/XrdCrypto/XrdCryptoX509.cc
@@ -36,7 +36,7 @@
 /* (OpenSSL, Botan, ...)                                                      */
 /*                                                                            */
 /* ************************************************************************** */
-#include <time.h>
+#include <ctime>
 
 #include "XrdCrypto/XrdCryptoX509.hh"
 #include "XrdCrypto/XrdCryptoTrace.hh"
diff --git a/src/XrdCrypto/XrdCryptoX509Chain.cc b/src/XrdCrypto/XrdCryptoX509Chain.cc
index 85e5f0c1505..118dee790e6 100644
--- a/src/XrdCrypto/XrdCryptoX509Chain.cc
+++ b/src/XrdCrypto/XrdCryptoX509Chain.cc
@@ -25,8 +25,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /*                                                                            */
 /******************************************************************************/
-#include <time.h>
-#include <string.h>
+#include <ctime>
+#include <cstring>
 
 #include "XrdCrypto/XrdCryptoX509Chain.hh"
 #include "XrdCrypto/XrdCryptoTrace.hh"
diff --git a/src/XrdCrypto/XrdCryptoX509Crl.cc b/src/XrdCrypto/XrdCryptoX509Crl.cc
index 189fdd2b98c..113ccea09d0 100644
--- a/src/XrdCrypto/XrdCryptoX509Crl.cc
+++ b/src/XrdCrypto/XrdCryptoX509Crl.cc
@@ -33,7 +33,7 @@
 /* (OpenSSL, Botan, ...)                                                      */
 /*                                                                            */
 /* ************************************************************************** */
-#include <time.h>
+#include <ctime>
 #include "XrdCrypto/XrdCryptoX509Crl.hh"
 
 //_____________________________________________________________________________
diff --git a/src/XrdCrypto/XrdCryptogsiX509Chain.cc b/src/XrdCrypto/XrdCryptogsiX509Chain.cc
index 8363ab778a3..be23a8d178f 100644
--- a/src/XrdCrypto/XrdCryptogsiX509Chain.cc
+++ b/src/XrdCrypto/XrdCryptogsiX509Chain.cc
@@ -26,8 +26,8 @@
 /*                                                                            */
 /******************************************************************************/
 
-#include <string.h>
-#include <time.h>
+#include <cstring>
+#include <ctime>
 
 #include "XrdCrypto/XrdCryptoFactory.hh"
 #include "XrdCrypto/XrdCryptogsiX509Chain.hh"
diff --git a/src/XrdCrypto/XrdCryptosslAux.cc b/src/XrdCrypto/XrdCryptosslAux.cc
index 0cc545e3f73..240141a7070 100644
--- a/src/XrdCrypto/XrdCryptosslAux.cc
+++ b/src/XrdCrypto/XrdCryptosslAux.cc
@@ -31,9 +31,9 @@
 /* OpenSSL utility functions                                                  */
 /*                                                                            */
 /* ************************************************************************** */
-#include <time.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <ctime>
+#include <cerrno>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/src/XrdCrypto/XrdCryptosslCipher.cc b/src/XrdCrypto/XrdCryptosslCipher.cc
index 8c790360654..0ce116d83b6 100644
--- a/src/XrdCrypto/XrdCryptosslCipher.cc
+++ b/src/XrdCrypto/XrdCryptosslCipher.cc
@@ -31,7 +31,7 @@
 /* OpenSSL implementation of XrdCryptoCipher                                  */
 /*                                                                            */
 /* ************************************************************************** */
-#include <string.h>
+#include <cstring>
 
 #include "XrdSut/XrdSutRndm.hh"
 #include "XrdCrypto/XrdCryptosslTrace.hh"
diff --git a/src/XrdCrypto/XrdCryptosslRSA.cc b/src/XrdCrypto/XrdCryptosslRSA.cc
index 53119a38444..baf441a84cd 100644
--- a/src/XrdCrypto/XrdCryptosslRSA.cc
+++ b/src/XrdCrypto/XrdCryptosslRSA.cc
@@ -37,7 +37,7 @@
 #include "XrdCrypto/XrdCryptosslTrace.hh"
 #include "XrdCrypto/XrdCryptosslRSA.hh"
 
-#include <string.h>
+#include <cstring>
 
 #include <openssl/bio.h>
 #include <openssl/err.h>
diff --git a/src/XrdCrypto/XrdCryptosslX509.cc b/src/XrdCrypto/XrdCryptosslX509.cc
index 92c1ea5f771..19a6e57ef39 100644
--- a/src/XrdCrypto/XrdCryptosslX509.cc
+++ b/src/XrdCrypto/XrdCryptosslX509.cc
@@ -34,7 +34,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdCrypto/XrdCryptosslRSA.hh"
 #include "XrdCrypto/XrdCryptosslX509.hh"
diff --git a/src/XrdCrypto/XrdCryptosslX509Crl.cc b/src/XrdCrypto/XrdCryptosslX509Crl.cc
index fb3995a8c7b..653aa38902c 100644
--- a/src/XrdCrypto/XrdCryptosslX509Crl.cc
+++ b/src/XrdCrypto/XrdCryptosslX509Crl.cc
@@ -34,8 +34,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
-#include <time.h>
+#include <cerrno>
+#include <ctime>
 
 #include "XrdCrypto/XrdCryptosslRSA.hh"
 #include "XrdCrypto/XrdCryptosslX509Crl.hh"
diff --git a/src/XrdCrypto/XrdCryptosslX509Req.cc b/src/XrdCrypto/XrdCryptosslX509Req.cc
index 28621ab2696..9ef54f1390f 100644
--- a/src/XrdCrypto/XrdCryptosslX509Req.cc
+++ b/src/XrdCrypto/XrdCryptosslX509Req.cc
@@ -34,7 +34,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdCrypto/XrdCryptosslRSA.hh"
 #include "XrdCrypto/XrdCryptosslX509Req.hh"
diff --git a/src/XrdCrypto/XrdCryptosslgsiAux.cc b/src/XrdCrypto/XrdCryptosslgsiAux.cc
index 183a514a684..a1d5b8da079 100644
--- a/src/XrdCrypto/XrdCryptosslgsiAux.cc
+++ b/src/XrdCrypto/XrdCryptosslgsiAux.cc
@@ -31,7 +31,7 @@
 /* GSI utility functions                                                      */
 /*                                                                            */
 /* ************************************************************************** */
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/src/XrdCrypto/XrdCryptotest.cc b/src/XrdCrypto/XrdCryptotest.cc
index 4c1d862d0ad..7c8f43ecfe3 100644
--- a/src/XrdCrypto/XrdCryptotest.cc
+++ b/src/XrdCrypto/XrdCryptotest.cc
@@ -30,9 +30,9 @@
 //  Test program for XrdCrypto
 //
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdOuc/XrdOucString.hh"
 
diff --git a/src/XrdDig/XrdDigAuth.cc b/src/XrdDig/XrdDigAuth.cc
index cb8a05c3e89..6460ffe3160 100644
--- a/src/XrdDig/XrdDigAuth.cc
+++ b/src/XrdDig/XrdDigAuth.cc
@@ -29,10 +29,10 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
+#include <cctype>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <strings.h>
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/src/XrdDig/XrdDigConfig.cc b/src/XrdDig/XrdDigConfig.cc
index 21090c9c21d..5cb7bcd8012 100644
--- a/src/XrdDig/XrdDigConfig.cc
+++ b/src/XrdDig/XrdDigConfig.cc
@@ -28,12 +28,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <ctype.h>
+#include <cctype>
 #include <dirent.h>
 #include <fcntl.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/src/XrdDig/XrdDigFS.cc b/src/XrdDig/XrdDigFS.cc
index 6e91fa96cca..44735eeb0b2 100644
--- a/src/XrdDig/XrdDigFS.cc
+++ b/src/XrdDig/XrdDigFS.cc
@@ -32,9 +32,9 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <memory.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/src/XrdDig/XrdDigFS.hh b/src/XrdDig/XrdDigFS.hh
index a795d0c7e05..e423f5abdbc 100644
--- a/src/XrdDig/XrdDigFS.hh
+++ b/src/XrdDig/XrdDigFS.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <sys/types.h>
-#include <string.h>
+#include <cstring>
 #include <dirent.h>
   
 #include "XrdSfs/XrdSfsInterface.hh"
diff --git a/src/XrdEc/XrdEcRedundancyProvider.cc b/src/XrdEc/XrdEcRedundancyProvider.cc
index 714c82a9b2f..47f48a431c3 100644
--- a/src/XrdEc/XrdEcRedundancyProvider.cc
+++ b/src/XrdEc/XrdEcRedundancyProvider.cc
@@ -16,7 +16,7 @@
 #include "XrdEc/XrdEcRedundancyProvider.hh"
 
 #include "isa-l/isa-l.h"
-#include <string.h>
+#include <cstring>
 #include <sstream>
 #include <algorithm>
 
diff --git a/src/XrdFfs/XrdFfsDent.cc b/src/XrdFfs/XrdFfsDent.cc
index b63712d4ea8..060bd016f12 100644
--- a/src/XrdFfs/XrdFfsDent.cc
+++ b/src/XrdFfs/XrdFfsDent.cc
@@ -266,7 +266,7 @@ void XrdFfsDent_cache_destroy()
 }
 
 /*
-#include <stdio.h>
+#include <cstdio>
 
 main() 
 {
diff --git a/src/XrdFfs/XrdFfsDent.hh b/src/XrdFfs/XrdFfsDent.hh
index 81359a36efa..bc4c0959217 100644
--- a/src/XrdFfs/XrdFfsDent.hh
+++ b/src/XrdFfs/XrdFfsDent.hh
@@ -27,9 +27,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cstring>
+#include <cstdlib>
+#include <ctime>
 #include <pthread.h>
 
 #ifdef __cplusplus
diff --git a/src/XrdFfs/XrdFfsFsinfo.cc b/src/XrdFfs/XrdFfsFsinfo.cc
index 5a8c4966e1a..7e195d1657e 100644
--- a/src/XrdFfs/XrdFfsFsinfo.cc
+++ b/src/XrdFfs/XrdFfsFsinfo.cc
@@ -27,10 +27,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <ctime>
 #include <pthread.h>
 
 #ifndef _GNU_SOURCE
diff --git a/src/XrdFfs/XrdFfsMisc.cc b/src/XrdFfs/XrdFfsMisc.cc
index 0fe33596624..f4ee7bdbba4 100644
--- a/src/XrdFfs/XrdFfsMisc.cc
+++ b/src/XrdFfs/XrdFfsMisc.cc
@@ -28,7 +28,7 @@
 /******************************************************************************/
 
 #define _FILE_OFFSET_BITS 64
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 //#include <sys/xattr.h>
 #include <iostream>
@@ -37,9 +37,9 @@
 //#include <netdb.h>
 #include <pwd.h>
 #include <grp.h>
-#include <time.h>
+#include <ctime>
 #include <pthread.h>
-#include <stdio.h>
+#include <cstdio>
 #include <syslog.h>
 
 #include "XrdNet/XrdNetAddr.hh"
diff --git a/src/XrdFfs/XrdFfsPosix.cc b/src/XrdFfs/XrdFfsPosix.cc
index c65f23c8ba1..b7cd20185c4 100644
--- a/src/XrdFfs/XrdFfsPosix.cc
+++ b/src/XrdFfs/XrdFfsPosix.cc
@@ -28,9 +28,9 @@
 /******************************************************************************/
 
 #define _FILE_OFFSET_BITS 64
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <sys/types.h>
 
 #if !defined(__solaris__) && !defined(__FreeBSD__)
@@ -44,7 +44,7 @@
 #include <iostream>
 #include <libgen.h>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <syslog.h>
 #include "XrdFfs/XrdFfsPosix.hh"
 #include "XrdPosix/XrdPosixXrootd.hh"
diff --git a/src/XrdFfs/XrdFfsPosix.hh b/src/XrdFfs/XrdFfsPosix.hh
index ce8481c54da..2bce1835530 100644
--- a/src/XrdFfs/XrdFfsPosix.hh
+++ b/src/XrdFfs/XrdFfsPosix.hh
@@ -28,7 +28,7 @@
 /******************************************************************************/
 
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdFfs/XrdFfsQueue.hh b/src/XrdFfs/XrdFfsQueue.hh
index c9f52c899d9..d1f36290c84 100644
--- a/src/XrdFfs/XrdFfsQueue.hh
+++ b/src/XrdFfs/XrdFfsQueue.hh
@@ -31,7 +31,7 @@
   extern "C" {
 #endif
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <pthread.h>
 
 struct XrdFfsQueueTasks {
diff --git a/src/XrdFfs/XrdFfsWcache.cc b/src/XrdFfs/XrdFfsWcache.cc
index c71e46d8a99..c609a718021 100644
--- a/src/XrdFfs/XrdFfsWcache.cc
+++ b/src/XrdFfs/XrdFfsWcache.cc
@@ -45,12 +45,12 @@
 #endif
 #endif
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/resource.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 
 #include <pthread.h>
 
diff --git a/src/XrdFfs/XrdFfsXrootdfs.cc b/src/XrdFfs/XrdFfsXrootdfs.cc
index 21e0ccb98fd..1c684fdf770 100644
--- a/src/XrdFfs/XrdFfsXrootdfs.cc
+++ b/src/XrdFfs/XrdFfsXrootdfs.cc
@@ -29,8 +29,8 @@
 
 #define FUSE_USE_VERSION 26
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
 #include <stddef.h>
 
@@ -44,11 +44,11 @@
 #ifdef HAVE_FUSE
 #include <fuse.h>
 #include <fuse/fuse_opt.h>
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
 #include <fcntl.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <sys/time.h>
 #include <pthread.h>
 #include <pwd.h>
diff --git a/src/XrdFrc/XrdFrcCID.cc b/src/XrdFrc/XrdFrcCID.cc
index 2db134b2374..f3a261bcbed 100644
--- a/src/XrdFrc/XrdFrcCID.cc
+++ b/src/XrdFrc/XrdFrcCID.cc
@@ -28,12 +28,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <fcntl.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdFrc/XrdFrcCID.hh b/src/XrdFrc/XrdFrcCID.hh
index 814587b517d..e7cb9cfea39 100644
--- a/src/XrdFrc/XrdFrcCID.hh
+++ b/src/XrdFrc/XrdFrcCID.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdSys/XrdSysPthread.hh"
 
diff --git a/src/XrdFrc/XrdFrcReqAgent.cc b/src/XrdFrc/XrdFrcReqAgent.cc
index 952de9174e0..7434fc0a2b7 100644
--- a/src/XrdFrc/XrdFrcReqAgent.cc
+++ b/src/XrdFrc/XrdFrcReqAgent.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/XrdFrc/XrdFrcReqFile.cc b/src/XrdFrc/XrdFrcReqFile.cc
index 9a872557687..791b5e80b36 100644
--- a/src/XrdFrc/XrdFrcReqFile.cc
+++ b/src/XrdFrc/XrdFrcReqFile.cc
@@ -28,12 +28,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <fcntl.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdFrc/XrdFrcUtils.cc b/src/XrdFrc/XrdFrcUtils.cc
index b0d127b8e28..d6523c5c37f 100644
--- a/src/XrdFrc/XrdFrcUtils.cc
+++ b/src/XrdFrc/XrdFrcUtils.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <unistd.h>
 #include <utime.h>
diff --git a/src/XrdFrc/XrdFrcUtils.hh b/src/XrdFrc/XrdFrcUtils.hh
index e431764159b..96c4cf8a1fb 100644
--- a/src/XrdFrc/XrdFrcUtils.hh
+++ b/src/XrdFrc/XrdFrcUtils.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <time.h>
+#include <cstdlib>
+#include <ctime>
 
 #include "XrdFrc/XrdFrcRequest.hh"
 
diff --git a/src/XrdFrc/XrdFrcXAttr.hh b/src/XrdFrc/XrdFrcXAttr.hh
index 09e5f250356..df43b2f398a 100644
--- a/src/XrdFrc/XrdFrcXAttr.hh
+++ b/src/XrdFrc/XrdFrcXAttr.hh
@@ -31,10 +31,10 @@
 /******************************************************************************/
 
 #include <sys/types.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <netinet/in.h>
 #include <sys/types.h>
-#include <string.h>
+#include <cstring>
 
 #include "XrdSys/XrdSysPlatform.hh"
 
diff --git a/src/XrdFrm/XrdFrmAdmin.cc b/src/XrdFrm/XrdFrmAdmin.cc
index 2f99a913b1f..1a7fa267d9b 100644
--- a/src/XrdFrm/XrdFrmAdmin.cc
+++ b/src/XrdFrm/XrdFrmAdmin.cc
@@ -30,10 +30,10 @@
   
 #include <fcntl.h>
 #include <grp.h>
-#include <string.h>
-#include <time.h>
+#include <cstring>
+#include <ctime>
 #include <pwd.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdFrm/XrdFrmAdmin.hh b/src/XrdFrm/XrdFrmAdmin.hh
index c8b12ce640b..a33bb65b406 100644
--- a/src/XrdFrm/XrdFrmAdmin.hh
+++ b/src/XrdFrm/XrdFrmAdmin.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 
 #include "XrdCks/XrdCksData.hh"
diff --git a/src/XrdFrm/XrdFrmAdminAudit.cc b/src/XrdFrm/XrdFrmAdminAudit.cc
index 6e6410a8993..062c4559535 100644
--- a/src/XrdFrm/XrdFrmAdminAudit.cc
+++ b/src/XrdFrm/XrdFrmAdminAudit.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <sys/param.h>
 
 #include "XrdFrc/XrdFrcTrace.hh"
diff --git a/src/XrdFrm/XrdFrmAdminFiles.cc b/src/XrdFrm/XrdFrmAdminFiles.cc
index c3dae8202e6..1724f2a9c84 100644
--- a/src/XrdFrm/XrdFrmAdminFiles.cc
+++ b/src/XrdFrm/XrdFrmAdminFiles.cc
@@ -28,12 +28,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdFrm/XrdFrmAdminFind.cc b/src/XrdFrm/XrdFrmAdminFind.cc
index 76fdd666f4b..4efc1a695db 100644
--- a/src/XrdFrm/XrdFrmAdminFind.cc
+++ b/src/XrdFrm/XrdFrmAdminFind.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
-#include <time.h>
+#include <ctime>
 #include <sys/param.h>
 
 #include "XrdCks/XrdCksManager.hh"
diff --git a/src/XrdFrm/XrdFrmAdminMain.cc b/src/XrdFrm/XrdFrmAdminMain.cc
index 317787efe4f..d34caba3489 100644
--- a/src/XrdFrm/XrdFrmAdminMain.cc
+++ b/src/XrdFrm/XrdFrmAdminMain.cc
@@ -55,13 +55,13 @@ static const char *XrdFrmUsage =
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <signal.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 
 #ifdef HAVE_READLINE
diff --git a/src/XrdFrm/XrdFrmAdminQuery.cc b/src/XrdFrm/XrdFrmAdminQuery.cc
index 2ff935d6a0d..a7e5507e545 100644
--- a/src/XrdFrm/XrdFrmAdminQuery.cc
+++ b/src/XrdFrm/XrdFrmAdminQuery.cc
@@ -29,8 +29,8 @@
 /******************************************************************************/
 
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/src/XrdFrm/XrdFrmAdminReloc.cc b/src/XrdFrm/XrdFrmAdminReloc.cc
index dc46ec2c891..8fd957870b9 100644
--- a/src/XrdFrm/XrdFrmAdminReloc.cc
+++ b/src/XrdFrm/XrdFrmAdminReloc.cc
@@ -28,11 +28,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <string.h>
-#include <time.h>
-#include <stdio.h>
+#include <cstring>
+#include <ctime>
+#include <cstdio>
 #include <unistd.h>
 #include <utime.h>
 #include <sys/mman.h>
diff --git a/src/XrdFrm/XrdFrmAdminUnlink.cc b/src/XrdFrm/XrdFrmAdminUnlink.cc
index 7b370127e6c..b751d4fa9f0 100644
--- a/src/XrdFrm/XrdFrmAdminUnlink.cc
+++ b/src/XrdFrm/XrdFrmAdminUnlink.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdFrm/XrdFrmCns.cc b/src/XrdFrm/XrdFrmCns.cc
index 592847100ad..9f4bf81d55f 100644
--- a/src/XrdFrm/XrdFrmCns.cc
+++ b/src/XrdFrm/XrdFrmCns.cc
@@ -28,14 +28,14 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <poll.h>
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdFrc/XrdFrcTrace.hh"
 #include "XrdFrm/XrdFrmCns.hh"
diff --git a/src/XrdFrm/XrdFrmConfig.cc b/src/XrdFrm/XrdFrmConfig.cc
index b7099864f74..a26bd5850d2 100644
--- a/src/XrdFrm/XrdFrmConfig.cc
+++ b/src/XrdFrm/XrdFrmConfig.cc
@@ -28,10 +28,10 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
+#include <cctype>
 #include <dirent.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <fcntl.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdFrm/XrdFrmConfig.hh b/src/XrdFrm/XrdFrmConfig.hh
index da50f12b986..0d7c1b90fae 100644
--- a/src/XrdFrm/XrdFrmConfig.hh
+++ b/src/XrdFrm/XrdFrmConfig.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 
 #include "XrdOss/XrdOssSpace.hh"
diff --git a/src/XrdFrm/XrdFrmFiles.cc b/src/XrdFrm/XrdFrmFiles.cc
index 0bd3eeb04a1..ff17eb9a48d 100644
--- a/src/XrdFrm/XrdFrmFiles.cc
+++ b/src/XrdFrm/XrdFrmFiles.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 #include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/XrdFrm/XrdFrmFiles.hh b/src/XrdFrm/XrdFrmFiles.hh
index 12d18f2aad8..3ad0e35782c 100644
--- a/src/XrdFrm/XrdFrmFiles.hh
+++ b/src/XrdFrm/XrdFrmFiles.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 
 #include "XrdFrc/XrdFrcXAttr.hh"
diff --git a/src/XrdFrm/XrdFrmMigrate.cc b/src/XrdFrm/XrdFrmMigrate.cc
index 6adf41bc726..e8ac2ba2ea2 100644
--- a/src/XrdFrm/XrdFrmMigrate.cc
+++ b/src/XrdFrm/XrdFrmMigrate.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 #include <utime.h>
 #include <sys/param.h>
diff --git a/src/XrdFrm/XrdFrmMigrate.hh b/src/XrdFrm/XrdFrmMigrate.hh
index 2647d7e4a2e..ad67f4dd648 100644
--- a/src/XrdFrm/XrdFrmMigrate.hh
+++ b/src/XrdFrm/XrdFrmMigrate.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <time.h>
+#include <ctime>
 #include <sys/types.h>
 
 class XrdFrmFileset;
diff --git a/src/XrdFrm/XrdFrmMonitor.cc b/src/XrdFrm/XrdFrmMonitor.cc
index bccb4f45008..a453617a6fb 100644
--- a/src/XrdFrm/XrdFrmMonitor.cc
+++ b/src/XrdFrm/XrdFrmMonitor.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cerrno>
+#include <cstdlib>
+#include <ctime>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/XrdFrm/XrdFrmMonitor.hh b/src/XrdFrm/XrdFrmMonitor.hh
index 5abc0043a12..0da8d241e39 100644
--- a/src/XrdFrm/XrdFrmMonitor.hh
+++ b/src/XrdFrm/XrdFrmMonitor.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <inttypes.h>
-#include <time.h>
+#include <cinttypes>
+#include <ctime>
 #include <sys/types.h>
 
 #include "XrdXrootd/XrdXrootdMonData.hh"
diff --git a/src/XrdFrm/XrdFrmPurgMain.cc b/src/XrdFrm/XrdFrmPurgMain.cc
index 8964931bb24..ed3246be2f4 100644
--- a/src/XrdFrm/XrdFrmPurgMain.cc
+++ b/src/XrdFrm/XrdFrmPurgMain.cc
@@ -76,12 +76,12 @@ static const char *XrdFrmUsage =
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 
 #include "XrdFrc/XrdFrcTrace.hh"
diff --git a/src/XrdFrm/XrdFrmPurge.cc b/src/XrdFrm/XrdFrmPurge.cc
index 94a9bc5043c..52ce78fb6cf 100644
--- a/src/XrdFrm/XrdFrmPurge.cc
+++ b/src/XrdFrm/XrdFrmPurge.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 #include <utime.h>
 #include <sys/param.h>
diff --git a/src/XrdFrm/XrdFrmPurge.hh b/src/XrdFrm/XrdFrmPurge.hh
index baa31f703de..8aaf185dfb7 100644
--- a/src/XrdFrm/XrdFrmPurge.hh
+++ b/src/XrdFrm/XrdFrmPurge.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <time.h>
+#include <ctime>
 #include <sys/types.h>
 
 #include "XrdFrm/XrdFrmTSort.hh"
diff --git a/src/XrdFrm/XrdFrmReqBoss.cc b/src/XrdFrm/XrdFrmReqBoss.cc
index a0644cff69c..2240168d4ed 100644
--- a/src/XrdFrm/XrdFrmReqBoss.cc
+++ b/src/XrdFrm/XrdFrmReqBoss.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/XrdFrm/XrdFrmTransfer.cc b/src/XrdFrm/XrdFrmTransfer.cc
index 878863ed07e..ea891d12402 100644
--- a/src/XrdFrm/XrdFrmTransfer.cc
+++ b/src/XrdFrm/XrdFrmTransfer.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <fcntl.h>
 #include <unistd.h>
 #include <utime.h>
diff --git a/src/XrdFrm/XrdFrmXfrAgent.cc b/src/XrdFrm/XrdFrmXfrAgent.cc
index 55f4bce6d6b..a9a2419930e 100644
--- a/src/XrdFrm/XrdFrmXfrAgent.cc
+++ b/src/XrdFrm/XrdFrmXfrAgent.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/XrdFrm/XrdFrmXfrDaemon.cc b/src/XrdFrm/XrdFrmXfrDaemon.cc
index 89556136ebc..dfb00b91216 100644
--- a/src/XrdFrm/XrdFrmXfrDaemon.cc
+++ b/src/XrdFrm/XrdFrmXfrDaemon.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/XrdFrm/XrdFrmXfrMain.cc b/src/XrdFrm/XrdFrmXfrMain.cc
index a0f9c07b4d4..18da7214ef6 100644
--- a/src/XrdFrm/XrdFrmXfrMain.cc
+++ b/src/XrdFrm/XrdFrmXfrMain.cc
@@ -71,12 +71,12 @@ static const char *XrdFrmUsage =
 /******************************************************************************/
   
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 
 #include "XrdFrc/XrdFrcTrace.hh"
diff --git a/src/XrdFrm/XrdFrmXfrQueue.cc b/src/XrdFrm/XrdFrmXfrQueue.cc
index 56fe8427676..b83038f6ee4 100644
--- a/src/XrdFrm/XrdFrmXfrQueue.cc
+++ b/src/XrdFrm/XrdFrmXfrQueue.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <fcntl.h>
 #include <unistd.h>
 #include <utime.h>
diff --git a/src/XrdHttp/XrdHttpProtocol.cc b/src/XrdHttp/XrdHttpProtocol.cc
index 29a142a442b..233dfa58e40 100644
--- a/src/XrdHttp/XrdHttpProtocol.cc
+++ b/src/XrdHttp/XrdHttpProtocol.cc
@@ -48,7 +48,7 @@
 #include <vector>
 #include <arpa/inet.h>
 #include <sstream>
-#include <ctype.h>
+#include <cctype>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/src/XrdHttp/XrdHttpProtocol.hh b/src/XrdHttp/XrdHttpProtocol.hh
index f4f242950d3..7ce21db6804 100644
--- a/src/XrdHttp/XrdHttpProtocol.hh
+++ b/src/XrdHttp/XrdHttpProtocol.hh
@@ -34,7 +34,7 @@
  */
 
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/XrdHttp/XrdHttpReq.cc b/src/XrdHttp/XrdHttpReq.cc
index 7ab3b3917d7..79103376dcc 100644
--- a/src/XrdHttp/XrdHttpReq.cc
+++ b/src/XrdHttp/XrdHttpReq.cc
@@ -40,7 +40,7 @@
 #include "XrdHttpReq.hh"
 #include "XrdHttpTrace.hh"
 #include "XrdHttpExtHandler.hh"
-#include <string.h>
+#include <cstring>
 #include <arpa/inet.h>
 #include <sstream>
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/XrdHttp/XrdHttpUtils.cc b/src/XrdHttp/XrdHttpUtils.cc
index 34e80b125eb..e4a0b2f36aa 100644
--- a/src/XrdHttp/XrdHttpUtils.cc
+++ b/src/XrdHttp/XrdHttpUtils.cc
@@ -38,7 +38,7 @@
 
 
 
-#include <string.h>
+#include <cstring>
 #include <openssl/hmac.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
diff --git a/src/XrdMacaroons/XrdMacaroonsAuthz.cc b/src/XrdMacaroons/XrdMacaroonsAuthz.cc
index ffde19e392e..b09a31479dd 100644
--- a/src/XrdMacaroons/XrdMacaroonsAuthz.cc
+++ b/src/XrdMacaroons/XrdMacaroonsAuthz.cc
@@ -2,7 +2,7 @@
 #include <stdexcept>
 #include <sstream>
 
-#include <time.h>
+#include <ctime>
 
 #include "macaroons.h"
 
diff --git a/src/XrdMacaroons/XrdMacaroonsConfigure.cc b/src/XrdMacaroons/XrdMacaroonsConfigure.cc
index db9734df457..299d005f4b1 100644
--- a/src/XrdMacaroons/XrdMacaroonsConfigure.cc
+++ b/src/XrdMacaroons/XrdMacaroonsConfigure.cc
@@ -1,6 +1,6 @@
 
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 
 #include <openssl/bio.h>
 #include <openssl/evp.h>
diff --git a/src/XrdNet/XrdNet.cc b/src/XrdNet/XrdNet.cc
index 88f4b7607c2..2d8afed042a 100644
--- a/src/XrdNet/XrdNet.cc
+++ b/src/XrdNet/XrdNet.cc
@@ -27,10 +27,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #ifndef WIN32
 #include <poll.h>
 #include <unistd.h>
diff --git a/src/XrdNet/XrdNet.hh b/src/XrdNet/XrdNet.hh
index 6f4d4334610..95223aac657 100644
--- a/src/XrdNet/XrdNet.hh
+++ b/src/XrdNet/XrdNet.hh
@@ -29,8 +29,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #ifndef WIN32
 #include <strings.h>
 #include <unistd.h>
diff --git a/src/XrdNet/XrdNetAddr.cc b/src/XrdNet/XrdNetAddr.cc
index 562361f8246..a090b162013 100644
--- a/src/XrdNet/XrdNetAddr.cc
+++ b/src/XrdNet/XrdNetAddr.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <ctype.h>
+#include <cctype>
 #include <netdb.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
diff --git a/src/XrdNet/XrdNetAddrInfo.cc b/src/XrdNet/XrdNetAddrInfo.cc
index 73c330b7031..cfbe3b54a9d 100644
--- a/src/XrdNet/XrdNetAddrInfo.cc
+++ b/src/XrdNet/XrdNetAddrInfo.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <netdb.h>
-#include <stdio.h>
+#include <cstdio>
 #include <arpa/inet.h>
 #include <sys/types.h>
 
diff --git a/src/XrdNet/XrdNetAddrInfo.hh b/src/XrdNet/XrdNetAddrInfo.hh
index fd3cfc27a9d..a012845c449 100644
--- a/src/XrdNet/XrdNetAddrInfo.hh
+++ b/src/XrdNet/XrdNetAddrInfo.hh
@@ -30,9 +30,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstdlib>
+#include <cstring>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/src/XrdNet/XrdNetBuffer.cc b/src/XrdNet/XrdNetBuffer.cc
index b5eb5f34224..a3cbfbdade0 100644
--- a/src/XrdNet/XrdNetBuffer.cc
+++ b/src/XrdNet/XrdNetBuffer.cc
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #endif
 #include <sys/types.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdNet/XrdNetBuffer.hh"
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/XrdNet/XrdNetBuffer.hh b/src/XrdNet/XrdNetBuffer.hh
index af52f9623e5..b5bc74812ab 100644
--- a/src/XrdNet/XrdNetBuffer.hh
+++ b/src/XrdNet/XrdNetBuffer.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdOuc/XrdOucChain.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdNet/XrdNetCache.cc b/src/XrdNet/XrdNetCache.cc
index a4110eda3d3..c7563211cc5 100644
--- a/src/XrdNet/XrdNetCache.cc
+++ b/src/XrdNet/XrdNetCache.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <time.h>
+#include <cstdlib>
+#include <ctime>
 #include <sys/socket.h>
 #include <sys/types.h>
 
diff --git a/src/XrdNet/XrdNetCache.hh b/src/XrdNet/XrdNetCache.hh
index 8abdc44dc51..f17637c1d47 100644
--- a/src/XrdNet/XrdNetCache.hh
+++ b/src/XrdNet/XrdNetCache.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
-#include <time.h>
+#include <cstring>
+#include <ctime>
 #include <sys/types.h>
 
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdNet/XrdNetCmsNotify.cc b/src/XrdNet/XrdNetCmsNotify.cc
index e8527046344..756f1284e7b 100644
--- a/src/XrdNet/XrdNetCmsNotify.cc
+++ b/src/XrdNet/XrdNetCmsNotify.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <sys/param.h>
 
 #include "XrdNet/XrdNetCmsNotify.hh"
diff --git a/src/XrdNet/XrdNetIF.cc b/src/XrdNet/XrdNetIF.cc
index a8ebb10daf9..aae51e179dc 100644
--- a/src/XrdNet/XrdNetIF.cc
+++ b/src/XrdNet/XrdNetIF.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
+#include <cctype>
 #include <netdb.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/types.h>
 
 #ifdef HAVE_GETIFADDRS
diff --git a/src/XrdNet/XrdNetIF.hh b/src/XrdNet/XrdNetIF.hh
index 0e4d6f0b600..856455cb400 100644
--- a/src/XrdNet/XrdNetIF.hh
+++ b/src/XrdNet/XrdNetIF.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 //------------------------------------------------------------------------------
 //! The XrdNetIF class handles host interfaces. It is used to obtain the
diff --git a/src/XrdNet/XrdNetMsg.cc b/src/XrdNet/XrdNetMsg.cc
index 0b8aab67a3b..58fa6c86b80 100644
--- a/src/XrdNet/XrdNetMsg.cc
+++ b/src/XrdNet/XrdNetMsg.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <sys/poll.h>
 
 #include "XrdNet/XrdNet.hh"
diff --git a/src/XrdNet/XrdNetMsg.hh b/src/XrdNet/XrdNetMsg.hh
index 81f4d9613cf..ce06886e2a1 100644
--- a/src/XrdNet/XrdNetMsg.hh
+++ b/src/XrdNet/XrdNetMsg.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #ifndef WIN32
 #include <strings.h>
 #include <unistd.h>
diff --git a/src/XrdNet/XrdNetPeer.hh b/src/XrdNet/XrdNetPeer.hh
index 9d44a7eb37d..c96a04b9744 100644
--- a/src/XrdNet/XrdNetPeer.hh
+++ b/src/XrdNet/XrdNetPeer.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdNet/XrdNetBuffer.hh"
 #include "XrdNet/XrdNetSockAddr.hh"
diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
index 5922146d019..0f8451127ce 100644
--- a/src/XrdNet/XrdNetSecurity.cc
+++ b/src/XrdNet/XrdNetSecurity.cc
@@ -29,14 +29,14 @@
 
 #ifndef WIN32
 #include <netdb.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <strings.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #else
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <Winsock2.h>
 #include <io.h>
diff --git a/src/XrdNet/XrdNetSecurity.hh b/src/XrdNet/XrdNetSecurity.hh
index f29f58faebd..83d1ff91907 100644
--- a/src/XrdNet/XrdNetSecurity.hh
+++ b/src/XrdNet/XrdNetSecurity.hh
@@ -29,8 +29,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdlib>
   
 #include "XrdOuc/XrdOucHash.hh"
 #include "XrdOuc/XrdOucNList.hh"
diff --git a/src/XrdNet/XrdNetSocket.cc b/src/XrdNet/XrdNetSocket.cc
index 29c1212ad27..5d0819c63f1 100644
--- a/src/XrdNet/XrdNetSocket.cc
+++ b/src/XrdNet/XrdNetSocket.cc
@@ -30,12 +30,12 @@
 
 #ifndef WIN32
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <fcntl.h>
 #include <poll.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <strings.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -44,10 +44,10 @@
 #include <sys/stat.h>
 #include <sys/un.h>
 #else
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <Winsock2.h>
diff --git a/src/XrdNet/XrdNetUtils.cc b/src/XrdNet/XrdNetUtils.cc
index cd0b79700ea..91d147ca773 100644
--- a/src/XrdNet/XrdNetUtils.cc
+++ b/src/XrdNet/XrdNetUtils.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <inttypes.h>
+#include <cctype>
+#include <cinttypes>
 #include <netdb.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 
 #include <netinet/in.h>
diff --git a/src/XrdOfs/XrdOfs.cc b/src/XrdOfs/XrdOfs.cc
index 9e52026ed21..d3959650691 100644
--- a/src/XrdOfs/XrdOfs.cc
+++ b/src/XrdOfs/XrdOfs.cc
@@ -29,14 +29,14 @@
 
 #include <unistd.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <memory.h>
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
 #include <netdb.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/src/XrdOfs/XrdOfs.hh b/src/XrdOfs/XrdOfs.hh
index d6e1b82c193..fface1397a9 100644
--- a/src/XrdOfs/XrdOfs.hh
+++ b/src/XrdOfs/XrdOfs.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <dirent.h>
 #include <sys/types.h>
   
diff --git a/src/XrdOfs/XrdOfsCPFile.cc b/src/XrdOfs/XrdOfsCPFile.cc
index 70ed159af99..30f28ac7676 100644
--- a/src/XrdOfs/XrdOfsCPFile.cc
+++ b/src/XrdOfs/XrdOfsCPFile.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdOfs/XrdOfsCPFile.hh b/src/XrdOfs/XrdOfsCPFile.hh
index 75b20c6f924..b5eb83b5006 100644
--- a/src/XrdOfs/XrdOfsCPFile.hh
+++ b/src/XrdOfs/XrdOfsCPFile.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
-#include <time.h>
+#include <cstdint>
+#include <ctime>
   
 struct stat;
 class  XrdOucIOVec;
diff --git a/src/XrdOfs/XrdOfsChkPnt.cc b/src/XrdOfs/XrdOfsChkPnt.cc
index 64176a4de20..5071be6da94 100644
--- a/src/XrdOfs/XrdOfsChkPnt.cc
+++ b/src/XrdOfs/XrdOfsChkPnt.cc
@@ -29,9 +29,9 @@
 /******************************************************************************/
 
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/XrdOfs/XrdOfsConfig.cc b/src/XrdOfs/XrdOfsConfig.cc
index 878ce7c4649..4dda6c7785a 100644
--- a/src/XrdOfs/XrdOfsConfig.cc
+++ b/src/XrdOfs/XrdOfsConfig.cc
@@ -29,13 +29,13 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <fcntl.h>
 #include <netdb.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <netinet/in.h>
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/src/XrdOfs/XrdOfsConfigCP.cc b/src/XrdOfs/XrdOfsConfigCP.cc
index 130279a10df..09c273e64c0 100644
--- a/src/XrdOfs/XrdOfsConfigCP.cc
+++ b/src/XrdOfs/XrdOfsConfigCP.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdOfs/XrdOfsChkPnt.hh"
 #include "XrdOfs/XrdOfsConfigCP.hh"
diff --git a/src/XrdOfs/XrdOfsConfigPI.cc b/src/XrdOfs/XrdOfsConfigPI.cc
index 169d15afe6f..2682bccfcb9 100644
--- a/src/XrdOfs/XrdOfsConfigPI.cc
+++ b/src/XrdOfs/XrdOfsConfigPI.cc
@@ -29,10 +29,10 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include <sys/param.h>
 
 #include "XrdVersion.hh"
diff --git a/src/XrdOfs/XrdOfsEvr.cc b/src/XrdOfs/XrdOfsEvr.cc
index 04c241072a5..8cdea3889ec 100644
--- a/src/XrdOfs/XrdOfsEvr.cc
+++ b/src/XrdOfs/XrdOfsEvr.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdCms/XrdCmsClient.hh"
 #include "XrdOfs/XrdOfsEvr.hh"
diff --git a/src/XrdOfs/XrdOfsEvs.cc b/src/XrdOfs/XrdOfsEvs.cc
index 61f3e2cec4b..c9ae15be73e 100644
--- a/src/XrdOfs/XrdOfsEvs.cc
+++ b/src/XrdOfs/XrdOfsEvs.cc
@@ -29,12 +29,12 @@
 /*             Based on code developed by Derek Feichtinger, CERN.            */
 /******************************************************************************/
   
-#include <ctype.h>
-#include <stdarg.h>
+#include <cctype>
+#include <cstdarg>
 #include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <sys/stat.h>
 
 #include "XrdOfs/XrdOfsEvs.hh"
diff --git a/src/XrdOfs/XrdOfsFSctl.cc b/src/XrdOfs/XrdOfsFSctl.cc
index f0f4a67bbb8..ff794720a51 100644
--- a/src/XrdOfs/XrdOfsFSctl.cc
+++ b/src/XrdOfs/XrdOfsFSctl.cc
@@ -28,11 +28,11 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdOfs/XrdOfsHandle.cc b/src/XrdOfs/XrdOfsHandle.cc
index 9b090edeb9b..0ebec735323 100644
--- a/src/XrdOfs/XrdOfsHandle.cc
+++ b/src/XrdOfs/XrdOfsHandle.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include <sys/errno.h>
 #include <sys/types.h>
 
diff --git a/src/XrdOfs/XrdOfsHandle.hh b/src/XrdOfs/XrdOfsHandle.hh
index 2d7b3fb03c3..dc81ffb1f69 100644
--- a/src/XrdOfs/XrdOfsHandle.hh
+++ b/src/XrdOfs/XrdOfsHandle.hh
@@ -34,7 +34,7 @@
    appropriate size (yes, that means dbx has a tough time).
 */
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdOuc/XrdOucCRC.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdOfs/XrdOfsPoscq.cc b/src/XrdOfs/XrdOfsPoscq.cc
index e59353437c3..1838795249a 100644
--- a/src/XrdOfs/XrdOfsPoscq.cc
+++ b/src/XrdOfs/XrdOfsPoscq.cc
@@ -28,13 +28,13 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <strings.h>
 #include <stddef.h>
-#include <stdio.h>
+#include <cstdio>
 #include <fcntl.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdOfs/XrdOfsStats.cc b/src/XrdOfs/XrdOfsStats.cc
index 211b0839e7a..d5e05b1452c 100644
--- a/src/XrdOfs/XrdOfsStats.cc
+++ b/src/XrdOfs/XrdOfsStats.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdOfs/XrdOfsStats.hh"
 
diff --git a/src/XrdOfs/XrdOfsStats.hh b/src/XrdOfs/XrdOfsStats.hh
index ffbb1e381df..bc4a2e498a5 100644
--- a/src/XrdOfs/XrdOfsStats.hh
+++ b/src/XrdOfs/XrdOfsStats.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdSys/XrdSysPthread.hh"
 
diff --git a/src/XrdOfs/XrdOfsTPC.cc b/src/XrdOfs/XrdOfsTPC.cc
index 25c8a1cc029..7e76f3864b0 100644
--- a/src/XrdOfs/XrdOfsTPC.cc
+++ b/src/XrdOfs/XrdOfsTPC.cc
@@ -29,8 +29,8 @@
 /******************************************************************************/
 
 #include <atomic>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <string>
 #include <strings.h>
   
diff --git a/src/XrdOfs/XrdOfsTPC.hh b/src/XrdOfs/XrdOfsTPC.hh
index 8c6b0fa0538..6e229b635c3 100644
--- a/src/XrdOfs/XrdOfsTPC.hh
+++ b/src/XrdOfs/XrdOfsTPC.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
   
 #include "XrdOfs/XrdOfsTPCInfo.hh"
 
diff --git a/src/XrdOfs/XrdOfsTPCAuth.cc b/src/XrdOfs/XrdOfsTPCAuth.cc
index 5658d648fc2..521f43e9213 100644
--- a/src/XrdOfs/XrdOfsTPCAuth.cc
+++ b/src/XrdOfs/XrdOfsTPCAuth.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <strings.h>
   
 #include "XrdOfs/XrdOfsStats.hh"
diff --git a/src/XrdOfs/XrdOfsTPCAuth.hh b/src/XrdOfs/XrdOfsTPCAuth.hh
index fe1e03261be..37f7755727e 100644
--- a/src/XrdOfs/XrdOfsTPCAuth.hh
+++ b/src/XrdOfs/XrdOfsTPCAuth.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
   
 #include "XrdOfs/XrdOfsTPC.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdOfs/XrdOfsTPCInfo.cc b/src/XrdOfs/XrdOfsTPCInfo.cc
index 675edf27738..0daafaf7b30 100644
--- a/src/XrdOfs/XrdOfsTPCInfo.cc
+++ b/src/XrdOfs/XrdOfsTPCInfo.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 
 #include "XrdNet/XrdNetAddr.hh"
diff --git a/src/XrdOfs/XrdOfsTPCInfo.hh b/src/XrdOfs/XrdOfsTPCInfo.hh
index 68dc8bbd7fe..0bf1b60474e 100644
--- a/src/XrdOfs/XrdOfsTPCInfo.hh
+++ b/src/XrdOfs/XrdOfsTPCInfo.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdOuc/XrdOucCallBack.hh"
 
diff --git a/src/XrdOfs/XrdOfsTPCProg.cc b/src/XrdOfs/XrdOfsTPCProg.cc
index 6ea68fe928d..b56aa5106c1 100644
--- a/src/XrdOfs/XrdOfsTPCProg.cc
+++ b/src/XrdOfs/XrdOfsTPCProg.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <strings.h>
   
 #include "XrdOfs/XrdOfsTPC.hh"
diff --git a/src/XrdOss/XrdOss.hh b/src/XrdOss/XrdOss.hh
index 566bf31cbf8..1268384f562 100644
--- a/src/XrdOss/XrdOss.hh
+++ b/src/XrdOss/XrdOss.hh
@@ -31,13 +31,13 @@
 /******************************************************************************/
 
 #include <dirent.h>
-#include <errno.h>
-#include <stdint.h>
+#include <cerrno>
+#include <cstdint>
 #include <strings.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <string.h>
+#include <cstring>
 
 #include "XrdOss/XrdOssVS.hh"
 #include "XrdOuc/XrdOucIOVec.hh"
diff --git a/src/XrdOss/XrdOssAio.cc b/src/XrdOss/XrdOssAio.cc
index 45b5b85d6a3..cb2d4b60a8b 100644
--- a/src/XrdOss/XrdOssAio.cc
+++ b/src/XrdOss/XrdOssAio.cc
@@ -29,7 +29,7 @@
 /******************************************************************************/
   
 #include <signal.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <fcntl.h>
 #ifdef _POSIX_ASYNCHRONOUS_IO
diff --git a/src/XrdOss/XrdOssApi.cc b/src/XrdOss/XrdOssApi.cc
index 6512ea707f1..86c8a45a997 100644
--- a/src/XrdOss/XrdOssApi.cc
+++ b/src/XrdOss/XrdOssApi.cc
@@ -32,11 +32,11 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <signal.h>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdOss/XrdOssApi.hh b/src/XrdOss/XrdOssApi.hh
index 8d550c9126c..f3ce98c38e4 100644
--- a/src/XrdOss/XrdOssApi.hh
+++ b/src/XrdOss/XrdOssApi.hh
@@ -31,7 +31,7 @@
 /******************************************************************************/
 
 #include <sys/types.h>
-#include <errno.h>
+#include <cerrno>
 #include "XrdSys/XrdSysHeaders.hh"
 
 #include "XrdOss/XrdOss.hh"
diff --git a/src/XrdOss/XrdOssAt.cc b/src/XrdOss/XrdOssAt.cc
index 39ff8a310c7..cfa5c1d4948 100644
--- a/src/XrdOss/XrdOssAt.cc
+++ b/src/XrdOss/XrdOssAt.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <string>
 #include <sys/param.h>
diff --git a/src/XrdOss/XrdOssAt.hh b/src/XrdOss/XrdOssAt.hh
index 2606337fc54..1207cca939b 100644
--- a/src/XrdOss/XrdOssAt.hh
+++ b/src/XrdOss/XrdOssAt.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
+#include <cstdint>
 #include <sys/types.h>
 
 struct stat;
diff --git a/src/XrdOss/XrdOssCache.cc b/src/XrdOss/XrdOssCache.cc
index 5f58c761d4f..1952adf86b8 100644
--- a/src/XrdOss/XrdOssCache.cc
+++ b/src/XrdOss/XrdOssCache.cc
@@ -30,13 +30,13 @@
 
 #include <unistd.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <map>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 #include <strings.h>
-#include <time.h>
+#include <ctime>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdOss/XrdOssCache.hh b/src/XrdOss/XrdOssCache.hh
index ff36b6ade04..61c64a3860c 100644
--- a/src/XrdOss/XrdOssCache.hh
+++ b/src/XrdOss/XrdOssCache.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <time.h>
+#include <ctime>
 #include <sys/stat.h>
 #include "XrdOuc/XrdOucDLlist.hh"
 #include "XrdOss/XrdOssVS.hh"
diff --git a/src/XrdOss/XrdOssConfig.cc b/src/XrdOss/XrdOssConfig.cc
index 95080001a5b..c79dd6f95d9 100644
--- a/src/XrdOss/XrdOssConfig.cc
+++ b/src/XrdOss/XrdOssConfig.cc
@@ -30,12 +30,12 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
+#include <cctype>
 #include <dirent.h>
 #include <fcntl.h>
 #include <string>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
diff --git a/src/XrdOss/XrdOssCopy.cc b/src/XrdOss/XrdOssCopy.cc
index 3f36eaeba6b..bb8b6840dd6 100644
--- a/src/XrdOss/XrdOssCopy.cc
+++ b/src/XrdOss/XrdOssCopy.cc
@@ -28,11 +28,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <string.h>
-#include <time.h>
-#include <stdio.h>
+#include <cstring>
+#include <ctime>
+#include <cstdio>
 #include <unistd.h>
 #include <utime.h>
 #include <sys/mman.h>
diff --git a/src/XrdOss/XrdOssCreate.cc b/src/XrdOss/XrdOssCreate.cc
index f3f3d89d533..6449aac435e 100644
--- a/src/XrdOss/XrdOssCreate.cc
+++ b/src/XrdOss/XrdOssCreate.cc
@@ -33,10 +33,10 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <utime.h>
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/src/XrdOss/XrdOssMSS.cc b/src/XrdOss/XrdOssMSS.cc
index 9b07b5a7538..35dd7dac394 100644
--- a/src/XrdOss/XrdOssMSS.cc
+++ b/src/XrdOss/XrdOssMSS.cc
@@ -30,11 +30,11 @@
 
 #include <dirent.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <strings.h>
 #include <signal.h>
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #if defined(AIX) || defined(__solaris__)
 #include <sys/vnode.h>
 #include <sys/mode.h>
diff --git a/src/XrdOss/XrdOssMio.cc b/src/XrdOss/XrdOssMio.cc
index cc10252d6b0..2ab6258fcf2 100644
--- a/src/XrdOss/XrdOssMio.cc
+++ b/src/XrdOss/XrdOssMio.cc
@@ -29,7 +29,7 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdOss/XrdOssMioFile.hh b/src/XrdOss/XrdOssMioFile.hh
index b6c00eaa9bb..d3ea6bd95a2 100644
--- a/src/XrdOss/XrdOssMioFile.hh
+++ b/src/XrdOss/XrdOssMioFile.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <time.h>
+#include <ctime>
 #include <sys/types.h>
   
 class XrdOssMioFile
diff --git a/src/XrdOss/XrdOssPath.cc b/src/XrdOss/XrdOssPath.cc
index 95981ae838e..1115f7012f1 100644
--- a/src/XrdOss/XrdOssPath.cc
+++ b/src/XrdOss/XrdOssPath.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <limits.h>
-#include <time.h>
+#include <ctime>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdOss/XrdOssPath.hh b/src/XrdOss/XrdOssPath.hh
index 55826745376..ef38f54182d 100644
--- a/src/XrdOss/XrdOssPath.hh
+++ b/src/XrdOss/XrdOssPath.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 class XrdOssPath
 {
diff --git a/src/XrdOss/XrdOssReloc.cc b/src/XrdOss/XrdOssReloc.cc
index ce64d665d99..c66321db678 100644
--- a/src/XrdOss/XrdOssReloc.cc
+++ b/src/XrdOss/XrdOssReloc.cc
@@ -33,10 +33,10 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/src/XrdOss/XrdOssRename.cc b/src/XrdOss/XrdOssRename.cc
index 78a59a2f736..a1411961537 100644
--- a/src/XrdOss/XrdOssRename.cc
+++ b/src/XrdOss/XrdOssRename.cc
@@ -29,11 +29,11 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <strings.h>
 #include <limits.h>
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdOss/XrdOssSIgpfsT.cc b/src/XrdOss/XrdOssSIgpfsT.cc
index 51278e71ccf..2ee31e8eae1 100644
--- a/src/XrdOss/XrdOssSIgpfsT.cc
+++ b/src/XrdOss/XrdOssSIgpfsT.cc
@@ -32,8 +32,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <strings.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 
 #include "XrdVersion.hh"
 #include "XrdOss/XrdOss.hh"
diff --git a/src/XrdOss/XrdOssSpace.cc b/src/XrdOss/XrdOssSpace.cc
index c09c95a5743..f057e094ac4 100644
--- a/src/XrdOss/XrdOssSpace.cc
+++ b/src/XrdOss/XrdOssSpace.cc
@@ -32,9 +32,9 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 #include <stddef.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdOss/XrdOssCache.hh"
 #include "XrdOss/XrdOssSpace.hh"
diff --git a/src/XrdOss/XrdOssStage.cc b/src/XrdOss/XrdOssStage.cc
index dd9014ca6d0..4fad9b7dde3 100644
--- a/src/XrdOss/XrdOssStage.cc
+++ b/src/XrdOss/XrdOssStage.cc
@@ -39,11 +39,11 @@
 */
 
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <strings.h>
 #include <signal.h>
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/stat.h>
diff --git a/src/XrdOss/XrdOssStage.hh b/src/XrdOss/XrdOssStage.hh
index d5047ef0d73..d8c09fcf3e6 100644
--- a/src/XrdOss/XrdOssStage.hh
+++ b/src/XrdOss/XrdOssStage.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <time.h>
+#include <ctime>
 #include <sys/stat.h>
 #include "XrdOuc/XrdOucDLlist.hh"
 #include "XrdSys/XrdSysError.hh"
diff --git a/src/XrdOss/XrdOssStat.cc b/src/XrdOss/XrdOssStat.cc
index 066981aeca0..526501badac 100644
--- a/src/XrdOss/XrdOssStat.cc
+++ b/src/XrdOss/XrdOssStat.cc
@@ -29,11 +29,11 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 #include <strings.h>
-#include <time.h>
+#include <ctime>
 #include <utime.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdOss/XrdOssUnlink.cc b/src/XrdOss/XrdOssUnlink.cc
index dc39054b2cf..d4e0b174bed 100644
--- a/src/XrdOss/XrdOssUnlink.cc
+++ b/src/XrdOss/XrdOssUnlink.cc
@@ -29,10 +29,10 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <strings.h>
 #include <limits.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdOssCsi/XrdOssCsiPages.hh b/src/XrdOssCsi/XrdOssCsiPages.hh
index 6fc9529906a..852a3add6f9 100644
--- a/src/XrdOssCsi/XrdOssCsiPages.hh
+++ b/src/XrdOssCsi/XrdOssCsiPages.hh
@@ -40,7 +40,7 @@
 #include <mutex>
 #include <utility>
 #include <cinttypes>
-#include <stdio.h>
+#include <cstdio>
 
 class XrdOssCsiPages
 {
diff --git a/src/XrdOuc/XrdOucArgs.cc b/src/XrdOuc/XrdOucArgs.cc
index f225bc8a083..1ace0e07b20 100644
--- a/src/XrdOuc/XrdOucArgs.cc
+++ b/src/XrdOuc/XrdOucArgs.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdarg>
+#include <cstdlib>
+#include <cstdio>
 #include <strings.h>
 
 #include "XrdOuc/XrdOucArgs.hh"
diff --git a/src/XrdOuc/XrdOucArgs.hh b/src/XrdOuc/XrdOucArgs.hh
index e5d929319cd..213b3b1bb0b 100644
--- a/src/XrdOuc/XrdOucArgs.hh
+++ b/src/XrdOuc/XrdOucArgs.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdOuc/XrdOucTokenizer.hh"
 
diff --git a/src/XrdOuc/XrdOucBackTrace.cc b/src/XrdOuc/XrdOucBackTrace.cc
index c4624417e8f..813183c3228 100644
--- a/src/XrdOuc/XrdOucBackTrace.cc
+++ b/src/XrdOuc/XrdOucBackTrace.cc
@@ -28,8 +28,8 @@
 /******************************************************************************/
 
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
 #include <vector>
 #include <sys/syscall.h>
diff --git a/src/XrdOuc/XrdOucBuffer.cc b/src/XrdOuc/XrdOucBuffer.cc
index dfc9f2eb3ae..2faee1d5164 100644
--- a/src/XrdOuc/XrdOucBuffer.cc
+++ b/src/XrdOuc/XrdOucBuffer.cc
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #endif
 #include <sys/types.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdOuc/XrdOucBuffer.hh"
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/XrdOuc/XrdOucBuffer.hh b/src/XrdOuc/XrdOucBuffer.hh
index 2e48670244e..aef1abc64b5 100644
--- a/src/XrdOuc/XrdOucBuffer.hh
+++ b/src/XrdOuc/XrdOucBuffer.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdOuc/XrdOucChain.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdOuc/XrdOucCRC.hh b/src/XrdOuc/XrdOucCRC.hh
index 2cbad855aff..b8a8139cb94 100644
--- a/src/XrdOuc/XrdOucCRC.hh
+++ b/src/XrdOuc/XrdOucCRC.hh
@@ -31,7 +31,7 @@
 /******************************************************************************/
 
 #include <stddef.h>
-#include <stdint.h>
+#include <cstdint>
 
 #include "XrdSys/XrdSysPageSize.hh"
 
diff --git a/src/XrdOuc/XrdOucCRC32C.cc b/src/XrdOuc/XrdOucCRC32C.cc
index 8ef517cb323..903df2a7c1d 100644
--- a/src/XrdOuc/XrdOucCRC32C.cc
+++ b/src/XrdOuc/XrdOucCRC32C.cc
@@ -431,8 +431,8 @@ uint32_t crc32c_sw(uint32_t crc, void const *buf, size_t len) {
 
 #ifdef TEST
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include "load.h"
 
 int main(int argc, char **argv) {
diff --git a/src/XrdOuc/XrdOucCRC32C.hh b/src/XrdOuc/XrdOucCRC32C.hh
index 33d710cf2b3..0b6a9242776 100644
--- a/src/XrdOuc/XrdOucCRC32C.hh
+++ b/src/XrdOuc/XrdOucCRC32C.hh
@@ -4,7 +4,7 @@
 // Copyright (C) 2015 Mark Adler
 // See crc32c.c for the license.
 
-#include <stdint.h>
+#include <cstdint>
 
 // Return the CRC-32C of buf[0..len-1] given the starting CRC crc.  This can be
 // used to calculate the CRC of a sequence of bytes a chunk at a time, using
diff --git a/src/XrdOuc/XrdOucCache.hh b/src/XrdOuc/XrdOucCache.hh
index 7f82d75fd8f..a310acaa35a 100644
--- a/src/XrdOuc/XrdOucCache.hh
+++ b/src/XrdOuc/XrdOucCache.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <cstdint>
 #include <vector>
 
diff --git a/src/XrdOuc/XrdOucCacheStats.hh b/src/XrdOuc/XrdOucCacheStats.hh
index aefb1e19fcc..4e24c0da540 100644
--- a/src/XrdOuc/XrdOucCacheStats.hh
+++ b/src/XrdOuc/XrdOucCacheStats.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 
 #include "XrdSys/XrdSysAtomics.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdOuc/XrdOucERoute.cc b/src/XrdOuc/XrdOucERoute.cc
index bd8738245e0..3c2af9a59c0 100644
--- a/src/XrdOuc/XrdOucERoute.cc
+++ b/src/XrdOuc/XrdOucERoute.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdOuc/XrdOucERoute.hh"
 #include "XrdOuc/XrdOucStream.hh"
diff --git a/src/XrdOuc/XrdOucEnv.cc b/src/XrdOuc/XrdOucEnv.cc
index b24c9f642e9..7d1ec8f71ca 100644
--- a/src/XrdOuc/XrdOucEnv.cc
+++ b/src/XrdOuc/XrdOucEnv.cc
@@ -30,7 +30,7 @@
 
 #include "string.h"
 #include "stdio.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdOuc/XrdOucEnv.hh"
   
diff --git a/src/XrdOuc/XrdOucEnv.hh b/src/XrdOuc/XrdOucEnv.hh
index 6b6b3e11fba..13dbba88d72 100644
--- a/src/XrdOuc/XrdOucEnv.hh
+++ b/src/XrdOuc/XrdOucEnv.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #ifndef WIN32
 #include <strings.h>
 #endif
diff --git a/src/XrdOuc/XrdOucErrInfo.hh b/src/XrdOuc/XrdOucErrInfo.hh
index fd08f8fe367..e2f40a0a039 100644
--- a/src/XrdOuc/XrdOucErrInfo.hh
+++ b/src/XrdOuc/XrdOucErrInfo.hh
@@ -30,7 +30,7 @@
 /*                                                                            */
 /******************************************************************************/
 
-#include <string.h>      // For strlcpy()
+#include <cstring>      // For strlcpy()
 #include <sys/types.h>
 
 #include "XrdOuc/XrdOucBuffer.hh"
diff --git a/src/XrdOuc/XrdOucFileInfo.hh b/src/XrdOuc/XrdOucFileInfo.hh
index bdf68dcf9e6..9710a569397 100644
--- a/src/XrdOuc/XrdOucFileInfo.hh
+++ b/src/XrdOuc/XrdOucFileInfo.hh
@@ -29,9 +29,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
 #include <string>
   
 //-----------------------------------------------------------------------------
diff --git a/src/XrdOuc/XrdOucGMap.cc b/src/XrdOuc/XrdOucGMap.cc
index 19654780124..ef8c20288bd 100644
--- a/src/XrdOuc/XrdOucGMap.cc
+++ b/src/XrdOuc/XrdOucGMap.cc
@@ -37,12 +37,12 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 
 #include "XrdOuc/XrdOucEnv.hh"
diff --git a/src/XrdOuc/XrdOucHash.hh b/src/XrdOuc/XrdOucHash.hh
index 1b3b8f2beab..eaf599877a2 100644
--- a/src/XrdOuc/XrdOucHash.hh
+++ b/src/XrdOuc/XrdOucHash.hh
@@ -29,10 +29,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
-#include <string.h>
-#include <time.h>
+#include <cstring>
+#include <ctime>
 
 /*
 Hash_data_is_key - The key and data are the same so when an item is added
diff --git a/src/XrdOuc/XrdOucHash.icc b/src/XrdOuc/XrdOucHash.icc
index 303ed78574d..88b3e821d2a 100644
--- a/src/XrdOuc/XrdOucHash.icc
+++ b/src/XrdOuc/XrdOucHash.icc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 /******************************************************************************/
 /*                E x t e r n a l   H a s h   F u n c t i o n                 */
diff --git a/src/XrdOuc/XrdOucLogging.cc b/src/XrdOuc/XrdOucLogging.cc
index b10099630fb..bf7fa07b8e6 100644
--- a/src/XrdOuc/XrdOucLogging.cc
+++ b/src/XrdOuc/XrdOucLogging.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdVersion.hh"
 
diff --git a/src/XrdOuc/XrdOucMsubs.cc b/src/XrdOuc/XrdOucMsubs.cc
index c66291dd579..5163697d6c8 100644
--- a/src/XrdOuc/XrdOucMsubs.cc
+++ b/src/XrdOuc/XrdOucMsubs.cc
@@ -32,8 +32,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
 #include <strings.h>
 
 #include "XrdOuc/XrdOucMsubs.hh"
diff --git a/src/XrdOuc/XrdOucMsubs.hh b/src/XrdOuc/XrdOucMsubs.hh
index e19401ca505..08e5fe5c78d 100644
--- a/src/XrdOuc/XrdOucMsubs.hh
+++ b/src/XrdOuc/XrdOucMsubs.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdSys/XrdSysError.hh"
 #include "XrdOuc/XrdOucEnv.hh"
diff --git a/src/XrdOuc/XrdOucN2NLoader.cc b/src/XrdOuc/XrdOucN2NLoader.cc
index 3ebbda9a9c5..e6c0b198d50 100644
--- a/src/XrdOuc/XrdOucN2NLoader.cc
+++ b/src/XrdOuc/XrdOucN2NLoader.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdOuc/XrdOucN2No2p.cc b/src/XrdOuc/XrdOucN2No2p.cc
index 79744403e6c..0fd58ca6c82 100644
--- a/src/XrdOuc/XrdOucN2No2p.cc
+++ b/src/XrdOuc/XrdOucN2No2p.cc
@@ -31,10 +31,10 @@
 /******************************************************************************/
 
 #include <algorithm>
-#include <errno.h>
-#include <stdio.h>
+#include <cerrno>
+#include <cstdio>
 #include <string>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 
 #include "XrdVersion.hh"
diff --git a/src/XrdOuc/XrdOucNList.cc b/src/XrdOuc/XrdOucNList.cc
index e65f818fd3b..e2bb7e7f2c1 100644
--- a/src/XrdOuc/XrdOucNList.cc
+++ b/src/XrdOuc/XrdOucNList.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include "XrdOuc/XrdOucNList.hh"
   
 /******************************************************************************/
diff --git a/src/XrdOuc/XrdOucNList.hh b/src/XrdOuc/XrdOucNList.hh
index 2c96dc4d4ee..48b2e2d1d7a 100644
--- a/src/XrdOuc/XrdOucNList.hh
+++ b/src/XrdOuc/XrdOucNList.hh
@@ -34,7 +34,7 @@
 #else
 #include "XrdSys/XrdWin32.hh"
 #endif
-#include <stdlib.h>
+#include <cstdlib>
 #include "XrdSys/XrdSysPthread.hh"
   
 class XrdOucNList
diff --git a/src/XrdOuc/XrdOucNSWalk.cc b/src/XrdOuc/XrdOucNSWalk.cc
index aabb6a9bcb4..d93fa7aeb1d 100644
--- a/src/XrdOuc/XrdOucNSWalk.cc
+++ b/src/XrdOuc/XrdOucNSWalk.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
 #include <dirent.h>
 #include <unistd.h>
 
diff --git a/src/XrdOuc/XrdOucNSWalk.hh b/src/XrdOuc/XrdOucNSWalk.hh
index 991ec627229..b3b2acac793 100644
--- a/src/XrdOuc/XrdOucNSWalk.hh
+++ b/src/XrdOuc/XrdOucNSWalk.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdOuc/XrdOucName2Name.cc b/src/XrdOuc/XrdOucName2Name.cc
index 73f8154cca0..818405ef35d 100644
--- a/src/XrdOuc/XrdOucName2Name.cc
+++ b/src/XrdOuc/XrdOucName2Name.cc
@@ -31,7 +31,7 @@
 // This file implements an instance of the XrdOucName2Name and the
 // XrdOucName2NameVec abstract classes.
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdSys/XrdSysError.hh"
 #include "XrdOuc/XrdOucName2Name.hh"
diff --git a/src/XrdOuc/XrdOucPList.hh b/src/XrdOuc/XrdOucPList.hh
index 7ebeddb62a5..24ff1104f0a 100644
--- a/src/XrdOuc/XrdOucPList.hh
+++ b/src/XrdOuc/XrdOucPList.hh
@@ -30,9 +30,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <strings.h>
-#include <stdlib.h>
+#include <cstdlib>
   
 class XrdOucPList
 {
diff --git a/src/XrdOuc/XrdOucPgrwUtils.hh b/src/XrdOuc/XrdOucPgrwUtils.hh
index 1fe61274f8d..c71ab9fff3f 100644
--- a/src/XrdOuc/XrdOucPgrwUtils.hh
+++ b/src/XrdOuc/XrdOucPgrwUtils.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include <sys/types.h>
 
diff --git a/src/XrdOuc/XrdOucPinLoader.cc b/src/XrdOuc/XrdOucPinLoader.cc
index e5715bff489..24bcf1447e1 100644
--- a/src/XrdOuc/XrdOucPinLoader.cc
+++ b/src/XrdOuc/XrdOucPinLoader.cc
@@ -27,10 +27,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdVersion.hh"
 
diff --git a/src/XrdOuc/XrdOucPreload.cc b/src/XrdOuc/XrdOucPreload.cc
index e147a7f81dc..ab48127764f 100644
--- a/src/XrdOuc/XrdOucPreload.cc
+++ b/src/XrdOuc/XrdOucPreload.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdVersion.hh"
 
diff --git a/src/XrdOuc/XrdOucProg.cc b/src/XrdOuc/XrdOucProg.cc
index 04159ffc67d..6b1cffed515 100644
--- a/src/XrdOuc/XrdOucProg.cc
+++ b/src/XrdOuc/XrdOucProg.cc
@@ -27,9 +27,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #ifndef WIN32
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/src/XrdOuc/XrdOucPsx.cc b/src/XrdOuc/XrdOucPsx.cc
index ae7bcf05649..4d4b59bf7e3 100644
--- a/src/XrdOuc/XrdOucPsx.cc
+++ b/src/XrdOuc/XrdOucPsx.cc
@@ -29,8 +29,8 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdOuc/XrdOucPsx.hh b/src/XrdOuc/XrdOucPsx.hh
index 794cb591976..f3d9ea8afb3 100644
--- a/src/XrdOuc/XrdOucPsx.hh
+++ b/src/XrdOuc/XrdOucPsx.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 
 #include "XrdOuc/XrdOucCacheCM.hh"
diff --git a/src/XrdOuc/XrdOucPup.cc b/src/XrdOuc/XrdOucPup.cc
index 757a15fa4dc..d60395f9b58 100644
--- a/src/XrdOuc/XrdOucPup.cc
+++ b/src/XrdOuc/XrdOucPup.cc
@@ -28,12 +28,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <sys/uio.h>
 #include <netinet/in.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstdio>
+#include <cstring>
 
 #ifdef WIN32
 #include <direct.h>
diff --git a/src/XrdOuc/XrdOucRash.hh b/src/XrdOuc/XrdOucRash.hh
index b5b285754f6..38ccaefac7c 100644
--- a/src/XrdOuc/XrdOucRash.hh
+++ b/src/XrdOuc/XrdOucRash.hh
@@ -47,7 +47,7 @@
 //          mutex when used in a multi-threaded environment.
  
 #include <sys/types.h>
-#include <time.h>
+#include <ctime>
 
 enum XrdOucRash_Options {Rash_default     = 0x0000,
                          Rash_replace     = 0x0002,
diff --git a/src/XrdOuc/XrdOucRash.icc b/src/XrdOuc/XrdOucRash.icc
index 5eb04ec6f44..382da3ec85a 100644
--- a/src/XrdOuc/XrdOucRash.icc
+++ b/src/XrdOuc/XrdOucRash.icc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdSys/XrdSysPlatform.hh"
 
diff --git a/src/XrdOuc/XrdOucReqID.cc b/src/XrdOuc/XrdOucReqID.cc
index 48022508b81..a35b541f362 100644
--- a/src/XrdOuc/XrdOucReqID.cc
+++ b/src/XrdOuc/XrdOucReqID.cc
@@ -28,14 +28,14 @@
 /******************************************************************************/
 
 #include <limits.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #ifndef WIN32
 #include <strings.h>
 #else
 #include "XrdSys/XrdWin32.hh"
 #endif
-#include <time.h>
+#include <ctime>
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/types.h>
diff --git a/src/XrdOuc/XrdOucReqID.hh b/src/XrdOuc/XrdOucReqID.hh
index b7aca56d43a..c27de8e4a66 100644
--- a/src/XrdOuc/XrdOucReqID.hh
+++ b/src/XrdOuc/XrdOucReqID.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #ifndef WIN32
 #include <strings.h>
 #endif
diff --git a/src/XrdOuc/XrdOucSHA3.hh b/src/XrdOuc/XrdOucSHA3.hh
index a3c122a6e0d..712b7994f99 100644
--- a/src/XrdOuc/XrdOucSHA3.hh
+++ b/src/XrdOuc/XrdOucSHA3.hh
@@ -31,7 +31,7 @@
 /******************************************************************************/
 
 #include <stddef.h>
-#include <stdint.h>
+#include <cstdint>
 
 class XrdOucSHA3
 {
diff --git a/src/XrdOuc/XrdOucSiteName.cc b/src/XrdOuc/XrdOucSiteName.cc
index d6a367872ec..e6368ecae17 100644
--- a/src/XrdOuc/XrdOucSiteName.cc
+++ b/src/XrdOuc/XrdOucSiteName.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
 
 #include "XrdOuc/XrdOucEnv.hh"
 #include "XrdOuc/XrdOucSiteName.hh"
diff --git a/src/XrdOuc/XrdOucStream.cc b/src/XrdOuc/XrdOucStream.cc
index 8a224e1c3ef..8460e171f4f 100644
--- a/src/XrdOuc/XrdOucStream.cc
+++ b/src/XrdOuc/XrdOucStream.cc
@@ -27,11 +27,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
+#include <cctype>
 #include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #ifndef WIN32
 #include <poll.h>
 #include <unistd.h>
diff --git a/src/XrdOuc/XrdOucStream.hh b/src/XrdOuc/XrdOucStream.hh
index 77161f7ac29..5ca35615572 100644
--- a/src/XrdOuc/XrdOucStream.hh
+++ b/src/XrdOuc/XrdOucStream.hh
@@ -31,7 +31,7 @@
 
 #include <sys/types.h>
 #include <signal.h>
-#include <stdlib.h>
+#include <cstdlib>
 #ifdef WIN32
 #include "XrdSys/XrdWin32.hh"
 #endif
diff --git a/src/XrdOuc/XrdOucString.cc b/src/XrdOuc/XrdOucString.cc
index 3ec006384a7..c9f69e51e6c 100644
--- a/src/XrdOuc/XrdOucString.cc
+++ b/src/XrdOuc/XrdOucString.cc
@@ -26,8 +26,8 @@
 /*     All Rights Reserved. See XrdInfo.cc for complete License Terms         */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <climits>
 
 #include "XrdOuc/XrdOucString.hh"
diff --git a/src/XrdOuc/XrdOucString.hh b/src/XrdOuc/XrdOucString.hh
index b300162dd95..e2dbe20730d 100644
--- a/src/XrdOuc/XrdOucString.hh
+++ b/src/XrdOuc/XrdOucString.hh
@@ -243,9 +243,9 @@
 /******************************************************************************/
 #include "XrdSys/XrdSysHeaders.hh"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdarg>
 
 using namespace std;
 
diff --git a/src/XrdOuc/XrdOucSxeq.cc b/src/XrdOuc/XrdOucSxeq.cc
index 003bcd2dd54..003807f70cb 100644
--- a/src/XrdOuc/XrdOucSxeq.cc
+++ b/src/XrdOuc/XrdOucSxeq.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
 #include <unistd.h>
 #include <sys/param.h>
diff --git a/src/XrdOuc/XrdOucTList.hh b/src/XrdOuc/XrdOucTList.hh
index 924cbeb81df..98029ab6a7d 100644
--- a/src/XrdOuc/XrdOucTList.hh
+++ b/src/XrdOuc/XrdOucTList.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
   
 /******************************************************************************/
diff --git a/src/XrdOuc/XrdOucTPC.cc b/src/XrdOuc/XrdOucTPC.cc
index b0db0941c6a..4920e281c3f 100644
--- a/src/XrdOuc/XrdOucTPC.cc
+++ b/src/XrdOuc/XrdOucTPC.cc
@@ -29,8 +29,8 @@
 /******************************************************************************/
   
 //#include <iostream>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 
 #include "XrdNet/XrdNetAddr.hh"
diff --git a/src/XrdOuc/XrdOucTPC.hh b/src/XrdOuc/XrdOucTPC.hh
index 9a439d71026..022a6f542c4 100644
--- a/src/XrdOuc/XrdOucTPC.hh
+++ b/src/XrdOuc/XrdOucTPC.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 class XrdOucTPC
 {
diff --git a/src/XrdOuc/XrdOucTable.hh b/src/XrdOuc/XrdOucTable.hh
index bc9505eb952..92058c42b2b 100644
--- a/src/XrdOuc/XrdOucTable.hh
+++ b/src/XrdOuc/XrdOucTable.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 template<class T>
 class XrdOucTable
diff --git a/src/XrdOuc/XrdOucTokenizer.cc b/src/XrdOuc/XrdOucTokenizer.cc
index b51f5584791..c283e5b63ea 100644
--- a/src/XrdOuc/XrdOucTokenizer.cc
+++ b/src/XrdOuc/XrdOucTokenizer.cc
@@ -30,9 +30,9 @@
 #ifndef WIN32
 #include <unistd.h>
 #endif
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdOuc/XrdOucTokenizer.hh"
 
diff --git a/src/XrdOuc/XrdOucUri.cc b/src/XrdOuc/XrdOucUri.cc
index 28e94dbc3b8..b65012a4b0e 100644
--- a/src/XrdOuc/XrdOucUri.cc
+++ b/src/XrdOuc/XrdOucUri.cc
@@ -48,8 +48,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdOuc/XrdOucUri.hh"
 
diff --git a/src/XrdOuc/XrdOucUtils.cc b/src/XrdOuc/XrdOucUtils.cc
index deaf7131ffc..c0173725d4c 100644
--- a/src/XrdOuc/XrdOucUtils.cc
+++ b/src/XrdOuc/XrdOucUtils.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
+#include <cctype>
 #include <grp.h>
-#include <stdio.h>
+#include <cstdio>
 
 #ifdef WIN32
 #include <direct.h>
diff --git a/src/XrdOuc/XrdOucVerName.cc b/src/XrdOuc/XrdOucVerName.cc
index f9f7abbfa1b..450e34e2cb6 100644
--- a/src/XrdOuc/XrdOucVerName.cc
+++ b/src/XrdOuc/XrdOucVerName.cc
@@ -27,9 +27,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
 
 #include "XrdVersionPlugin.hh"
diff --git a/src/XrdOuc/XrdOucXAttr.hh b/src/XrdOuc/XrdOucXAttr.hh
index e2073973db9..2946e94eb02 100644
--- a/src/XrdOuc/XrdOucXAttr.hh
+++ b/src/XrdOuc/XrdOucXAttr.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 
 #include "XrdSys/XrdSysFAttr.hh"
diff --git a/src/XrdOuc/XrdOuca2x.cc b/src/XrdOuc/XrdOuca2x.cc
index f8c08e633e6..d729bc14fad 100644
--- a/src/XrdOuc/XrdOuca2x.cc
+++ b/src/XrdOuc/XrdOuca2x.cc
@@ -27,10 +27,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <sys/stat.h>
-#include <errno.h>
+#include <cerrno>
 
 #ifdef WIN32
 #include "XrdSys/XrdWin32.hh"
diff --git a/src/XrdPfc/XrdPfcBlacklistDecision.cc b/src/XrdPfc/XrdPfcBlacklistDecision.cc
index b62ab43941c..bfd49b889e8 100644
--- a/src/XrdPfc/XrdPfcBlacklistDecision.cc
+++ b/src/XrdPfc/XrdPfcBlacklistDecision.cc
@@ -21,7 +21,7 @@
 
 #include <vector>
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 #include <fnmatch.h>
 
 class BlacklistDecision : public XrdPfc::Decision
diff --git a/src/XrdPfc/XrdPfcDecision.hh b/src/XrdPfc/XrdPfcDecision.hh
index 3d435ed7559..3f62c87764b 100644
--- a/src/XrdPfc/XrdPfcDecision.hh
+++ b/src/XrdPfc/XrdPfcDecision.hh
@@ -20,7 +20,7 @@
 
 #include <string>
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
 #include "XrdOss/XrdOss.hh"
 
 class XrdSysError;
diff --git a/src/XrdPfc/XrdPfcFile.cc b/src/XrdPfc/XrdPfcFile.cc
index 6b2675e464d..d04b3dc5c21 100644
--- a/src/XrdPfc/XrdPfcFile.cc
+++ b/src/XrdPfc/XrdPfcFile.cc
@@ -20,7 +20,7 @@
 #include "XrdPfcFile.hh"
 #include "XrdPfcIO.hh"
 #include "XrdPfcTrace.hh"
-#include <stdio.h>
+#include <cstdio>
 #include <sstream>
 #include <fcntl.h>
 #include <assert.h>
diff --git a/src/XrdPfc/XrdPfcIOEntireFile.cc b/src/XrdPfc/XrdPfcIOEntireFile.cc
index 865baf836cb..7359257b59d 100644
--- a/src/XrdPfc/XrdPfcIOEntireFile.cc
+++ b/src/XrdPfc/XrdPfcIOEntireFile.cc
@@ -16,7 +16,7 @@
 // along with XRootD.  If not, see <http://www.gnu.org/licenses/>.
 //----------------------------------------------------------------------------------
 
-#include <stdio.h>
+#include <cstdio>
 #include <fcntl.h>
 
 #include "XrdSys/XrdSysError.hh"
diff --git a/src/XrdPfc/XrdPfcIOFileBlock.cc b/src/XrdPfc/XrdPfcIOFileBlock.cc
index 6af2cbe8294..5cf031abefb 100644
--- a/src/XrdPfc/XrdPfcIOFileBlock.cc
+++ b/src/XrdPfc/XrdPfcIOFileBlock.cc
@@ -18,7 +18,7 @@
 
 #include <math.h>
 #include <sstream>
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
 #include <assert.h>
 #include <fcntl.h>
diff --git a/src/XrdPfc/XrdPfcInfo.cc b/src/XrdPfc/XrdPfcInfo.cc
index 492ec84c2ca..394b7e8e743 100644
--- a/src/XrdPfc/XrdPfcInfo.cc
+++ b/src/XrdPfc/XrdPfcInfo.cc
@@ -18,9 +18,9 @@
 
 #include <sys/file.h>
 #include <assert.h>
-#include <time.h>
-#include <string.h>
-#include <stdlib.h>
+#include <ctime>
+#include <cstring>
+#include <cstdlib>
 #include <sys/stat.h>
 
 #include "XrdOss/XrdOss.hh"
diff --git a/src/XrdPfc/XrdPfcInfo.hh b/src/XrdPfc/XrdPfcInfo.hh
index 5f2b7e75359..74e9b42f391 100644
--- a/src/XrdPfc/XrdPfcInfo.hh
+++ b/src/XrdPfc/XrdPfcInfo.hh
@@ -18,8 +18,8 @@
 // along with XRootD.  If not, see <http://www.gnu.org/licenses/>.
 //----------------------------------------------------------------------------------
 
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include <assert.h>
 #include <vector>
 
diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
index 84285f87ea9..0f32dc2eed5 100644
--- a/src/XrdPosix/XrdPosix.cc
+++ b/src/XrdPosix/XrdPosix.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdPosix/XrdPosixAdmin.cc b/src/XrdPosix/XrdPosixAdmin.cc
index bfd1b3d356b..9b13b90a5e5 100644
--- a/src/XrdPosix/XrdPosixAdmin.cc
+++ b/src/XrdPosix/XrdPosixAdmin.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdPosix/XrdPosixCallBack.cc b/src/XrdPosix/XrdPosixCallBack.cc
index 548ad5b1731..4fb958f08f6 100644
--- a/src/XrdPosix/XrdPosixCallBack.cc
+++ b/src/XrdPosix/XrdPosixCallBack.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdPosix/XrdPosixCallBack.hh"
 #include "XrdPosix/XrdPosixFile.hh"
diff --git a/src/XrdPosix/XrdPosixConfig.cc b/src/XrdPosix/XrdPosixConfig.cc
index 4d90df8a84d..51bf9c58c53 100644
--- a/src/XrdPosix/XrdPosixConfig.cc
+++ b/src/XrdPosix/XrdPosixConfig.cc
@@ -32,7 +32,7 @@
 #include <iostream>
 #include <memory>
 #include <set>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/src/XrdPosix/XrdPosixExtern.hh b/src/XrdPosix/XrdPosixExtern.hh
index ce4a0e1770c..befa937aad0 100644
--- a/src/XrdPosix/XrdPosixExtern.hh
+++ b/src/XrdPosix/XrdPosixExtern.hh
@@ -69,7 +69,7 @@ struct statfs;
 struct statvfs;
 
 #include <dirent.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/XrdPosix/XrdPosixExtra.cc b/src/XrdPosix/XrdPosixExtra.cc
index 1f7986ceb64..a77b3e27c3a 100644
--- a/src/XrdPosix/XrdPosixExtra.cc
+++ b/src/XrdPosix/XrdPosixExtra.cc
@@ -30,7 +30,7 @@
 /* Modified by Frank Winklmeier to add the full Posix file system definition. */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdOuc/XrdOucPgrwUtils.hh"
 #include "XrdPosix/XrdPosixCallBack.hh"
diff --git a/src/XrdPosix/XrdPosixExtra.hh b/src/XrdPosix/XrdPosixExtra.hh
index 9b758ec83b2..d15639eaa51 100644
--- a/src/XrdPosix/XrdPosixExtra.hh
+++ b/src/XrdPosix/XrdPosixExtra.hh
@@ -32,7 +32,7 @@
 /* Modified by Frank Winklmeier to add the full Posix file system definition. */
 /******************************************************************************/
 
-#include <stdint.h>
+#include <cstdint>
 #include <unistd.h>
 #include <vector>
 #include <sys/types.h>
diff --git a/src/XrdPosix/XrdPosixFile.cc b/src/XrdPosix/XrdPosixFile.cc
index c17e67b8831..47bae624cb1 100644
--- a/src/XrdPosix/XrdPosixFile.cc
+++ b/src/XrdPosix/XrdPosixFile.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/resource.h>
diff --git a/src/XrdPosix/XrdPosixFile.hh b/src/XrdPosix/XrdPosixFile.hh
index 90207748d92..6925f3508ea 100644
--- a/src/XrdPosix/XrdPosixFile.hh
+++ b/src/XrdPosix/XrdPosixFile.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/param.h>
diff --git a/src/XrdPosix/XrdPosixFileRH.hh b/src/XrdPosix/XrdPosixFileRH.hh
index 8b9fb1d9bb5..799c7e5fc71 100644
--- a/src/XrdPosix/XrdPosixFileRH.hh
+++ b/src/XrdPosix/XrdPosixFileRH.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 #include "Xrd/XrdJob.hh"
diff --git a/src/XrdPosix/XrdPosixInfo.hh b/src/XrdPosix/XrdPosixInfo.hh
index ce1f863ead5..818c462fe7a 100644
--- a/src/XrdPosix/XrdPosixInfo.hh
+++ b/src/XrdPosix/XrdPosixInfo.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/param.h>
 #include <XrdSys/XrdSysPlatform.hh>
 
diff --git a/src/XrdPosix/XrdPosixLinkage.cc b/src/XrdPosix/XrdPosixLinkage.cc
index f7ca56d4823..bf6aab82e42 100644
--- a/src/XrdPosix/XrdPosixLinkage.cc
+++ b/src/XrdPosix/XrdPosixLinkage.cc
@@ -44,7 +44,7 @@
 #include <link.h>
 #endif
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdSys/XrdSysHeaders.hh"
 #include "XrdPosix/XrdPosixLinkage.hh"
diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
index 241222fa79c..9031532524c 100644
--- a/src/XrdPosix/XrdPosixLinkage.hh
+++ b/src/XrdPosix/XrdPosixLinkage.hh
@@ -34,9 +34,9 @@
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 #include "XrdPosix/XrdPosixOsDep.hh"
diff --git a/src/XrdPosix/XrdPosixMap.cc b/src/XrdPosix/XrdPosixMap.cc
index 8b77b8d454d..23075e0a54a 100644
--- a/src/XrdPosix/XrdPosixMap.cc
+++ b/src/XrdPosix/XrdPosixMap.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <sys/stat.h>
 
 #include "XProtocol/XProtocol.hh"
diff --git a/src/XrdPosix/XrdPosixMap.hh b/src/XrdPosix/XrdPosixMap.hh
index b61247988b5..ac2da483a57 100644
--- a/src/XrdPosix/XrdPosixMap.hh
+++ b/src/XrdPosix/XrdPosixMap.hh
@@ -31,7 +31,7 @@
 /* Modified by Frank Winklmeier to add the full Posix file system definition. */
 /******************************************************************************/
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "XrdCl/XrdClFileSystem.hh"
 #include "XrdCl/XrdClXRootDResponses.hh"
diff --git a/src/XrdPosix/XrdPosixObject.cc b/src/XrdPosix/XrdPosixObject.cc
index b944a987f08..60eeca48942 100644
--- a/src/XrdPosix/XrdPosixObject.cc
+++ b/src/XrdPosix/XrdPosixObject.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc
index bc164ab68da..867b7347985 100644
--- a/src/XrdPosix/XrdPosixPreload.cc
+++ b/src/XrdPosix/XrdPosixPreload.cc
@@ -29,9 +29,9 @@
 /******************************************************************************/
 
 #include <sys/types.h>
-#include <stdarg.h>
+#include <cstdarg>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdPosix/XrdPosixLinkage.hh"
 #include "XrdPosix/XrdPosixOsDep.hh"
diff --git a/src/XrdPosix/XrdPosixPreload32.cc b/src/XrdPosix/XrdPosixPreload32.cc
index e7a2a8ea11d..7280dd2ec13 100644
--- a/src/XrdPosix/XrdPosixPreload32.cc
+++ b/src/XrdPosix/XrdPosixPreload32.cc
@@ -42,14 +42,14 @@
 
 #define XRDPOSIXPRELOAD32
 
-#include <errno.h>
+#include <cerrno>
 #include <dirent.h>
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #if defined(__APPLE__) || defined(__FreeBSD__)
 #include <sys/param.h>
diff --git a/src/XrdPosix/XrdPosixStats.hh b/src/XrdPosix/XrdPosixStats.hh
index 71e19d3926b..f55ea0093fa 100644
--- a/src/XrdPosix/XrdPosixStats.hh
+++ b/src/XrdPosix/XrdPosixStats.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdSys/XrdSysAtomics.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdPosix/XrdPosixXrootd.cc b/src/XrdPosix/XrdPosixXrootd.cc
index 6d5315350b3..517dc07ecb4 100644
--- a/src/XrdPosix/XrdPosixXrootd.cc
+++ b/src/XrdPosix/XrdPosixXrootd.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/resource.h>
diff --git a/src/XrdPosix/XrdPosixXrootdPath.cc b/src/XrdPosix/XrdPosixXrootdPath.cc
index 2dfba176403..60a1c238fd7 100644
--- a/src/XrdPosix/XrdPosixXrootdPath.cc
+++ b/src/XrdPosix/XrdPosixXrootdPath.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
 #include <sys/param.h>
 
diff --git a/src/XrdPss/XrdPss.cc b/src/XrdPss/XrdPss.cc
index f6b78928cca..fb7acc3c9c7 100644
--- a/src/XrdPss/XrdPss.cc
+++ b/src/XrdPss/XrdPss.cc
@@ -32,12 +32,12 @@
 /******************************************************************************/
   
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <signal.h>
-#include <stdint.h>
+#include <cstdint>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/file.h>
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/src/XrdPss/XrdPss.hh b/src/XrdPss/XrdPss.hh
index a5f9fd0c69f..fe5bc3ca043 100644
--- a/src/XrdPss/XrdPss.hh
+++ b/src/XrdPss/XrdPss.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <unistd.h>
 #include <sys/types.h>
 #include <vector>
diff --git a/src/XrdPss/XrdPssAio.cc b/src/XrdPss/XrdPssAio.cc
index e6135de5d98..bc532c0aee7 100644
--- a/src/XrdPss/XrdPssAio.cc
+++ b/src/XrdPss/XrdPssAio.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 #include "XrdOuc/XrdOucPgrwUtils.hh"
diff --git a/src/XrdPss/XrdPssAioCB.cc b/src/XrdPss/XrdPssAioCB.cc
index 7c05fc4eb58..5a0f63ad9db 100644
--- a/src/XrdPss/XrdPssAioCB.cc
+++ b/src/XrdPss/XrdPssAioCB.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdPss/XrdPssAioCB.hh"
 #include "XrdSfs/XrdSfsAio.hh"
diff --git a/src/XrdPss/XrdPssAioCB.hh b/src/XrdPss/XrdPssAioCB.hh
index 28e7265e934..29ced0e93e3 100644
--- a/src/XrdPss/XrdPssAioCB.hh
+++ b/src/XrdPss/XrdPssAioCB.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 #include "XrdPosix/XrdPosixCallBack.hh"
diff --git a/src/XrdPss/XrdPssCks.cc b/src/XrdPss/XrdPssCks.cc
index 7230ad3251e..aafe1dff53f 100644
--- a/src/XrdPss/XrdPssCks.cc
+++ b/src/XrdPss/XrdPssCks.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdPss/XrdPss.hh"
 #include "XrdPss/XrdPssCks.hh"
diff --git a/src/XrdPss/XrdPssCks.hh b/src/XrdPss/XrdPssCks.hh
index 56e8f577b51..93abe7f4204 100644
--- a/src/XrdPss/XrdPssCks.hh
+++ b/src/XrdPss/XrdPssCks.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdCks/XrdCks.hh"
 #include "XrdCks/XrdCksData.hh"
diff --git a/src/XrdPss/XrdPssConfig.cc b/src/XrdPss/XrdPssConfig.cc
index 86b34e52037..3c40e397a98 100644
--- a/src/XrdPss/XrdPssConfig.cc
+++ b/src/XrdPss/XrdPssConfig.cc
@@ -29,9 +29,9 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdPss/XrdPssUrlInfo.cc b/src/XrdPss/XrdPssUrlInfo.cc
index 9f0e1d9ba22..f7055a60988 100644
--- a/src/XrdPss/XrdPssUrlInfo.cc
+++ b/src/XrdPss/XrdPssUrlInfo.cc
@@ -29,7 +29,7 @@
 /******************************************************************************/
 
 #include <iostream>
-#include <string.h>
+#include <cstring>
 
 #include "XrdOuc/XrdOucEnv.hh"
 #include "XrdOuc/XrdOucSid.hh"
diff --git a/src/XrdPss/XrdPssUrlInfo.hh b/src/XrdPss/XrdPssUrlInfo.hh
index c1016e4ddd3..e048805f059 100644
--- a/src/XrdPss/XrdPssUrlInfo.hh
+++ b/src/XrdPss/XrdPssUrlInfo.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 class XrdOucEnv;
 
diff --git a/src/XrdPss/XrdPssUtils.cc b/src/XrdPss/XrdPssUtils.cc
index 1ea3fe0173c..be14fa55c9a 100644
--- a/src/XrdPss/XrdPssUtils.cc
+++ b/src/XrdPss/XrdPssUtils.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <strings.h>
 
 #include "XrdPss/XrdPssUtils.hh"
diff --git a/src/XrdRmc/XrdRmc.cc b/src/XrdRmc/XrdRmc.cc
index 32dfb078b4c..2ee75905160 100644
--- a/src/XrdRmc/XrdRmc.cc
+++ b/src/XrdRmc/XrdRmc.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdRmc/XrdRmc.hh"
 #include "XrdRmc/XrdRmcReal.hh"
diff --git a/src/XrdRmc/XrdRmcData.cc b/src/XrdRmc/XrdRmcData.cc
index 1caab56e39a..ea65d494efe 100644
--- a/src/XrdRmc/XrdRmcData.cc
+++ b/src/XrdRmc/XrdRmcData.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdRmc/XrdRmc.hh"
 #include "XrdRmc/XrdRmcData.hh"
diff --git a/src/XrdRmc/XrdRmcReal.cc b/src/XrdRmc/XrdRmcReal.cc
index 54d663b9e5b..24acbbec3f0 100644
--- a/src/XrdRmc/XrdRmcReal.cc
+++ b/src/XrdRmc/XrdRmcReal.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/types.h>
diff --git a/src/XrdSciTokens/vendor/inih/INIReader.h b/src/XrdSciTokens/vendor/inih/INIReader.h
index aace252318a..0c7ec07a248 100644
--- a/src/XrdSciTokens/vendor/inih/INIReader.h
+++ b/src/XrdSciTokens/vendor/inih/INIReader.h
@@ -21,7 +21,7 @@ home page for more info:
 extern "C" {
 #endif
 
-#include <stdio.h>
+#include <cstdio>
 
 /* Typedef for prototype of handler function. */
 typedef int (*ini_handler)(void* user, const char* section,
@@ -109,12 +109,12 @@ home page for more info:
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
+#include <cstdio>
+#include <cctype>
+#include <cstring>
 
 #if !INI_USE_STACK
-#include <stdlib.h>
+#include <cstdlib>
 #endif
 
 #define MAX_SECTION 50
diff --git a/src/XrdSciTokens/vendor/picojson/picojson.h b/src/XrdSciTokens/vendor/picojson/picojson.h
index 20d406cc57a..30f439b5790 100644
--- a/src/XrdSciTokens/vendor/picojson/picojson.h
+++ b/src/XrdSciTokens/vendor/picojson/picojson.h
@@ -76,8 +76,8 @@ extern "C" {
 // experimental support for int64_t (see README.mkdn for detail)
 #ifdef PICOJSON_USE_INT64
 #define __STDC_FORMAT_MACROS
-#include <errno.h>
-#include <inttypes.h>
+#include <cerrno>
+#include <cinttypes>
 #endif
 
 // to disable the use of localeconv(3), set PICOJSON_USE_LOCALE to 0
diff --git a/src/XrdSciTokens/vendor/picojson/picotest/picotest.c b/src/XrdSciTokens/vendor/picojson/picotest/picotest.c
index d1fe699d5a3..26af903dc46 100644
--- a/src/XrdSciTokens/vendor/picojson/picotest/picotest.c
+++ b/src/XrdSciTokens/vendor/picojson/picotest/picotest.c
@@ -19,9 +19,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstring>
 #include "picotest.h"
 
 struct test_t {
diff --git a/src/XrdSec/XrdSecClient.cc b/src/XrdSec/XrdSecClient.cc
index 04563de4e6f..12337306482 100644
--- a/src/XrdSec/XrdSecClient.cc
+++ b/src/XrdSec/XrdSecClient.cc
@@ -29,12 +29,12 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include <iomanip>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdSec/XrdSecEntity.cc b/src/XrdSec/XrdSecEntity.cc
index c5a7eeef04f..c938027b12e 100644
--- a/src/XrdSec/XrdSecEntity.cc
+++ b/src/XrdSec/XrdSecEntity.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdSec/XrdSecEntity.hh"
 #include "XrdSec/XrdSecEntityXtra.hh"
diff --git a/src/XrdSec/XrdSecEntityAttr.cc b/src/XrdSec/XrdSecEntityAttr.cc
index 017138f625e..d7a3d3233ec 100644
--- a/src/XrdSec/XrdSecEntityAttr.cc
+++ b/src/XrdSec/XrdSecEntityAttr.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <vector>
 
 #include "XrdSec/XrdSecAttr.hh"
diff --git a/src/XrdSec/XrdSecEntityXtra.hh b/src/XrdSec/XrdSecEntityXtra.hh
index 2c5ebbd201c..a13cc39aca2 100644
--- a/src/XrdSec/XrdSecEntityXtra.hh
+++ b/src/XrdSec/XrdSecEntityXtra.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <map>
-#include <string.h>
+#include <cstring>
 #include <vector>
 
 #include "XrdSec/XrdSecEntityAttr.hh"
diff --git a/src/XrdSec/XrdSecInterface.hh b/src/XrdSec/XrdSecInterface.hh
index 190c4d4a6e5..53fe8fe83d0 100644
--- a/src/XrdSec/XrdSecInterface.hh
+++ b/src/XrdSec/XrdSecInterface.hh
@@ -29,13 +29,13 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #ifndef WIN32
 #include <sys/param.h>
 #endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdSec/XrdSecEntity.hh"
 
diff --git a/src/XrdSec/XrdSecPManager.cc b/src/XrdSec/XrdSecPManager.cc
index 493dea1a207..39e30b0895b 100644
--- a/src/XrdSec/XrdSecPManager.cc
+++ b/src/XrdSec/XrdSecPManager.cc
@@ -29,11 +29,11 @@
 /******************************************************************************/
 
 #include <string>
-#include <string.h>
+#include <cstring>
 #include <strings.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdVersion.hh"
 #include "XrdVersionPlugin.hh"
diff --git a/src/XrdSec/XrdSecProtect.cc b/src/XrdSec/XrdSecProtect.cc
index 951565d7023..409fb27c1cd 100644
--- a/src/XrdSec/XrdSecProtect.cc
+++ b/src/XrdSec/XrdSecProtect.cc
@@ -27,10 +27,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <inttypes.h>
+#include <cinttypes>
 #include <netinet/in.h>
-#include <stdarg.h>
-#include <string.h>
+#include <cstdarg>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/uio.h>
 
diff --git a/src/XrdSec/XrdSecProtector.cc b/src/XrdSec/XrdSecProtector.cc
index 46fa842e871..3d05201dd7d 100644
--- a/src/XrdSec/XrdSecProtector.cc
+++ b/src/XrdSec/XrdSecProtector.cc
@@ -27,9 +27,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <inttypes.h>
-#include <string.h>
+#include <cerrno>
+#include <cinttypes>
+#include <cstring>
 #include <sys/types.h>
 
 #include "XrdVersion.hh"
diff --git a/src/XrdSec/XrdSecProtocolhost.cc b/src/XrdSec/XrdSecProtocolhost.cc
index 7b6a22fd449..7dcb456e69d 100644
--- a/src/XrdSec/XrdSecProtocolhost.cc
+++ b/src/XrdSec/XrdSecProtocolhost.cc
@@ -29,7 +29,7 @@
 /******************************************************************************/
 
 #include <strings.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdSec/XrdSecProtocolhost.hh"
 
diff --git a/src/XrdSec/XrdSecProtocolhost.hh b/src/XrdSec/XrdSecProtocolhost.hh
index 8796cc0b8ef..bd55d916884 100644
--- a/src/XrdSec/XrdSecProtocolhost.hh
+++ b/src/XrdSec/XrdSecProtocolhost.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <strings.h>
 
 #include "XrdNet/XrdNetAddrInfo.hh"
diff --git a/src/XrdSec/XrdSecServer.cc b/src/XrdSec/XrdSecServer.cc
index 8b6c3c8904c..b027470cc87 100644
--- a/src/XrdSec/XrdSecServer.cc
+++ b/src/XrdSec/XrdSecServer.cc
@@ -29,13 +29,13 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <fcntl.h>
 #include <netdb.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 
 #include "XrdVersion.hh"
diff --git a/src/XrdSec/XrdSecTLayer.cc b/src/XrdSec/XrdSecTLayer.cc
index 2a04f21cb25..8d5b42fb618 100644
--- a/src/XrdSec/XrdSecTLayer.cc
+++ b/src/XrdSec/XrdSecTLayer.cc
@@ -33,7 +33,7 @@
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <poll.h>
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 
 #include "XrdOuc/XrdOucErrInfo.hh"
diff --git a/src/XrdSec/XrdSectestClient.cc b/src/XrdSec/XrdSectestClient.cc
index 9ce1d66e268..7748ffd061f 100644
--- a/src/XrdSec/XrdSectestClient.cc
+++ b/src/XrdSec/XrdSectestClient.cc
@@ -34,11 +34,11 @@
 */
   
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include <sys/param.h>
 
 #include "XrdNet/XrdNetAddr.hh"
diff --git a/src/XrdSec/XrdSectestServer.cc b/src/XrdSec/XrdSectestServer.cc
index 52ca45d40a6..fbdb059e250 100644
--- a/src/XrdSec/XrdSectestServer.cc
+++ b/src/XrdSec/XrdSectestServer.cc
@@ -29,10 +29,10 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cstdlib>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 
 #include "XrdNet/XrdNetAddr.hh"
diff --git a/src/XrdSecgsi/XrdSecProtocolgsi.cc b/src/XrdSecgsi/XrdSecProtocolgsi.cc
index 2546793158f..c597a4ca3a5 100644
--- a/src/XrdSecgsi/XrdSecProtocolgsi.cc
+++ b/src/XrdSecgsi/XrdSecProtocolgsi.cc
@@ -27,11 +27,11 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <pwd.h>
 #include <sys/types.h>
diff --git a/src/XrdSecgsi/XrdSecProtocolgsi.hh b/src/XrdSecgsi/XrdSecProtocolgsi.hh
index 734f7bf972b..0a9054d18d5 100644
--- a/src/XrdSecgsi/XrdSecProtocolgsi.hh
+++ b/src/XrdSecgsi/XrdSecProtocolgsi.hh
@@ -25,7 +25,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /*                                                                            */
 /******************************************************************************/
-#include <time.h>
+#include <ctime>
 
 #include "XrdNet/XrdNetAddrInfo.hh"
 
diff --git a/src/XrdSecgsi/XrdSecgsiAuthzFunDN.cc b/src/XrdSecgsi/XrdSecgsiAuthzFunDN.cc
index c07238148bf..2c2290f40eb 100644
--- a/src/XrdSecgsi/XrdSecgsiAuthzFunDN.cc
+++ b/src/XrdSecgsi/XrdSecgsiAuthzFunDN.cc
@@ -32,10 +32,10 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
 
 #include "XrdVersion.hh"
 
diff --git a/src/XrdSecgsi/XrdSecgsiAuthzFunVO.cc b/src/XrdSecgsi/XrdSecgsiAuthzFunVO.cc
index ad16847e674..e974ed7e0d9 100644
--- a/src/XrdSecgsi/XrdSecgsiAuthzFunVO.cc
+++ b/src/XrdSecgsi/XrdSecgsiAuthzFunVO.cc
@@ -65,9 +65,9 @@
                     not touched and is as set by the gsi module.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 
 #include "XrdVersion.hh"
diff --git a/src/XrdSecgsi/XrdSecgsiGMAPFunDN.cc b/src/XrdSecgsi/XrdSecgsiGMAPFunDN.cc
index 9ede9e68981..38835f0e316 100644
--- a/src/XrdSecgsi/XrdSecgsiGMAPFunDN.cc
+++ b/src/XrdSecgsi/XrdSecgsiGMAPFunDN.cc
@@ -32,10 +32,10 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
 
 #include "XrdVersion.hh"
 
diff --git a/src/XrdSecgsi/XrdSecgsiProxy.cc b/src/XrdSecgsi/XrdSecgsiProxy.cc
index 96cf9b39fc0..4b397874064 100644
--- a/src/XrdSecgsi/XrdSecgsiProxy.cc
+++ b/src/XrdSecgsi/XrdSecgsiProxy.cc
@@ -32,15 +32,15 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <pwd.h>
-#include <time.h>
+#include <ctime>
 
 
 #include "XrdOuc/XrdOucString.hh"
diff --git a/src/XrdSecgsi/XrdSecgsitest.cc b/src/XrdSecgsi/XrdSecgsitest.cc
index 7bf4cf0cd20..41a3b679abf 100644
--- a/src/XrdSecgsi/XrdSecgsitest.cc
+++ b/src/XrdSecgsi/XrdSecgsitest.cc
@@ -30,9 +30,9 @@
 //  Test program for XrdSecgsi
 //
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include <sys/types.h>
 #include <pwd.h>
diff --git a/src/XrdSeckrb5/XrdSecProtocolkrb5.cc b/src/XrdSeckrb5/XrdSecProtocolkrb5.cc
index f378a90ab80..0bca2731eba 100644
--- a/src/XrdSeckrb5/XrdSecProtocolkrb5.cc
+++ b/src/XrdSeckrb5/XrdSecProtocolkrb5.cc
@@ -32,11 +32,11 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <pwd.h>
 #include <sys/types.h>
diff --git a/src/XrdSecpwd/XrdSecProtocolpwd.cc b/src/XrdSecpwd/XrdSecProtocolpwd.cc
index ba7de4469de..aa89bf21172 100644
--- a/src/XrdSecpwd/XrdSecProtocolpwd.cc
+++ b/src/XrdSecpwd/XrdSecProtocolpwd.cc
@@ -27,11 +27,11 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <pwd.h>
 #include <sys/types.h>
diff --git a/src/XrdSecpwd/XrdSecpwdSrvAdmin.cc b/src/XrdSecpwd/XrdSecpwdSrvAdmin.cc
index 7620a98544d..fe839aaa3fa 100644
--- a/src/XrdSecpwd/XrdSecpwdSrvAdmin.cc
+++ b/src/XrdSecpwd/XrdSecpwdSrvAdmin.cc
@@ -72,15 +72,15 @@
 //                                                                        //
 //  Author: G.Ganis, 2005                                                 //
 // ---------------------------------------------------------------------- //
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 #include <pwd.h>
 #include <dirent.h>
 
diff --git a/src/XrdSecsss/XrdSecProtocolsss.cc b/src/XrdSecsss/XrdSecProtocolsss.cc
index fe5e9eeb254..21dd5b4cfa1 100644
--- a/src/XrdSecsss/XrdSecProtocolsss.cc
+++ b/src/XrdSecsss/XrdSecProtocolsss.cc
@@ -29,12 +29,12 @@
 /******************************************************************************/
 
 #include <alloca.h>
-#include <ctype.h>
+#include <cctype>
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/param.h>
 #include <unistd.h>
 
diff --git a/src/XrdSecsss/XrdSecsssAdmin.cc b/src/XrdSecsss/XrdSecsssAdmin.cc
index 5a504af96f5..544177ed493 100644
--- a/src/XrdSecsss/XrdSecsssAdmin.cc
+++ b/src/XrdSecsss/XrdSecsssAdmin.cc
@@ -28,13 +28,13 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <ctype.h>
+#include <cctype>
 #include <iostream>
 #include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <fcntl.h>
-#include <time.h>
+#include <ctime>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdSecsss/XrdSecsssEnt.hh b/src/XrdSecsss/XrdSecsssEnt.hh
index 084cc78821d..b3c4b03697d 100644
--- a/src/XrdSecsss/XrdSecsssEnt.hh
+++ b/src/XrdSecsss/XrdSecsssEnt.hh
@@ -32,7 +32,7 @@
 
 #include <set>
 #include <string>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdSys/XrdSysAtomics.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdSecsss/XrdSecsssID.cc b/src/XrdSecsss/XrdSecsssID.cc
index 292aab66fdd..7616211bf57 100644
--- a/src/XrdSecsss/XrdSecsssID.cc
+++ b/src/XrdSecsss/XrdSecsssID.cc
@@ -31,9 +31,9 @@
 #include <iostream>
 #include <map>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <pwd.h>
 #include <sys/types.h>
 
diff --git a/src/XrdSecsss/XrdSecsssKT.cc b/src/XrdSecsss/XrdSecsssKT.cc
index 7e13042cb0f..38b1ada15ab 100644
--- a/src/XrdSecsss/XrdSecsssKT.cc
+++ b/src/XrdSecsss/XrdSecsssKT.cc
@@ -30,10 +30,10 @@
 
 #include <fcntl.h>
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
 #include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdSecsss/XrdSecsssKT.hh b/src/XrdSecsss/XrdSecsssKT.hh
index a2bdb792793..a5441fb1c0c 100644
--- a/src/XrdSecsss/XrdSecsssKT.hh
+++ b/src/XrdSecsss/XrdSecsssKT.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <string.h>
-#include <time.h>
+#include <cstring>
+#include <ctime>
 #include "XrdSys/XrdSysPthread.hh"
 
 class XrdOucErrInfo;
diff --git a/src/XrdSecsss/XrdSecsssRR.hh b/src/XrdSecsss/XrdSecsssRR.hh
index c6c5e698512..f8fe346169f 100644
--- a/src/XrdSecsss/XrdSecsssRR.hh
+++ b/src/XrdSecsss/XrdSecsssRR.hh
@@ -30,9 +30,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdint.h>
-#include <string.h>
-#include <time.h>
+#include <cstdint>
+#include <cstring>
+#include <ctime>
 
 #include "XrdSecsss/XrdSecsssKT.hh"
 
diff --git a/src/XrdSecunix/XrdSecProtocolunix.cc b/src/XrdSecunix/XrdSecProtocolunix.cc
index 875b0f22747..d9a1c8bea30 100644
--- a/src/XrdSecunix/XrdSecProtocolunix.cc
+++ b/src/XrdSecunix/XrdSecProtocolunix.cc
@@ -29,9 +29,9 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
 #include <strings.h>
 #include <sys/types.h>
 
diff --git a/src/XrdSecztn/XrdSecProtocolztn.cc b/src/XrdSecztn/XrdSecProtocolztn.cc
index 4f555772f01..ba689c11696 100644
--- a/src/XrdSecztn/XrdSecProtocolztn.cc
+++ b/src/XrdSecztn/XrdSecProtocolztn.cc
@@ -31,17 +31,17 @@
 #define __STDC_FORMAT_MACROS 1
 #include <alloca.h>
 #include <unistd.h>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
 #include <fcntl.h>
-#include <inttypes.h>
+#include <cinttypes>
 #include <iostream>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <strings.h>
-#include <time.h>
+#include <ctime>
 #include <vector>
 #include <arpa/inet.h>
 #include <sys/stat.h>
diff --git a/src/XrdSecztn/XrdSecztn.cc b/src/XrdSecztn/XrdSecztn.cc
index 87182678460..dcb955e1f58 100644
--- a/src/XrdSecztn/XrdSecztn.cc
+++ b/src/XrdSecztn/XrdSecztn.cc
@@ -26,8 +26,8 @@
 // https://github.com/pokowaka/jwt-cpp
 
 #include <alloca.h>
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>
 
 #define WHITESPACE 64
 #define EQUALS 65
diff --git a/src/XrdSfs/XrdSfsFAttr.hh b/src/XrdSfs/XrdSfsFAttr.hh
index e0b8cb6039a..496d060f93a 100644
--- a/src/XrdSfs/XrdSfsFAttr.hh
+++ b/src/XrdSfs/XrdSfsFAttr.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 //-----------------------------------------------------------------------------
 //! This include file defines control strucres used to drive entended file
diff --git a/src/XrdSfs/XrdSfsInterface.cc b/src/XrdSfs/XrdSfsInterface.cc
index fca3ad8d3fc..02a91e1ba63 100644
--- a/src/XrdSfs/XrdSfsInterface.cc
+++ b/src/XrdSfs/XrdSfsInterface.cc
@@ -28,7 +28,7 @@
 /******************************************************************************/
 
 #include <cassert>
-#include <stdio.h>
+#include <cstdio>
 #include <arpa/inet.h>
 
 #include "XrdOuc/XrdOucPgrwUtils.hh"
diff --git a/src/XrdSfs/XrdSfsInterface.hh b/src/XrdSfs/XrdSfsInterface.hh
index 301144cd232..b0da000a3bf 100644
--- a/src/XrdSfs/XrdSfsInterface.hh
+++ b/src/XrdSfs/XrdSfsInterface.hh
@@ -29,8 +29,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>      // For strlcpy()
-#include <errno.h>
+#include <cstring>      // For strlcpy()
+#include <cerrno>
 #include <cstdint>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdSfs/XrdSfsNative.cc b/src/XrdSfs/XrdSfsNative.cc
index 3922dbc61de..f1404292d74 100644
--- a/src/XrdSfs/XrdSfsNative.cc
+++ b/src/XrdSfs/XrdSfsNative.cc
@@ -32,9 +32,9 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <memory.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/src/XrdSfs/XrdSfsNative.hh b/src/XrdSfs/XrdSfsNative.hh
index 89c153ec487..3b80015f23a 100644
--- a/src/XrdSfs/XrdSfsNative.hh
+++ b/src/XrdSfs/XrdSfsNative.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <sys/types.h>
-#include <string.h>
+#include <cstring>
 #include <dirent.h>
   
 #include "XrdSfs/XrdSfsInterface.hh"
diff --git a/src/XrdSsi/XrdSsiAlert.cc b/src/XrdSsi/XrdSsiAlert.cc
index 1217a7415ee..6efa0a6c544 100644
--- a/src/XrdSsi/XrdSsiAlert.cc
+++ b/src/XrdSsi/XrdSsiAlert.cc
@@ -29,7 +29,7 @@
 /******************************************************************************/
 
 #include <cstddef>
-#include <string.h>
+#include <cstring>
 #include <sys/uio.h>
 
 #include "XrdOuc/XrdOucErrInfo.hh"
diff --git a/src/XrdSsi/XrdSsiAtomics.hh b/src/XrdSsi/XrdSsiAtomics.hh
index 151f2b62818..45e0a3e112e 100644
--- a/src/XrdSsi/XrdSsiAtomics.hh
+++ b/src/XrdSsi/XrdSsiAtomics.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #undef NEED_ATOMIC_MUTEX
 
diff --git a/src/XrdSsi/XrdSsiBVec.hh b/src/XrdSsi/XrdSsiBVec.hh
index 1a484dd2145..3e32f8d70eb 100644
--- a/src/XrdSsi/XrdSsiBVec.hh
+++ b/src/XrdSsi/XrdSsiBVec.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <set>
-#include <stdint.h>
+#include <cstdint>
   
 class XrdSsiBVec
 {
diff --git a/src/XrdSsi/XrdSsiClient.cc b/src/XrdSsi/XrdSsiClient.cc
index 83f4e856f2e..c386206e43e 100644
--- a/src/XrdSsi/XrdSsiClient.cc
+++ b/src/XrdSsi/XrdSsiClient.cc
@@ -27,12 +27,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
-#include <string.h>
-#include <time.h>
+#include <cstring>
+#include <ctime>
 #include <unistd.h>
 #include <sys/types.h>
   
diff --git a/src/XrdSsi/XrdSsiCms.cc b/src/XrdSsi/XrdSsiCms.cc
index b906f3facf6..694708033dd 100644
--- a/src/XrdSsi/XrdSsiCms.cc
+++ b/src/XrdSsi/XrdSsiCms.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdOuc/XrdOucTList.hh"
 
diff --git a/src/XrdSsi/XrdSsiDir.cc b/src/XrdSsi/XrdSsiDir.cc
index 3b10091f62b..e76518226ee 100644
--- a/src/XrdSsi/XrdSsiDir.cc
+++ b/src/XrdSsi/XrdSsiDir.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 #include "XrdOuc/XrdOucPList.hh"
 #include "XrdSsi/XrdSsiDir.hh"
diff --git a/src/XrdSsi/XrdSsiEntity.hh b/src/XrdSsi/XrdSsiEntity.hh
index 3cdd247990d..cb205f90e29 100644
--- a/src/XrdSsi/XrdSsiEntity.hh
+++ b/src/XrdSsi/XrdSsiEntity.hh
@@ -36,7 +36,7 @@
 //! This object, if supplied, is only supplied server-side.
 //------------------------------------------------------------------------------
 
-#include <string.h>
+#include <cstring>
 
 #define XrdSsiPROTOIDSIZE 8
 
diff --git a/src/XrdSsi/XrdSsiErrInfo.hh b/src/XrdSsi/XrdSsiErrInfo.hh
index d36529fbe61..c4bc17330f4 100644
--- a/src/XrdSsi/XrdSsiErrInfo.hh
+++ b/src/XrdSsi/XrdSsiErrInfo.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <string>
-#include <string.h>
+#include <cstring>
   
 //-----------------------------------------------------------------------------
 //! The XrdSsiErrInfo object is used to hold error information for many ssi
diff --git a/src/XrdSsi/XrdSsiFile.cc b/src/XrdSsi/XrdSsiFile.cc
index ea8cff27ae6..760fd833326 100644
--- a/src/XrdSsi/XrdSsiFile.cc
+++ b/src/XrdSsi/XrdSsiFile.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdSsi/XrdSsiFile.hh b/src/XrdSsi/XrdSsiFile.hh
index d35ac23bc1b..e5af8bc024a 100644
--- a/src/XrdSsi/XrdSsiFile.hh
+++ b/src/XrdSsi/XrdSsiFile.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 
 #include "XrdSfs/XrdSfsInterface.hh"
diff --git a/src/XrdSsi/XrdSsiFileReq.cc b/src/XrdSsi/XrdSsiFileReq.cc
index 52d575003f8..4f6121ff7ac 100644
--- a/src/XrdSsi/XrdSsiFileReq.cc
+++ b/src/XrdSsi/XrdSsiFileReq.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <arpa/inet.h>
 #include <sys/types.h>
 
diff --git a/src/XrdSsi/XrdSsiFileReq.hh b/src/XrdSsi/XrdSsiFileReq.hh
index 167fe7452d5..d8b49559e80 100644
--- a/src/XrdSsi/XrdSsiFileReq.hh
+++ b/src/XrdSsi/XrdSsiFileReq.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 
 #include "Xrd/XrdJob.hh"
diff --git a/src/XrdSsi/XrdSsiFileResource.cc b/src/XrdSsi/XrdSsiFileResource.cc
index 809c126589a..1ca8d6c770c 100644
--- a/src/XrdSsi/XrdSsiFileResource.cc
+++ b/src/XrdSsi/XrdSsiFileResource.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdOuc/XrdOucEnv.hh"
 
diff --git a/src/XrdSsi/XrdSsiFileResource.hh b/src/XrdSsi/XrdSsiFileResource.hh
index cb88e0f073a..1412b29cbdb 100644
--- a/src/XrdSsi/XrdSsiFileResource.hh
+++ b/src/XrdSsi/XrdSsiFileResource.hh
@@ -29,9 +29,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdSsi/XrdSsiEntity.hh"
 #include "XrdSsi/XrdSsiResource.hh"
diff --git a/src/XrdSsi/XrdSsiFileSess.cc b/src/XrdSsi/XrdSsiFileSess.cc
index bcb7f70626d..7b86ca83e71 100644
--- a/src/XrdSsi/XrdSsiFileSess.cc
+++ b/src/XrdSsi/XrdSsiFileSess.cc
@@ -29,8 +29,8 @@
 
 #include <fcntl.h>
 #include <stddef.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdSsi/XrdSsiFileSess.hh b/src/XrdSsi/XrdSsiFileSess.hh
index 6f7e4c6c7a0..2aad6d9faa3 100644
--- a/src/XrdSsi/XrdSsiFileSess.hh
+++ b/src/XrdSsi/XrdSsiFileSess.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 
 #include "XrdSfs/XrdSfsInterface.hh"
diff --git a/src/XrdSsi/XrdSsiLogger.cc b/src/XrdSsi/XrdSsiLogger.cc
index e8d11424b9c..01cfcda5beb 100644
--- a/src/XrdSsi/XrdSsiLogger.cc
+++ b/src/XrdSsi/XrdSsiLogger.cc
@@ -28,8 +28,8 @@
 /******************************************************************************/
 
 #include <fcntl.h>
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/src/XrdSsi/XrdSsiLogger.hh b/src/XrdSsi/XrdSsiLogger.hh
index 79a96e128b6..282c774a7d4 100644
--- a/src/XrdSsi/XrdSsiLogger.hh
+++ b/src/XrdSsi/XrdSsiLogger.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdarg.h>
+#include <cstdarg>
  
 //-----------------------------------------------------------------------------
 //! The XrdSsiLogger object is used to route messages to the default log file.
diff --git a/src/XrdSsi/XrdSsiLogging.cc b/src/XrdSsi/XrdSsiLogging.cc
index 8eab95c5006..9dddd51ff4e 100644
--- a/src/XrdSsi/XrdSsiLogging.cc
+++ b/src/XrdSsi/XrdSsiLogging.cc
@@ -29,8 +29,8 @@
 
 #include <fcntl.h>
 #include <iostream>
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/src/XrdSsi/XrdSsiProvider.hh b/src/XrdSsi/XrdSsiProvider.hh
index 6065c5c7c8c..63493771983 100644
--- a/src/XrdSsi/XrdSsiProvider.hh
+++ b/src/XrdSsi/XrdSsiProvider.hh
@@ -76,7 +76,7 @@
 //! Warning! All methods (except Init()) in this class must be thread-safe.
 //-----------------------------------------------------------------------------
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdSsi/XrdSsiErrInfo.hh"
 #include "XrdSsi/XrdSsiResource.hh"
diff --git a/src/XrdSsi/XrdSsiRRTable.hh b/src/XrdSsi/XrdSsiRRTable.hh
index cc28b388a9b..cddf5728cd8 100644
--- a/src/XrdSsi/XrdSsiRRTable.hh
+++ b/src/XrdSsi/XrdSsiRRTable.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <map>
-#include <stdint.h>
+#include <cstdint>
 
 #include "XrdSsi/XrdSsiAtomics.hh"
   
diff --git a/src/XrdSsi/XrdSsiRequest.cc b/src/XrdSsi/XrdSsiRequest.cc
index ce914e973e7..d52391f879b 100644
--- a/src/XrdSsi/XrdSsiRequest.cc
+++ b/src/XrdSsi/XrdSsiRequest.cc
@@ -27,9 +27,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdSsi/XrdSsiRespInfo.hh"
 #include "XrdSsi/XrdSsiResponder.hh"
diff --git a/src/XrdSsi/XrdSsiRequest.hh b/src/XrdSsi/XrdSsiRequest.hh
index f722b2fa1b0..feed3db4d3f 100644
--- a/src/XrdSsi/XrdSsiRequest.hh
+++ b/src/XrdSsi/XrdSsiRequest.hh
@@ -29,9 +29,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdSsi/XrdSsiAtomics.hh"
 #include "XrdSsi/XrdSsiErrInfo.hh"
diff --git a/src/XrdSsi/XrdSsiResource.hh b/src/XrdSsi/XrdSsiResource.hh
index 36481b6a91d..f075e654b95 100644
--- a/src/XrdSsi/XrdSsiResource.hh
+++ b/src/XrdSsi/XrdSsiResource.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
   
 //-----------------------------------------------------------------------------
diff --git a/src/XrdSsi/XrdSsiResponder.hh b/src/XrdSsi/XrdSsiResponder.hh
index f1a73835946..7f446645c42 100644
--- a/src/XrdSsi/XrdSsiResponder.hh
+++ b/src/XrdSsi/XrdSsiResponder.hh
@@ -29,8 +29,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdSsi/XrdSsiRequest.hh"
 
diff --git a/src/XrdSsi/XrdSsiScale.cc b/src/XrdSsi/XrdSsiScale.cc
index b836412e44a..67788d8c248 100644
--- a/src/XrdSsi/XrdSsiScale.cc
+++ b/src/XrdSsi/XrdSsiScale.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdSsi/XrdSsiScale.hh"
 #include "XrdSys/XrdSysError.hh"
diff --git a/src/XrdSsi/XrdSsiScale.hh b/src/XrdSsi/XrdSsiScale.hh
index 4e6801efb23..26a8d7f8c8d 100644
--- a/src/XrdSsi/XrdSsiScale.hh
+++ b/src/XrdSsi/XrdSsiScale.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <cstdint>
-#include <string.h>
+#include <cstring>
 
 #include "XrdSys/XrdSysPthread.hh"
 
diff --git a/src/XrdSsi/XrdSsiServReal.cc b/src/XrdSsi/XrdSsiServReal.cc
index c019d3eb478..37456debfe0 100644
--- a/src/XrdSsi/XrdSsiServReal.cc
+++ b/src/XrdSsi/XrdSsiServReal.cc
@@ -27,9 +27,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
   
 #include "XrdSsi/XrdSsiResource.hh"
 #include "XrdSsi/XrdSsiRRAgent.hh"
diff --git a/src/XrdSsi/XrdSsiService.hh b/src/XrdSsi/XrdSsiService.hh
index f8a6a91c7d5..73fec21407d 100644
--- a/src/XrdSsi/XrdSsiService.hh
+++ b/src/XrdSsi/XrdSsiService.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdint.h>
+#include <cstdint>
 #include <string>
   
 //-----------------------------------------------------------------------------
diff --git a/src/XrdSsi/XrdSsiSessReal.cc b/src/XrdSsi/XrdSsiSessReal.cc
index 1966315c942..279321086c2 100644
--- a/src/XrdSsi/XrdSsiSessReal.cc
+++ b/src/XrdSsi/XrdSsiSessReal.cc
@@ -27,11 +27,11 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cerrno>
+#include <cinttypes>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <string>
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/src/XrdSsi/XrdSsiSessReal.hh b/src/XrdSsi/XrdSsiSessReal.hh
index 4afef9ff5d2..0e250ecf058 100644
--- a/src/XrdSsi/XrdSsiSessReal.hh
+++ b/src/XrdSsi/XrdSsiSessReal.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdCl/XrdClFile.hh"
 
diff --git a/src/XrdSsi/XrdSsiSfs.cc b/src/XrdSsi/XrdSsiSfs.cc
index 3b3e6b48858..81fadce25d6 100644
--- a/src/XrdSsi/XrdSsiSfs.cc
+++ b/src/XrdSsi/XrdSsiSfs.cc
@@ -29,14 +29,14 @@
 
 #include <unistd.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <memory.h>
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
+#include <cstring>
+#include <cstdio>
+#include <ctime>
 #include <netdb.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/src/XrdSsi/XrdSsiSfsConfig.cc b/src/XrdSsi/XrdSsiSfsConfig.cc
index 94ca471cc2b..cfe4435dee2 100644
--- a/src/XrdSsi/XrdSsiSfsConfig.cc
+++ b/src/XrdSsi/XrdSsiSfsConfig.cc
@@ -28,11 +28,11 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 #include <string>
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/src/XrdSsi/XrdSsiShMam.cc b/src/XrdSsi/XrdSsiShMam.cc
index 0ef76b859c8..5542b0a8d2e 100644
--- a/src/XrdSsi/XrdSsiShMam.cc
+++ b/src/XrdSsi/XrdSsiShMam.cc
@@ -28,11 +28,11 @@
 /******************************************************************************/
 
 #include <fcntl.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/mman.h>
diff --git a/src/XrdSsi/XrdSsiShMap.hh b/src/XrdSsi/XrdSsiShMap.hh
index 5d63a19dcea..b2b3537751d 100644
--- a/src/XrdSsi/XrdSsiShMap.hh
+++ b/src/XrdSsi/XrdSsiShMap.hh
@@ -29,8 +29,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdSsi/XrdSsiShMat.hh"
 
diff --git a/src/XrdSsi/XrdSsiShMap.icc b/src/XrdSsi/XrdSsiShMap.icc
index e24614e888e..0fdddb4a0cd 100644
--- a/src/XrdSsi/XrdSsiShMap.icc
+++ b/src/XrdSsi/XrdSsiShMap.icc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 /******************************************************************************/
 /*                                   A d d                                    */
diff --git a/src/XrdSsi/XrdSsiShMat.cc b/src/XrdSsi/XrdSsiShMat.cc
index a5cb573f5bf..482d9c0eb5c 100644
--- a/src/XrdSsi/XrdSsiShMat.cc
+++ b/src/XrdSsi/XrdSsiShMat.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdSsi/XrdSsiShMat.hh"
 #include "XrdSsi/XrdSsiShMam.hh"
diff --git a/src/XrdSsi/XrdSsiShMat.hh b/src/XrdSsi/XrdSsiShMat.hh
index 1155cedf02d..aed390d2adf 100644
--- a/src/XrdSsi/XrdSsiShMat.hh
+++ b/src/XrdSsi/XrdSsiShMat.hh
@@ -29,8 +29,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 //-----------------------------------------------------------------------------
 //! This class defines an abstract interface to a generic shared memory table
diff --git a/src/XrdSsi/XrdSsiStat.cc b/src/XrdSsi/XrdSsiStat.cc
index 610ad529f6f..21ff9078cae 100644
--- a/src/XrdSsi/XrdSsiStat.cc
+++ b/src/XrdSsi/XrdSsiStat.cc
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdVersion.hh"
 #include "XrdOss/XrdOss.hh"
diff --git a/src/XrdSsi/XrdSsiStats.cc b/src/XrdSsi/XrdSsiStats.cc
index f3b58596a5f..7d65625d0c7 100644
--- a/src/XrdSsi/XrdSsiStats.cc
+++ b/src/XrdSsi/XrdSsiStats.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
  
-#include <stdio.h>
+#include <cstdio>
   
 #include "XrdSfs/XrdSfsInterface.hh"
 #include "XrdSsi/XrdSsiStats.hh"
diff --git a/src/XrdSsi/XrdSsiStream.hh b/src/XrdSsi/XrdSsiStream.hh
index 481f34178c9..7ad64ff3f13 100644
--- a/src/XrdSsi/XrdSsiStream.hh
+++ b/src/XrdSsi/XrdSsiStream.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdSsi/XrdSsiErrInfo.hh"
 
diff --git a/src/XrdSsi/XrdSsiTaskReal.cc b/src/XrdSsi/XrdSsiTaskReal.cc
index 9f0fad5a037..5fcc91f6600 100644
--- a/src/XrdSsi/XrdSsiTaskReal.cc
+++ b/src/XrdSsi/XrdSsiTaskReal.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 
 #include "XrdSsi/XrdSsiAtomics.hh"
diff --git a/src/XrdSsi/XrdSsiTaskReal.hh b/src/XrdSsi/XrdSsiTaskReal.hh
index 09daa77c353..809d0e5a841 100644
--- a/src/XrdSsi/XrdSsiTaskReal.hh
+++ b/src/XrdSsi/XrdSsiTaskReal.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdSsi/XrdSsiErrInfo.hh"
 #include "XrdSsi/XrdSsiEvent.hh"
diff --git a/src/XrdSsi/XrdSsiUtils.cc b/src/XrdSsi/XrdSsiUtils.cc
index 978113ffe34..600baf3c9c7 100644
--- a/src/XrdSsi/XrdSsiUtils.cc
+++ b/src/XrdSsi/XrdSsiUtils.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <sys/types.h>
 
 #include "XProtocol/XProtocol.hh"
diff --git a/src/XrdSut/XrdSutAux.cc b/src/XrdSut/XrdSutAux.cc
index b50d32f5383..2b6677c6aff 100644
--- a/src/XrdSut/XrdSutAux.cc
+++ b/src/XrdSut/XrdSutAux.cc
@@ -26,12 +26,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
-#include <errno.h>
-#include <time.h>
+#include <cerrno>
+#include <ctime>
 #include <pwd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdSut/XrdSutBucket.cc b/src/XrdSut/XrdSutBucket.cc
index 4fba5c8275b..78d39351a7c 100644
--- a/src/XrdSut/XrdSutBucket.cc
+++ b/src/XrdSut/XrdSutBucket.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "XrdOuc/XrdOucString.hh"
 #include "XrdSut/XrdSutBucket.hh"
diff --git a/src/XrdSut/XrdSutBuffer.cc b/src/XrdSut/XrdSutBuffer.cc
index 5a8f63daf59..2a6264600d9 100644
--- a/src/XrdSut/XrdSutBuffer.cc
+++ b/src/XrdSut/XrdSutBuffer.cc
@@ -26,10 +26,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
+#include <cinttypes>
+#include <cstdio>
+#include <cstring>
+#include <cerrno>
 #include <netinet/in.h>
 #include <sys/types.h>
 
diff --git a/src/XrdSut/XrdSutCacheEntry.cc b/src/XrdSut/XrdSutCacheEntry.cc
index 64707c5d781..62e0632f15b 100644
--- a/src/XrdSut/XrdSutCacheEntry.cc
+++ b/src/XrdSut/XrdSutCacheEntry.cc
@@ -26,9 +26,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
 
 #include "XrdSutAux.hh"
 #include "XrdSutCacheEntry.hh"
diff --git a/src/XrdSut/XrdSutPFCache.cc b/src/XrdSut/XrdSutPFCache.cc
index 82be4d21dbb..e9426577b1c 100644
--- a/src/XrdSut/XrdSutPFCache.cc
+++ b/src/XrdSut/XrdSutPFCache.cc
@@ -26,12 +26,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <time.h>
+#include <ctime>
 
 #include "XrdSut/XrdSutPFCache.hh"
 #include "XrdSut/XrdSutPFile.hh"
diff --git a/src/XrdSut/XrdSutPFEntry.cc b/src/XrdSut/XrdSutPFEntry.cc
index e246671adcd..db953fb39d2 100644
--- a/src/XrdSut/XrdSutPFEntry.cc
+++ b/src/XrdSut/XrdSutPFEntry.cc
@@ -26,9 +26,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
 
 #include "XrdSutAux.hh"
 #include "XrdSutPFEntry.hh"
diff --git a/src/XrdSut/XrdSutPFile.cc b/src/XrdSut/XrdSutPFile.cc
index cd95bab67f8..b07648dc52b 100644
--- a/src/XrdSut/XrdSutPFile.cc
+++ b/src/XrdSut/XrdSutPFile.cc
@@ -26,14 +26,14 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <time.h>
+#include <ctime>
 
 #include "XrdSut/XrdSutAux.hh"
 #include "XrdSut/XrdSutPFEntry.hh"
diff --git a/src/XrdSut/XrdSutRndm.cc b/src/XrdSut/XrdSutRndm.cc
index 39e8d6c1011..2fdee14ca69 100644
--- a/src/XrdSut/XrdSutRndm.cc
+++ b/src/XrdSut/XrdSutRndm.cc
@@ -27,14 +27,14 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <time.h>
+#include <ctime>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
 
 #include "XrdOuc/XrdOucString.hh"
 #include "XrdSut/XrdSutRndm.hh"
diff --git a/src/XrdSys/XrdSysDir.cc b/src/XrdSys/XrdSysDir.cc
index c84aaeef430..b9fc1f1cadb 100644
--- a/src/XrdSys/XrdSysDir.cc
+++ b/src/XrdSys/XrdSysDir.cc
@@ -44,8 +44,8 @@
 #include <windows.h>
 #endif
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 //______________________________________________________________________________
 XrdSysDir::XrdSysDir(const char *path)
diff --git a/src/XrdSys/XrdSysE2T.cc b/src/XrdSys/XrdSysE2T.cc
index 20f3a8e477b..f1f922262c6 100644
--- a/src/XrdSys/XrdSysE2T.cc
+++ b/src/XrdSys/XrdSysE2T.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <map>
 #include <string>
 
diff --git a/src/XrdSys/XrdSysE2T.hh b/src/XrdSys/XrdSysE2T.hh
index 9491ee5c7f1..2e864667d82 100644
--- a/src/XrdSys/XrdSysE2T.hh
+++ b/src/XrdSys/XrdSysE2T.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 
 //-----------------------------------------------------------------------------
 //! Convert error number to string in a thread-safe way.
diff --git a/src/XrdSys/XrdSysError.cc b/src/XrdSys/XrdSysError.cc
index f5e162741bf..4bfee80eceb 100644
--- a/src/XrdSys/XrdSysError.cc
+++ b/src/XrdSys/XrdSysError.cc
@@ -27,19 +27,19 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
+#include <cctype>
 #ifndef WIN32
 #include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #else
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <sys/types.h>
 #include "XrdSys/XrdWin32.hh"
 #endif
diff --git a/src/XrdSys/XrdSysError.hh b/src/XrdSys/XrdSysError.hh
index d965a7550b2..0d970db522a 100644
--- a/src/XrdSys/XrdSysError.hh
+++ b/src/XrdSys/XrdSysError.hh
@@ -29,13 +29,13 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
  
-#include <stdlib.h>
+#include <cstdlib>
 #ifndef WIN32
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 #include <strings.h>
 #else
-#include <string.h>
+#include <cstring>
 #endif
 
 /******************************************************************************/
diff --git a/src/XrdSys/XrdSysFAttr.cc b/src/XrdSys/XrdSysFAttr.cc
index cd5bff18925..616d0202b39 100644
--- a/src/XrdSys/XrdSysFAttr.cc
+++ b/src/XrdSys/XrdSysFAttr.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
 
 #include "XrdSys/XrdSysError.hh"
 #include "XrdSys/XrdSysFAttr.hh"
diff --git a/src/XrdSys/XrdSysFAttrBsd.icc b/src/XrdSys/XrdSysFAttrBsd.icc
index 5be2f74d35f..f43bb34924a 100644
--- a/src/XrdSys/XrdSysFAttrBsd.icc
+++ b/src/XrdSys/XrdSysFAttrBsd.icc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/extattr.h>
diff --git a/src/XrdSys/XrdSysFAttrLnx.icc b/src/XrdSys/XrdSysFAttrLnx.icc
index 75808f22335..4a778c599cd 100644
--- a/src/XrdSys/XrdSysFAttrLnx.icc
+++ b/src/XrdSys/XrdSysFAttrLnx.icc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/xattr.h>
diff --git a/src/XrdSys/XrdSysFAttrMac.icc b/src/XrdSys/XrdSysFAttrMac.icc
index 8c20765facc..11452510e3c 100644
--- a/src/XrdSys/XrdSysFAttrMac.icc
+++ b/src/XrdSys/XrdSysFAttrMac.icc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/xattr.h>
diff --git a/src/XrdSys/XrdSysFAttrSun.icc b/src/XrdSys/XrdSysFAttrSun.icc
index acb0c2a616d..d3df846e931 100644
--- a/src/XrdSys/XrdSysFAttrSun.icc
+++ b/src/XrdSys/XrdSysFAttrSun.icc
@@ -29,9 +29,9 @@
 /******************************************************************************/
   
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdSys/XrdSysFD.hh b/src/XrdSys/XrdSysFD.hh
index 71bd52af997..a81553e8b23 100644
--- a/src/XrdSys/XrdSysFD.hh
+++ b/src/XrdSys/XrdSysFD.hh
@@ -43,7 +43,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
-#include <errno.h>
+#include <cerrno>
 
 namespace
 {
diff --git a/src/XrdSys/XrdSysIOEvents.cc b/src/XrdSys/XrdSysIOEvents.cc
index 1cdedaefc69..568a06f2b5d 100644
--- a/src/XrdSys/XrdSysIOEvents.cc
+++ b/src/XrdSys/XrdSysIOEvents.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
   
 #include "XrdSys/XrdSysE2T.hh"
 #include "XrdSys/XrdSysFD.hh"
diff --git a/src/XrdSys/XrdSysIOEvents.hh b/src/XrdSys/XrdSysIOEvents.hh
index d45adb24826..1f47190dbe5 100644
--- a/src/XrdSys/XrdSysIOEvents.hh
+++ b/src/XrdSys/XrdSysIOEvents.hh
@@ -31,7 +31,7 @@
 /******************************************************************************/
   
 #include <poll.h>
-#include <time.h>
+#include <ctime>
 #include <sys/types.h>
 
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdSys/XrdSysIOEventsPollE.icc b/src/XrdSys/XrdSysIOEventsPollE.icc
index 75330fb8aa0..2d43c318f5b 100644
--- a/src/XrdSys/XrdSysIOEventsPollE.icc
+++ b/src/XrdSys/XrdSysIOEventsPollE.icc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/epoll.h>
diff --git a/src/XrdSys/XrdSysIOEventsPollKQ.icc b/src/XrdSys/XrdSysIOEventsPollKQ.icc
index d0c455b3a99..f6e0c3a53c2 100644
--- a/src/XrdSys/XrdSysIOEventsPollKQ.icc
+++ b/src/XrdSys/XrdSysIOEventsPollKQ.icc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/event.h>
diff --git a/src/XrdSys/XrdSysIOEventsPollPoll.icc b/src/XrdSys/XrdSysIOEventsPollPoll.icc
index 6d95cf1d55e..55039782ee3 100644
--- a/src/XrdSys/XrdSysIOEventsPollPoll.icc
+++ b/src/XrdSys/XrdSysIOEventsPollPoll.icc
@@ -28,7 +28,7 @@
 /******************************************************************************/
 
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <signal.h>
   
 #include "XrdSys/XrdSysE2T.hh"
diff --git a/src/XrdSys/XrdSysIOEventsPollPort.icc b/src/XrdSys/XrdSysIOEventsPollPort.icc
index 0464e69142d..77c0af8ee46 100644
--- a/src/XrdSys/XrdSysIOEventsPollPort.icc
+++ b/src/XrdSys/XrdSysIOEventsPollPort.icc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <port.h>
diff --git a/src/XrdSys/XrdSysKernelBuffer.hh b/src/XrdSys/XrdSysKernelBuffer.hh
index 7b0d58cba27..01efbe35325 100644
--- a/src/XrdSys/XrdSysKernelBuffer.hh
+++ b/src/XrdSys/XrdSysKernelBuffer.hh
@@ -27,9 +27,9 @@
 
 #include <fcntl.h>
 #include <sys/uio.h>
-#include <stdint.h>
+#include <cstdint>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 
 #include <vector>
 #include <array>
diff --git a/src/XrdSys/XrdSysLogPI.hh b/src/XrdSys/XrdSysLogPI.hh
index 02d433980d0..e1ff0968691 100644
--- a/src/XrdSys/XrdSysLogPI.hh
+++ b/src/XrdSys/XrdSysLogPI.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/time.h>
 
 //-----------------------------------------------------------------------------
diff --git a/src/XrdSys/XrdSysLogger.cc b/src/XrdSys/XrdSysLogger.cc
index ed8544476cd..b275d39e657 100644
--- a/src/XrdSys/XrdSysLogger.cc
+++ b/src/XrdSys/XrdSysLogger.cc
@@ -29,10 +29,10 @@
 
 #include <fcntl.h>
 #include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
 #include <sys/stat.h>
 #include <sys/types.h>
 #ifndef WIN32
diff --git a/src/XrdSys/XrdSysLogger.hh b/src/XrdSys/XrdSysLogger.hh
index 0a2b8a13d30..ccd9730ff43 100644
--- a/src/XrdSys/XrdSysLogger.hh
+++ b/src/XrdSys/XrdSysLogger.hh
@@ -29,13 +29,13 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #ifndef WIN32
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 #include <strings.h>
 #else
-#include <string.h>
+#include <cstring>
 #include <io.h>
 #include "XrdSys/XrdWin32.hh"
 #endif
diff --git a/src/XrdSys/XrdSysLogging.cc b/src/XrdSys/XrdSysLogging.cc
index 95d8af081b9..08ccd10a027 100644
--- a/src/XrdSys/XrdSysLogging.cc
+++ b/src/XrdSys/XrdSysLogging.cc
@@ -28,9 +28,9 @@
 /******************************************************************************/
 
 #include <stddef.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdSys/XrdSysE2T.hh"
 #include "XrdSys/XrdSysLogger.hh"
diff --git a/src/XrdSys/XrdSysLogging.hh b/src/XrdSys/XrdSysLogging.hh
index e36a8a826b7..a5247d3744d 100644
--- a/src/XrdSys/XrdSysLogging.hh
+++ b/src/XrdSys/XrdSysLogging.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <limits.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/time.h>
 #include <sys/uio.h>
 
diff --git a/src/XrdSys/XrdSysPlatform.cc b/src/XrdSys/XrdSysPlatform.cc
index d5d9fe1c1c6..8c630e0ba0e 100644
--- a/src/XrdSys/XrdSysPlatform.cc
+++ b/src/XrdSys/XrdSysPlatform.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #ifndef WIN32
 #include <unistd.h>
 #include <netinet/in.h>
diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh
index 9a5cc76f5df..a1ac544ad93 100644
--- a/src/XrdSys/XrdSysPlatform.hh
+++ b/src/XrdSys/XrdSysPlatform.hh
@@ -31,11 +31,11 @@
 
 // Include stdlib so that ENDIAN macros are defined properly
 //
-#include <stdlib.h>
+#include <cstdlib>
 
 #ifdef __linux__
 #include <memory.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <byteswap.h>
diff --git a/src/XrdSys/XrdSysPlugin.cc b/src/XrdSys/XrdSysPlugin.cc
index 5dd590c636e..5c9abfd0752 100644
--- a/src/XrdSys/XrdSysPlugin.cc
+++ b/src/XrdSys/XrdSysPlugin.cc
@@ -44,10 +44,10 @@
 #if !defined(__APPLE__) && !defined(__CYGWIN__)
 #include <link.h>
 #endif
-#include <stdio.h>
+#include <cstdio>
 #include <strings.h>
 #include <sys/types.h>
-#include <errno.h>
+#include <cerrno>
 #else
 #include "XrdSys/XrdWin32.hh"
 #endif
diff --git a/src/XrdSys/XrdSysPlugin.hh b/src/XrdSys/XrdSysPlugin.hh
index be6d7fa7575..3cf7df7ad3a 100644
--- a/src/XrdSys/XrdSysPlugin.hh
+++ b/src/XrdSys/XrdSysPlugin.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <string.h>
+#include <cstring>
 
 struct XrdVersionInfo;
 
diff --git a/src/XrdSys/XrdSysPriv.cc b/src/XrdSys/XrdSysPriv.cc
index 97c448b848c..e424ecb60a8 100644
--- a/src/XrdSys/XrdSysPriv.cc
+++ b/src/XrdSys/XrdSysPriv.cc
@@ -41,12 +41,12 @@
 #include "XrdSys/XrdSysPriv.hh"
 
 #if !defined(WINDOWS)
-#include <stdio.h>
+#include <cstdio>
 #include "XrdSys/XrdSysHeaders.hh"
 #include "XrdSys/XrdSysPwd.hh"
 #include <unistd.h>
 #include <pwd.h>
-#include <errno.h>
+#include <cerrno>
 
 #define NOUC ((uid_t)(-1))
 #define NOGC ((gid_t)(-1))
diff --git a/src/XrdSys/XrdSysPthread.cc b/src/XrdSys/XrdSysPthread.cc
index f072dc4b6ae..9abf0906c97 100644
--- a/src/XrdSys/XrdSysPthread.cc
+++ b/src/XrdSys/XrdSysPthread.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
  
-#include <errno.h>
+#include <cerrno>
 #include <pthread.h>
 #ifndef WIN32
 #include <unistd.h>
@@ -35,7 +35,7 @@
 #else
 #undef ETIMEDOUT       // Make sure that the definition from Winsock2.h is used ... 
 #include <Winsock2.h>
-#include <time.h>
+#include <ctime>
 #include "XrdSys/XrdWin32.hh"
 #endif
 #include <sys/types.h>
diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh
index dd5b9153086..17f8fd0bec8 100644
--- a/src/XrdSys/XrdSysPthread.hh
+++ b/src/XrdSys/XrdSysPthread.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #ifdef WIN32
 #define HAVE_STRUCT_TIMESPEC 1
 #endif
diff --git a/src/XrdSys/XrdSysTimer.cc b/src/XrdSys/XrdSysTimer.cc
index 1f378adb4e8..14e901403dd 100644
--- a/src/XrdSys/XrdSysTimer.cc
+++ b/src/XrdSys/XrdSysTimer.cc
@@ -32,9 +32,9 @@
 #else
 #include "XrdSys/XrdWin32.hh"
 #endif
-#include <errno.h>
-#include <time.h>
-#include <stdio.h>
+#include <cerrno>
+#include <ctime>
+#include <cstdio>
 #include "XrdSys/XrdSysTimer.hh"
 #include <iostream>
 
diff --git a/src/XrdSys/XrdSysTimer.hh b/src/XrdSys/XrdSysTimer.hh
index b6a6457469b..43d772b46fb 100644
--- a/src/XrdSys/XrdSysTimer.hh
+++ b/src/XrdSys/XrdSysTimer.hh
@@ -32,7 +32,7 @@
 #ifndef WIN32
 #include <sys/time.h>
 #else
-#include <time.h>
+#include <ctime>
 #include <Winsock2.h>
 #include "XrdSys/XrdWin32.hh"
 #endif
diff --git a/src/XrdSys/XrdSysTrace.cc b/src/XrdSys/XrdSysTrace.cc
index 887e8ba08cd..a64a5e95a53 100644
--- a/src/XrdSys/XrdSysTrace.cc
+++ b/src/XrdSys/XrdSysTrace.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdSys/XrdSysFD.hh"
 #include "XrdSys/XrdSysLogger.hh"
diff --git a/src/XrdSys/XrdSysUtils.cc b/src/XrdSys/XrdSysUtils.cc
index f2baf330a20..5eea57e048d 100644
--- a/src/XrdSys/XrdSysUtils.cc
+++ b/src/XrdSys/XrdSysUtils.cc
@@ -28,12 +28,12 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <cctype>
+#include <cerrno>
+#include <cstdlib>
+#include <cstdio>
 #include <signal.h>
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <sys/param.h>
 
diff --git a/src/XrdSys/XrdSysXAttr.cc b/src/XrdSys/XrdSysXAttr.cc
index bd0ff619ebe..86ada97fe8c 100644
--- a/src/XrdSys/XrdSysXAttr.cc
+++ b/src/XrdSys/XrdSysXAttr.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
 
 #include "XrdSys/XrdSysError.hh"
 #include "XrdSys/XrdSysXAttr.hh"
diff --git a/src/XrdSys/XrdSysXSLock.hh b/src/XrdSys/XrdSysXSLock.hh
index 9a721898990..531ca55c7e4 100644
--- a/src/XrdSys/XrdSysXSLock.hh
+++ b/src/XrdSys/XrdSysXSLock.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include "XrdSys/XrdSysPthread.hh"
 
 // These are valid usage options
diff --git a/src/XrdThrottle/XrdThrottleManager.hh b/src/XrdThrottle/XrdThrottleManager.hh
index f51d5cef49d..2a307cc3df7 100644
--- a/src/XrdThrottle/XrdThrottleManager.hh
+++ b/src/XrdThrottle/XrdThrottleManager.hh
@@ -30,7 +30,7 @@
 
 #include <string>
 #include <vector>
-#include <time.h>
+#include <ctime>
 
 #include "XrdSys/XrdSysPthread.hh"
 
diff --git a/src/XrdTls/XrdTls.cc b/src/XrdTls/XrdTls.cc
index 51a8456cb81..cb0d751967a 100644
--- a/src/XrdTls/XrdTls.cc
+++ b/src/XrdTls/XrdTls.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <iostream>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
diff --git a/src/XrdTls/XrdTlsContext.cc b/src/XrdTls/XrdTlsContext.cc
index 3778e643754..a1435d9c70b 100644
--- a/src/XrdTls/XrdTlsContext.cc
+++ b/src/XrdTls/XrdTlsContext.cc
@@ -16,7 +16,7 @@
 // along with XRootD.  If not, see <http://www.gnu.org/licenses/>.
 //------------------------------------------------------------------------------
 
-#include <stdio.h>
+#include <cstdio>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
diff --git a/src/XrdTls/XrdTlsHostcheck.icc b/src/XrdTls/XrdTlsHostcheck.icc
index eff11498574..7ccfc8b6f1a 100644
--- a/src/XrdTls/XrdTlsHostcheck.icc
+++ b/src/XrdTls/XrdTlsHostcheck.icc
@@ -47,7 +47,7 @@ in this Software without prior written authorization of the copyright holder.
 */
 
 /* #include "hostcheck.h" */
-#include <string.h>
+#include <cstring>
 
 /* Portable, consistent toupper (remember EBCDIC). Do not use toupper() because
    its behavior is altered by the current locale. */
diff --git a/src/XrdTls/XrdTlsSocket.cc b/src/XrdTls/XrdTlsSocket.cc
index 16497d76485..d14d5cfd2a6 100644
--- a/src/XrdTls/XrdTlsSocket.cc
+++ b/src/XrdTls/XrdTlsSocket.cc
@@ -16,13 +16,13 @@
 // along with XRootD.  If not, see <http://www.gnu.org/licenses/>.
 //------------------------------------------------------------------------------
 
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 #include <fcntl.h>
 #include <iostream>
 #include <poll.h>
-#include <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
 #include <openssl/ssl.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
diff --git a/src/XrdTls/XrdTlsTempCA.cc b/src/XrdTls/XrdTlsTempCA.cc
index cee2477f66c..3e125e0e659 100644
--- a/src/XrdTls/XrdTlsTempCA.cc
+++ b/src/XrdTls/XrdTlsTempCA.cc
@@ -27,7 +27,7 @@
 /******************************************************************************/
 
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <fcntl.h>
 #include <dirent.h>
 #include <sys/poll.h>
diff --git a/src/XrdTpc/XrdTpcCurlMulti.cc b/src/XrdTpc/XrdTpcCurlMulti.cc
index b02d34c34e5..85109ce8c07 100644
--- a/src/XrdTpc/XrdTpcCurlMulti.cc
+++ b/src/XrdTpc/XrdTpcCurlMulti.cc
@@ -1,7 +1,7 @@
 
 #include "XrdTpcCurlMulti.hh"
 
-#include <errno.h>
+#include <cerrno>
 #include <sys/select.h>
 
 #ifndef HAVE_CURL_MULTI_WAIT
diff --git a/src/XrdVoms/XrdVomsFun.cc b/src/XrdVoms/XrdVomsFun.cc
index cacecfb2b8f..1c7fd5417c7 100644
--- a/src/XrdVoms/XrdVomsFun.cc
+++ b/src/XrdVoms/XrdVomsFun.cc
@@ -33,10 +33,10 @@
 /*                                                                            */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
 
 #include "XrdVoms.hh"
 #include "XrdVomsFun.hh"
diff --git a/src/XrdXml/XrdXmlMetaLink.cc b/src/XrdXml/XrdXmlMetaLink.cc
index 2ed3bd1a37c..6c40618f45a 100644
--- a/src/XrdXml/XrdXmlMetaLink.cc
+++ b/src/XrdXml/XrdXmlMetaLink.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
 #include <unistd.h>
 #include <limits.h>
 
diff --git a/src/XrdXml/XrdXmlMetaLink.hh b/src/XrdXml/XrdXmlMetaLink.hh
index aee7bf1e785..ff78cf64aef 100644
--- a/src/XrdXml/XrdXmlMetaLink.hh
+++ b/src/XrdXml/XrdXmlMetaLink.hh
@@ -29,8 +29,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "XrdOuc/XrdOucFileInfo.hh"
 #include "XrdXml/XrdXmlReader.hh"
diff --git a/src/XrdXml/XrdXmlRdrTiny.cc b/src/XrdXml/XrdXmlRdrTiny.cc
index 62465483784..399368df7ce 100644
--- a/src/XrdXml/XrdXmlRdrTiny.cc
+++ b/src/XrdXml/XrdXmlRdrTiny.cc
@@ -27,9 +27,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/XrdXml/XrdXmlRdrXml2.cc b/src/XrdXml/XrdXmlRdrXml2.cc
index 6e955d1afef..af2f79abf06 100644
--- a/src/XrdXml/XrdXmlRdrXml2.cc
+++ b/src/XrdXml/XrdXmlRdrXml2.cc
@@ -27,9 +27,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 
 #include <libxml/xmlreader.h>
diff --git a/src/XrdXml/XrdXmlReader.cc b/src/XrdXml/XrdXmlReader.cc
index 489f5ed2b89..d27d97bcedf 100644
--- a/src/XrdXml/XrdXmlReader.cc
+++ b/src/XrdXml/XrdXmlReader.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 #include "XrdXml/XrdXmlRdrTiny.hh"
 
diff --git a/src/XrdXml/tinyxml/tinystr.h b/src/XrdXml/tinyxml/tinystr.h
index 89cca334156..7651a82b200 100644
--- a/src/XrdXml/tinyxml/tinystr.h
+++ b/src/XrdXml/tinyxml/tinystr.h
@@ -28,7 +28,7 @@ distribution.
 #define TIXML_STRING_INCLUDED
 
 #include <assert.h>
-#include <string.h>
+#include <cstring>
 
 /*	The support for explicit isn't that universal, and it isn't really
 	required - it is used to check that the TiXmlString class isn't incorrectly
diff --git a/src/XrdXml/tinyxml/tinyxml.cpp b/src/XrdXml/tinyxml/tinyxml.cpp
index c3a24ed1fb4..e3a315e04f9 100644
--- a/src/XrdXml/tinyxml/tinyxml.cpp
+++ b/src/XrdXml/tinyxml/tinyxml.cpp
@@ -22,7 +22,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include <ctype.h>
+#include <cctype>
 
 #ifdef TIXML_USE_STL
 #include <sstream>
diff --git a/src/XrdXml/tinyxml/tinyxml.h b/src/XrdXml/tinyxml/tinyxml.h
index edc8bc6bcd6..1bedf0722fe 100644
--- a/src/XrdXml/tinyxml/tinyxml.h
+++ b/src/XrdXml/tinyxml/tinyxml.h
@@ -32,10 +32,10 @@ distribution.
 #pragma warning( disable : 4786 )
 #endif
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <assert.h>
 
 // Help out windows:
diff --git a/src/XrdXml/tinyxml/tinyxmlparser.cpp b/src/XrdXml/tinyxml/tinyxmlparser.cpp
index 424094e2a21..299d81e5f81 100644
--- a/src/XrdXml/tinyxml/tinyxmlparser.cpp
+++ b/src/XrdXml/tinyxml/tinyxmlparser.cpp
@@ -22,7 +22,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include <ctype.h>
+#include <cctype>
 #include <stddef.h>
 
 #include "tinyxml.h"
diff --git a/src/XrdXrootd/XrdXrootdAdmin.cc b/src/XrdXrootd/XrdXrootdAdmin.cc
index 95e33d165b4..68e2e5e0e1b 100644
--- a/src/XrdXrootd/XrdXrootdAdmin.cc
+++ b/src/XrdXrootd/XrdXrootdAdmin.cc
@@ -29,8 +29,8 @@
 /******************************************************************************/
 
 #include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/types.h>
diff --git a/src/XrdXrootd/XrdXrootdAdmin.hh b/src/XrdXrootd/XrdXrootdAdmin.hh
index b3255590c5b..86227f3d770 100644
--- a/src/XrdXrootd/XrdXrootdAdmin.hh
+++ b/src/XrdXrootd/XrdXrootdAdmin.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
   
-#include <stdlib.h>
+#include <cstdlib>
 #include <netinet/in.h>
 
 #include "Xrd/XrdLinkMatch.hh"
diff --git a/src/XrdXrootd/XrdXrootdAioTask.cc b/src/XrdXrootd/XrdXrootdAioTask.cc
index 514f8990f5c..8805d215f83 100644
--- a/src/XrdXrootd/XrdXrootdAioTask.cc
+++ b/src/XrdXrootd/XrdXrootdAioTask.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <time.h>
+#include <cerrno>
+#include <cstdio>
+#include <ctime>
 #include <sys/uio.h>
 #include "Xrd/XrdLink.hh"
 #include "Xrd/XrdScheduler.hh"
diff --git a/src/XrdXrootd/XrdXrootdBridge.hh b/src/XrdXrootd/XrdXrootdBridge.hh
index 732f4e92d61..acc68e656d5 100644
--- a/src/XrdXrootd/XrdXrootdBridge.hh
+++ b/src/XrdXrootd/XrdXrootdBridge.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XProtocol/XPtypes.hh"
 
diff --git a/src/XrdXrootd/XrdXrootdCallBack.cc b/src/XrdXrootd/XrdXrootdCallBack.cc
index d38dc007dbb..3f2220ac7ff 100644
--- a/src/XrdXrootd/XrdXrootdCallBack.cc
+++ b/src/XrdXrootd/XrdXrootdCallBack.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <netinet/in.h>
 #include <sys/uio.h>
 
diff --git a/src/XrdXrootd/XrdXrootdConfig.cc b/src/XrdXrootd/XrdXrootdConfig.cc
index 6e4d5a069d5..cab5be55f23 100644
--- a/src/XrdXrootd/XrdXrootdConfig.cc
+++ b/src/XrdXrootd/XrdXrootdConfig.cc
@@ -28,11 +28,11 @@
 /******************************************************************************/
  
 #include <unistd.h>
-#include <ctype.h>
+#include <cctype>
 #include <fcntl.h>
 #include <string>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/XrdXrootd/XrdXrootdConfigMon.cc b/src/XrdXrootd/XrdXrootdConfigMon.cc
index 9a062235a96..c119bce83b7 100644
--- a/src/XrdXrootd/XrdXrootdConfigMon.cc
+++ b/src/XrdXrootd/XrdXrootdConfigMon.cc
@@ -29,8 +29,8 @@
 /******************************************************************************/
 
 #include <limits>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <strings.h>
 
 #include "XrdNet/XrdNetAddr.hh"
diff --git a/src/XrdXrootd/XrdXrootdFile.cc b/src/XrdXrootd/XrdXrootdFile.cc
index 84c09b21def..bcfc128beb8 100644
--- a/src/XrdXrootd/XrdXrootdFile.cc
+++ b/src/XrdXrootd/XrdXrootdFile.cc
@@ -27,9 +27,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 #include <netinet/in.h>
 #include <sys/types.h>
diff --git a/src/XrdXrootd/XrdXrootdFile.hh b/src/XrdXrootd/XrdXrootdFile.hh
index 4d24b6d431d..672a95e228b 100644
--- a/src/XrdXrootd/XrdXrootdFile.hh
+++ b/src/XrdXrootd/XrdXrootdFile.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <set>
 #include <vector>
 
diff --git a/src/XrdXrootd/XrdXrootdFileLock1.cc b/src/XrdXrootd/XrdXrootdFileLock1.cc
index 26e0d15faea..73ac99644ee 100644
--- a/src/XrdXrootd/XrdXrootdFileLock1.cc
+++ b/src/XrdXrootd/XrdXrootdFileLock1.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "XrdOuc/XrdOucHash.hh"
 
diff --git a/src/XrdXrootd/XrdXrootdGSReal.cc b/src/XrdXrootd/XrdXrootdGSReal.cc
index a10c89d15b4..53c1ba370a2 100644
--- a/src/XrdXrootd/XrdXrootdGSReal.cc
+++ b/src/XrdXrootd/XrdXrootdGSReal.cc
@@ -28,9 +28,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/uio.h>
 
 #include "Xrd/XrdScheduler.hh"
diff --git a/src/XrdXrootd/XrdXrootdJob.cc b/src/XrdXrootd/XrdXrootdJob.cc
index 36d0de22516..d71d9d47fa9 100644
--- a/src/XrdXrootd/XrdXrootdJob.cc
+++ b/src/XrdXrootd/XrdXrootdJob.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <netinet/in.h>
 #include <sys/uio.h>
 
diff --git a/src/XrdXrootd/XrdXrootdLoadLib.cc b/src/XrdXrootd/XrdXrootdLoadLib.cc
index 22712ee92f9..a17beef811f 100644
--- a/src/XrdXrootd/XrdXrootdLoadLib.cc
+++ b/src/XrdXrootd/XrdXrootdLoadLib.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdVersion.hh"
 
diff --git a/src/XrdXrootd/XrdXrootdMonFMap.cc b/src/XrdXrootd/XrdXrootdMonFMap.cc
index 5d23ed05fe8..d906fa2848c 100644
--- a/src/XrdXrootd/XrdXrootdMonFMap.cc
+++ b/src/XrdXrootd/XrdXrootdMonFMap.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 #include <unistd.h>
 
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/XrdXrootd/XrdXrootdMonFile.cc b/src/XrdXrootd/XrdXrootdMonFile.cc
index f5cdeac2221..116b00b2bed 100644
--- a/src/XrdXrootd/XrdXrootdMonFile.cc
+++ b/src/XrdXrootd/XrdXrootdMonFile.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "Xrd/XrdScheduler.hh"
 
diff --git a/src/XrdXrootd/XrdXrootdMonitor.cc b/src/XrdXrootd/XrdXrootdMonitor.cc
index e166bbb09bf..2926bae75ea 100644
--- a/src/XrdXrootd/XrdXrootdMonitor.cc
+++ b/src/XrdXrootd/XrdXrootdMonitor.cc
@@ -28,10 +28,10 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
+#include <cerrno>
 #include <cstdio>
-#include <stdlib.h>
-#include <time.h>
+#include <cstdlib>
+#include <ctime>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/XrdXrootd/XrdXrootdMonitor.hh b/src/XrdXrootd/XrdXrootdMonitor.hh
index c673b4d192c..866abb7b852 100644
--- a/src/XrdXrootd/XrdXrootdMonitor.hh
+++ b/src/XrdXrootd/XrdXrootdMonitor.hh
@@ -30,9 +30,9 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <inttypes.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cinttypes>
+#include <cstdlib>
+#include <ctime>
 #include <netinet/in.h>
 #include <sys/types.h>
 
diff --git a/src/XrdXrootd/XrdXrootdNormAio.cc b/src/XrdXrootd/XrdXrootdNormAio.cc
index 1363da097c8..770e85f8177 100644
--- a/src/XrdXrootd/XrdXrootdNormAio.cc
+++ b/src/XrdXrootd/XrdXrootdNormAio.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
+#include <cerrno>
+#include <cstdio>
 #include <sys/uio.h>
 
 #include "Xrd/XrdLink.hh"
diff --git a/src/XrdXrootd/XrdXrootdPgrwAio.cc b/src/XrdXrootd/XrdXrootdPgrwAio.cc
index 62be366eee9..834bb1fd683 100644
--- a/src/XrdXrootd/XrdXrootdPgrwAio.cc
+++ b/src/XrdXrootd/XrdXrootdPgrwAio.cc
@@ -28,8 +28,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
+#include <cerrno>
+#include <cstdio>
 #include <sys/uio.h>
 
 #include "Xrd/XrdLink.hh"
diff --git a/src/XrdXrootd/XrdXrootdPgwBadCS.cc b/src/XrdXrootd/XrdXrootdPgwBadCS.cc
index 245d60c5737..5d5b773630c 100644
--- a/src/XrdXrootd/XrdXrootdPgwBadCS.cc
+++ b/src/XrdXrootd/XrdXrootdPgwBadCS.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <arpa/inet.h>
 
 #include "XrdOuc/XrdOucCRC.hh"
diff --git a/src/XrdXrootd/XrdXrootdPgwCtl.cc b/src/XrdXrootd/XrdXrootdPgwCtl.cc
index dd4874db021..1a604d4fac7 100644
--- a/src/XrdXrootd/XrdXrootdPgwCtl.cc
+++ b/src/XrdXrootd/XrdXrootdPgwCtl.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdOuc/XrdOucPgrwUtils.hh"
 #include "XrdSys/XrdSysPlatform.hh"
diff --git a/src/XrdXrootd/XrdXrootdPgwFob.cc b/src/XrdXrootd/XrdXrootdPgwFob.cc
index 7454b98e947..9fa3518e919 100644
--- a/src/XrdXrootd/XrdXrootdPgwFob.cc
+++ b/src/XrdXrootd/XrdXrootdPgwFob.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "XrdOuc/XrdOucString.hh"
 #include "XrdSys/XrdSysError.hh"
diff --git a/src/XrdXrootd/XrdXrootdPgwFob.hh b/src/XrdXrootd/XrdXrootdPgwFob.hh
index 5810208ba84..0ccaf9f77b5 100644
--- a/src/XrdXrootd/XrdXrootdPgwFob.hh
+++ b/src/XrdXrootd/XrdXrootdPgwFob.hh
@@ -30,7 +30,7 @@
 /******************************************************************************/
 
 #include <set>
-#include <string.h>
+#include <cstring>
 
 #include "XProtocol/XProtocol.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdXrootd/XrdXrootdPrepare.cc b/src/XrdXrootd/XrdXrootdPrepare.cc
index 362b67fdd1b..8ce494c0762 100644
--- a/src/XrdXrootd/XrdXrootdPrepare.cc
+++ b/src/XrdXrootd/XrdXrootdPrepare.cc
@@ -31,8 +31,8 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <strings.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/XrdXrootd/XrdXrootdProtocol.hh b/src/XrdXrootd/XrdXrootdProtocol.hh
index 8e08aafb0a6..11365c55c14 100644
--- a/src/XrdXrootd/XrdXrootdProtocol.hh
+++ b/src/XrdXrootd/XrdXrootdProtocol.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
  
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/XrdXrootd/XrdXrootdReqID.hh b/src/XrdXrootd/XrdXrootdReqID.hh
index 90ae86d857c..cc00b690b93 100644
--- a/src/XrdXrootd/XrdXrootdReqID.hh
+++ b/src/XrdXrootd/XrdXrootdReqID.hh
@@ -30,7 +30,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 class XrdXrootdReqID
 {
diff --git a/src/XrdXrootd/XrdXrootdResponse.cc b/src/XrdXrootd/XrdXrootdResponse.cc
index 7291e276d4f..07860b2a5a1 100644
--- a/src/XrdXrootd/XrdXrootdResponse.cc
+++ b/src/XrdXrootd/XrdXrootdResponse.cc
@@ -28,9 +28,9 @@
 /******************************************************************************/
  
 #include <netinet/in.h>
-#include <inttypes.h>
-#include <stdint.h>
-#include <string.h>
+#include <cinttypes>
+#include <cstdint>
+#include <cstring>
 #include <sys/types.h>
 
 #include "Xrd/XrdLinkCtl.hh"
diff --git a/src/XrdXrootd/XrdXrootdResponse.hh b/src/XrdXrootd/XrdXrootdResponse.hh
index 76647c3ed01..4259cb3ff67 100644
--- a/src/XrdXrootd/XrdXrootdResponse.hh
+++ b/src/XrdXrootd/XrdXrootdResponse.hh
@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <sys/uio.h>
   
diff --git a/src/XrdXrootd/XrdXrootdStats.cc b/src/XrdXrootd/XrdXrootdStats.cc
index 8833229bc64..818bb288a42 100644
--- a/src/XrdXrootd/XrdXrootdStats.cc
+++ b/src/XrdXrootd/XrdXrootdStats.cc
@@ -27,7 +27,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
  
-#include <stdio.h>
+#include <cstdio>
   
 #include "Xrd/XrdStats.hh"
 #include "XrdSfs/XrdSfsInterface.hh"
diff --git a/src/XrdXrootd/XrdXrootdTransPend.cc b/src/XrdXrootd/XrdXrootdTransPend.cc
index 48986026a19..03321eefa89 100644
--- a/src/XrdXrootd/XrdXrootdTransPend.cc
+++ b/src/XrdXrootd/XrdXrootdTransPend.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 
 #include "XrdXrootd/XrdXrootdTransit.hh"
 #include "XrdXrootd/XrdXrootdTransPend.hh"
diff --git a/src/XrdXrootd/XrdXrootdTransPend.hh b/src/XrdXrootd/XrdXrootdTransPend.hh
index 1af6a503d22..df127ce1430 100644
--- a/src/XrdXrootd/XrdXrootdTransPend.hh
+++ b/src/XrdXrootd/XrdXrootdTransPend.hh
@@ -30,8 +30,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include "XProtocol/XProtocol.hh"
 #include "XrdSys/XrdSysPthread.hh"
diff --git a/src/XrdXrootd/XrdXrootdTransit.cc b/src/XrdXrootd/XrdXrootdTransit.cc
index ba44daf6f09..52d454de7c6 100644
--- a/src/XrdXrootd/XrdXrootdTransit.cc
+++ b/src/XrdXrootd/XrdXrootdTransit.cc
@@ -28,7 +28,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <string.h>
+#include <cstring>
 #include <unistd.h>
 #include <sys/uio.h>
 
diff --git a/src/XrdXrootd/XrdXrootdXPath.hh b/src/XrdXrootd/XrdXrootdXPath.hh
index 0da675a3246..af972913c1a 100644
--- a/src/XrdXrootd/XrdXrootdXPath.hh
+++ b/src/XrdXrootd/XrdXrootdXPath.hh
@@ -31,7 +31,7 @@
 /******************************************************************************/
 
 #include <strings.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #define XROOTDXP_OK        1
 #define XROOTDXP_NOLK      2
diff --git a/src/XrdXrootd/XrdXrootdXeq.cc b/src/XrdXrootd/XrdXrootdXeq.cc
index da3f1a854a9..af72abcc480 100644
--- a/src/XrdXrootd/XrdXrootdXeq.cc
+++ b/src/XrdXrootd/XrdXrootdXeq.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
 #include <string>
 #include <sys/time.h>
 
diff --git a/src/XrdXrootd/XrdXrootdXeqFAttr.cc b/src/XrdXrootd/XrdXrootdXeqFAttr.cc
index 6129d3ac9ba..e0cd42d596d 100644
--- a/src/XrdXrootd/XrdXrootdXeqFAttr.cc
+++ b/src/XrdXrootd/XrdXrootdXeqFAttr.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <arpa/inet.h>
 #include <sys/uio.h>
 #include <unistd.h>
diff --git a/src/XrdXrootd/XrdXrootdXeqPgrw.cc b/src/XrdXrootd/XrdXrootdXeqPgrw.cc
index d59ccbbfed0..931360aeebb 100644
--- a/src/XrdXrootd/XrdXrootdXeqPgrw.cc
+++ b/src/XrdXrootd/XrdXrootdXeqPgrw.cc
@@ -27,8 +27,8 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <ctype.h>
-#include <stdio.h>
+#include <cctype>
+#include <cstdio>
 #include <sys/uio.h>
 
 #include "XrdSfs/XrdSfsInterface.hh"
diff --git a/src/XrdZip/XrdZipUtils.hh b/src/XrdZip/XrdZipUtils.hh
index a388cc13571..1d48e543d08 100644
--- a/src/XrdZip/XrdZipUtils.hh
+++ b/src/XrdZip/XrdZipUtils.hh
@@ -25,7 +25,7 @@
 #ifndef SRC_XRDZIP_XRDZIPUTILS_HH_
 #define SRC_XRDZIP_XRDZIPUTILS_HH_
 
-#include <string.h>
+#include <cstring>
 
 #include <ctime>
 #include <vector>
diff --git a/tests/XrdClTests/tls/xrdsrv-tls.cc b/tests/XrdClTests/tls/xrdsrv-tls.cc
index 83aa4db19d8..334de50c71d 100644
--- a/tests/XrdClTests/tls/xrdsrv-tls.cc
+++ b/tests/XrdClTests/tls/xrdsrv-tls.cc
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <sys/socket.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <netinet/in.h>
 #include <string>
 #include <unistd.h>
@@ -9,7 +9,7 @@
 #include <mutex>
 #include <sstream>
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
diff --git a/tests/XrdEcTests/MicroTest.cc b/tests/XrdEcTests/MicroTest.cc
index 96b105c0f5b..91df00def39 100644
--- a/tests/XrdEcTests/MicroTest.cc
+++ b/tests/XrdEcTests/MicroTest.cc
@@ -39,7 +39,7 @@
 #include <limits>
 
 #include <unistd.h>
-#include <stdio.h>
+#include <cstdio>
 #include <ftw.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/tests/XrdSsiTests/XrdShMap.cc b/tests/XrdSsiTests/XrdShMap.cc
index 4bf1478e3cf..9ea43583755 100644
--- a/tests/XrdSsiTests/XrdShMap.cc
+++ b/tests/XrdSsiTests/XrdShMap.cc
@@ -33,10 +33,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <string>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <zlib.h>
 
 #include "XrdSsi/XrdSsiShMap.hh"
diff --git a/tests/common/CppUnitXrdHelpers.hh b/tests/common/CppUnitXrdHelpers.hh
index 3fbd7c28896..99925bb2726 100644
--- a/tests/common/CppUnitXrdHelpers.hh
+++ b/tests/common/CppUnitXrdHelpers.hh
@@ -20,8 +20,8 @@
 #define __CPPUNIT_XRD_HELPERS_HH__
 
 #include <XrdCl/XrdClXRootDResponses.hh>
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 #define CPPUNIT_ASSERT_XRDST_NOTOK( x, err )         \
 {                                                    \
diff --git a/tests/common/Server.cc b/tests/common/Server.cc
index b5361b727f4..6097fd09770 100644
--- a/tests/common/Server.cc
+++ b/tests/common/Server.cc
@@ -22,7 +22,7 @@
 #include "XrdCl/XrdClLog.hh"
 #include "TestEnv.hh"
 
-#include <errno.h>
+#include <cerrno>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
diff --git a/tests/common/Server.hh b/tests/common/Server.hh
index 50837827bfc..e86762f03a8 100644
--- a/tests/common/Server.hh
+++ b/tests/common/Server.hh
@@ -23,7 +23,7 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <stdint.h>
+#include <cstdint>
 #include <pthread.h>
 
 namespace XrdClTests {
diff --git a/tests/common/Utils.hh b/tests/common/Utils.hh
index 05e15b74fc9..ecdb8f6d31a 100644
--- a/tests/common/Utils.hh
+++ b/tests/common/Utils.hh
@@ -20,7 +20,7 @@
 #define UTILS_HH
 
 #include <unistd.h>
-#include <stdint.h>
+#include <cstdint>
 #include <zlib.h>
 #include <string>