Modernize standard library includes

This was automated with sed and git-clang-format, and then I had to
fix up the top of policy.cc by hand as git-clang-format accidentally
indented it by two spaces.

16 files changed, 34 insertions, 34 deletions

diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index f4f8d95eb..a30581198 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -8,17 +8,17 @@
 
 #include "teestream.h"
 
+#include <cerrno>
+#include <csignal>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <dirent.h>
-#include <errno.h>
 #include <netinet/in.h>
 #include <regex.h>
-#include <signal.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <time.h>
 #include <unistd.h>
 
 #include <array>
diff --git a/test/interactive-helper/createdeb-cve-2020-27350.cc b/test/interactive-helper/createdeb-cve-2020-27350.cc
index 57c53ae91..84d1cfa63 100644
--- a/test/interactive-helper/createdeb-cve-2020-27350.cc
+++ b/test/interactive-helper/createdeb-cve-2020-27350.cc
@@ -1,11 +1,11 @@
 #include <config.h>
 
-#include <errno.h>
+#include <cerrno>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/test/interactive-helper/rpmver.cc b/test/interactive-helper/rpmver.cc
index b23ba2876..c1a0d7918 100644
--- a/test/interactive-helper/rpmver.cc
+++ b/test/interactive-helper/rpmver.cc
@@ -1,11 +1,11 @@
 #include <config.h>
 
 #include <apt-pkg/debversion.h>
-#include <ctype.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
 #include <rpm/misc.h>
 #include <rpm/rpmio.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #define xisdigit(x) isdigit(x)
 #define xisalpha(x) isalpha(x)
diff --git a/test/interactive-helper/test_fileutl.cc b/test/interactive-helper/test_fileutl.cc
index 5569af1bf..edc699e62 100644
--- a/test/interactive-helper/test_fileutl.cc
+++ b/test/interactive-helper/test_fileutl.cc
@@ -4,8 +4,8 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 
+#include <cstdlib>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/test/interactive-helper/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
index 2355186d6..9ccdfdb9f 100644
--- a/test/interactive-helper/test_udevcdrom.cc
+++ b/test/interactive-helper/test_udevcdrom.cc
@@ -2,11 +2,11 @@
 
 #include <apt-pkg/cdrom.h>
 
+#include <cassert>
+#include <cstddef>
 #include <iostream>
 #include <string>
 #include <vector>
-#include <assert.h>
-#include <stddef.h>
 
 int main()
 {
diff --git a/test/libapt/cdrom_test.cc b/test/libapt/cdrom_test.cc
index e2ec05ab8..364971e2a 100644
--- a/test/libapt/cdrom_test.cc
+++ b/test/libapt/cdrom_test.cc
@@ -5,9 +5,9 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/fileutl.h>
 
+#include <cstring>
 #include <string>
 #include <vector>
-#include <string.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/libapt/cdromfindpackages_test.cc b/test/libapt/cdromfindpackages_test.cc
index cffa7aa9c..9e13c1d8b 100644
--- a/test/libapt/cdromfindpackages_test.cc
+++ b/test/libapt/cdromfindpackages_test.cc
@@ -5,10 +5,10 @@
 #include <apt-pkg/fileutl.h>
 
 #include <algorithm>
+#include <cstddef>
 #include <iostream>
 #include <string>
 #include <vector>
-#include <stddef.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc
index 012932286..0fe32cf98 100644
--- a/test/libapt/compareversion_test.cc
+++ b/test/libapt/compareversion_test.cc
@@ -22,9 +22,9 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 
+#include <cstdlib>
 #include <fstream>
 #include <string>
-#include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
diff --git a/test/libapt/extracttar_test.cc b/test/libapt/extracttar_test.cc
index c945a0c68..246aea737 100644
--- a/test/libapt/extracttar_test.cc
+++ b/test/libapt/extracttar_test.cc
@@ -1,10 +1,10 @@
 #include <config.h>
 
-#include <apt-pkg/error.h>
 #include <apt-pkg/dirstream.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/extracttar.h>
+#include <cstdlib>
 #include <iostream>
-#include <stdlib.h>
 
 #include "assert.h"
 #include <gtest/gtest.h>
diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc
index ecab2eb50..da772df3b 100644
--- a/test/libapt/fileutl_test.cc
+++ b/test/libapt/fileutl_test.cc
@@ -7,10 +7,10 @@
 #include <apt-pkg/strutl.h>
 
 #include <algorithm>
+#include <cstdlib>
+#include <cstring>
 #include <string>
 #include <vector>
-#include <stdlib.h>
-#include <string.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc
index ff14d4618..42e8355b3 100644
--- a/test/libapt/globalerror_test.cc
+++ b/test/libapt/globalerror_test.cc
@@ -2,10 +2,10 @@
 
 #include <apt-pkg/error.h>
 
+#include <cerrno>
+#include <cstddef>
+#include <cstring>
 #include <string>
-#include <errno.h>
-#include <stddef.h>
-#include <string.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc
index 2d8079e5a..901150e02 100644
--- a/test/libapt/hashsums_test.cc
+++ b/test/libapt/hashsums_test.cc
@@ -5,9 +5,9 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/strutl.h>
 
+#include <cstdlib>
 #include <iostream>
 #include <string>
-#include <stdlib.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/libapt/indexcopytosourcelist_test.cc b/test/libapt/indexcopytosourcelist_test.cc
index b0bfeb4b2..7dbe97329 100644
--- a/test/libapt/indexcopytosourcelist_test.cc
+++ b/test/libapt/indexcopytosourcelist_test.cc
@@ -4,8 +4,8 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/indexcopy.h>
 
+#include <cstdio>
 #include <string>
-#include <stdio.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc
index ed849f768..f641c8c1c 100644
--- a/test/libapt/parsedepends_test.cc
+++ b/test/libapt/parsedepends_test.cc
@@ -4,8 +4,8 @@
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/pkgcache.h>
 
+#include <cstring>
 #include <string>
-#include <string.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
index 42fab65a9..f6a1a91ae 100644
--- a/test/libapt/sourcelist_test.cc
+++ b/test/libapt/sourcelist_test.cc
@@ -3,9 +3,9 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/sourcelist.h>
 
+#include <cstdlib>
+#include <cstring>
 #include <string>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <gtest/gtest.h>
diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc
index 06ea01c32..51a574fb2 100644
--- a/test/libapt/tagfile_test.cc
+++ b/test/libapt/tagfile_test.cc
@@ -3,10 +3,10 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/tagfile.h>
 
+#include <cstdlib>
+#include <cstring>
 #include <sstream>
 #include <string>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include <gtest/gtest.h>