--- nxcomp/Message.cpp.orig	2008-07-21 18:18:38 +0400
+++ nxcomp/Message.cpp	2008-07-21 18:18:02 +0400
@@ -15,9 +15,9 @@
 /*                                                                        */
 /**************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 
 #include <algorithm>
 
--- nxcomp/Misc.cpp.orig	2008-07-21 18:15:13 +0400
+++ nxcomp/Misc.cpp	2008-07-21 18:15:55 +0400
@@ -15,11 +15,11 @@
 /*                                                                        */
 /**************************************************************************/
 
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cctype>
+#include <cstdlib>
 #include <unistd.h>
-#include <signal.h>
+#include <csignal>
 
 #include <errno.h>
 #include <string.h>
--- nxcomp/Misc.h.orig	2008-07-21 18:16:07 +0400
+++ nxcomp/Misc.h	2008-07-21 18:16:23 +0400
@@ -21,8 +21,8 @@
 #include <iostream>
 #include <fstream>
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 using namespace std;
 
--- nxcomp/Proxy.cpp.orig	2008-07-21 18:14:04 +0400
+++ nxcomp/Proxy.cpp	2008-07-21 18:14:49 +0400
@@ -15,9 +15,9 @@
 /*                                                                        */
 /**************************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 #include <unistd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 
--- nxcomp/Split.cpp.orig	2008-07-21 18:13:16 +0400
+++ nxcomp/Split.cpp	2008-07-21 18:13:46 +0400
@@ -16,7 +16,7 @@
 /**************************************************************************/
 
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <utime.h>