16 files changed, 30 insertions, 30 deletions
diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index fa7edfc82..1f5acdd97 100644
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -19,11 +19,11 @@
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-output.h>
 
+#include <csignal>
+#include <cstdio>
+#include <cstring>
 #include <iostream>
 #include <sstream>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <apti18n.h>
diff --git a/apt-private/private-cachefile.cc b/apt-private/private-cachefile.cc
index 9d875b4a7..d46f2acc4 100644
--- a/apt-private/private-cachefile.cc
+++ b/apt-private/private-cachefile.cc
@@ -13,8 +13,8 @@
 #include <apt-private/private-output.h>
 
 #include <cstdlib>
+#include <cstring>
 #include <ostream>
-#include <string.h>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc
index 1b2834ea1..bd8f629b1 100644
--- a/apt-private/private-cacheset.cc
+++ b/apt-private/private-cacheset.cc
@@ -13,7 +13,7 @@
 
 #include <apt-private/private-cacheset.h>
 
-#include <stddef.h>
+#include <cstddef>
 
 #include <apti18n.h>
 
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 2805685b0..79881d034 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -12,9 +12,9 @@
 #include <apt-private/private-cmndline.h>
 #include <apt-private/private-main.h>
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdarg>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 
 #include <algorithm>
diff --git a/apt-private/private-depends.cc b/apt-private/private-depends.cc
index 95c747ee3..2664cc919 100644
--- a/apt-private/private-depends.cc
+++ b/apt-private/private-depends.cc
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include <stddef.h>
+#include <cstddef>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index 84a088f3d..3f473b840 100644
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -33,7 +33,7 @@
 #endif
 #include <sys/mount.h>
 #endif
-#include <errno.h>
+#include <cerrno>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index dbcba8fd1..254d93436 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -22,12 +22,12 @@
 #include <apt-pkg/upgrade.h>
 
 #include <algorithm>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <map>
 #include <set>
 #include <vector>
-#include <stdlib.h>
-#include <string.h>
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-cachefile.h>
diff --git a/apt-private/private-json-hooks.cc b/apt-private/private-json-hooks.cc
index ddf1c89d6..58185181e 100644
--- a/apt-private/private-json-hooks.cc
+++ b/apt-private/private-json-hooks.cc
@@ -20,7 +20,7 @@
 #include <stack>
 #include <unordered_map>
 
-#include <signal.h>
+#include <csignal>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
index d4ce0ab2a..a80f03c99 100644
--- a/apt-private/private-main.cc
+++ b/apt-private/private-main.cc
@@ -10,8 +10,8 @@
 #include <iostream>
 #include <locale>
 
-#include <signal.h>
-#include <string.h>
+#include <csignal>
+#include <cstring>
 #include <unistd.h>
 
 #include <apti18n.h>
diff --git a/apt-private/private-moo.cc b/apt-private/private-moo.cc
index ca456ed96..2a9ed9391 100644
--- a/apt-private/private-moo.cc
+++ b/apt-private/private-moo.cc
@@ -17,12 +17,12 @@
 #include <apt-private/private-output.h>
 #include <apt-private/private-utils.h>
 
+#include <cstddef>
+#include <cstring>
+#include <ctime>
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <stddef.h>
-#include <string.h>
-#include <time.h>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index c73d5229b..93b942458 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -13,14 +13,14 @@
 #include <apt-private/private-cachefile.h>
 #include <apt-private/private-output.h>
 
+#include <csignal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iomanip>
 #include <iostream>
 #include <langinfo.h>
 #include <regex.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc
index b2114740e..19a3bf0fa 100644
--- a/apt-private/private-search.cc
+++ b/apt-private/private-search.cc
@@ -20,13 +20,13 @@
 #include <apt-private/private-search.h>
 #include <apt-private/private-show.h>
 
+#include <cstring>
 #include <iostream>
 #include <map>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
-#include <string.h>
 
 #include <apti18n.h>
 									/*}}}*/
diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index 08a4fe6df..cefbd9b67 100644
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -25,9 +25,9 @@
 #include <apt-private/private-install.h>
 #include <apt-private/private-show.h>
 
+#include <cstdio>
 #include <ostream>
 #include <string>
-#include <stdio.h>
 #include <unistd.h>
 
 #include <apti18n.h>
diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index 14bc5b43e..9b9409c80 100644
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -31,10 +31,10 @@
 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/deblistparser.h>
 
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc
index 4cfb87938..a7d003f08 100644
--- a/apt-private/private-sources.cc
+++ b/apt-private/private-sources.cc
@@ -13,9 +13,9 @@
 #include <apt-private/private-sources.h>
 #include <apt-private/private-utils.h>
 
+#include <cstddef>
 #include <iostream>
 #include <string>
-#include <stddef.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/apt-private/private-unmet.cc b/apt-private/private-unmet.cc
index f5161fcc3..229e5a29a 100644
--- a/apt-private/private-unmet.cc
+++ b/apt-private/private-unmet.cc
@@ -10,7 +10,7 @@
 #include <apt-private/private-cacheset.h>
 #include <apt-private/private-unmet.h>
 
-#include <stddef.h>
+#include <cstddef>
 
 #include <iostream>