Cleanup includes after running iwyu

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 3ed52dbf2e58bbad12987ac2c6d54f447d6864cd..e10a278b5db47d65b6fef7dd5c004f2da57fd1b7 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -22,7 +22,6 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/sha1.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/metaindex.h>
 #include <apt-pkg/acquire.h>
@@ -42,7 +41,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string>
-#include <sstream>
 #include <stdio.h>
 #include <ctime>
 

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index e9ef4e9acbb94ba8024ab16c08a9db570a486100..0f1a162a3880239390794433cf2f6ee05c4252e4 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -26,7 +26,6 @@
 #include <string>
 #include <vector>
 #include <iostream>
-#include <sstream>
 
 #include <sys/stat.h>
 #include <stdlib.h>
@@ -34,9 +33,6 @@
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
 
 #include <apti18n.h>
                                                                        /*}}}*/

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 5fd3780965977943be1e825b149f7af1c0d3405b..2b870cf69e575d2fa8d6691bb4b9b1c4dcede67e 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -27,8 +27,6 @@
 #include <string>
 #include <vector>
 #include <iostream>
-#include <sstream>
-#include <iomanip>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,7 +39,6 @@
 #include <sys/select.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include <apti18n.h>
                                                                        /*}}}*/

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 446afa08d44824e1d468eb8ae111e415e349e673..6d982c551c98f5cd4aa81735244dc5b869a66f1e 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -19,9 +19,7 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/edsp.h>
-#include <apt-pkg/progress.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/pkgcache.h>

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 7e20a7d61b50c31cb2168fd511cc4b1e11335d8e..f5bc18394ef5f38f4f52692229c204bc13407fca 100644 (file)
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -29,7 +29,6 @@
 #include <string>
 #include <vector>
 
-#include <apti18n.h>
                                                                        /*}}}*/
 namespace APT {
 // setDefaultConfigurationForCompressors                               /*{{{*/

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 463225963f73106535aca02761c06272fc7cfeb4..ffbf86735dda971f9909e61f69217257bb2bc0a8 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -16,8 +16,6 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <sstream>
-#include <fstream>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 627cd36c5327dc35b0f9465e83974834e512bd50..d3599b35369bf09679e58b4a464c217a5f558f7f 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -16,27 +16,18 @@
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/acquire-item.h>
-#include <apt-pkg/debmetaindex.h>
-#include <apt-pkg/gpgv.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexfile.h>
-#include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
-#include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/srcrecords.h>
-#include <apt-pkg/sptr.h>
 
 #include <stdio.h>
 #include <iostream>
-#include <sstream>
 #include <string>
-#include <memory>
+
 #include <sys/stat.h>
                                                                        /*}}}*/
 

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 489d0434e13d6438e25d257243b52051476c9f51..42eca8677fef61e00f20ec8fedefae82f9c6a5fc 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -18,10 +18,8 @@
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/crc-16.h>
 #include <apt-pkg/md5.h>
-#include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/tagfile.h>

diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 123c91648ba37eeea1a7d4dcb260213124b58622..b2e9eeb0096b4600c5d5cce2dd8a2368ece3b91c 100644 (file)
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -20,12 +20,9 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <set>
 #include <algorithm>
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <apti18n.h>

diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index 043025912ca41ad2a5079ae2620689934fb51559..48462c6a208e1eb776437e47d15bb231f8d4dd83 100644 (file)
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -16,7 +16,6 @@
 #include <apt-pkg/pkgcache.h>
 
 #include <string.h>
-#include <string>
 #include <stdlib.h>
 #include <ctype.h>
                                                                        /*}}}*/

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 644e4d8e4312617ae187fd1aff00910b9055b3ad..6ae85d2ea3a32f4634ebaffc304c04591889c0bf 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -18,7 +18,6 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/install-progress.h>
 #include <apt-pkg/packagemanager.h>
-#include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
@@ -27,7 +26,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
-#include <pty.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stddef.h>

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 8b2099992d4bd7803771c835fa62c332bd6b3dc6..39bbe484f9510a89c44e1ac1b43d3f3086c8372a 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -13,7 +13,6 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 34b0b0cc7fdc9c72fe9131a1999b69587d25c2d8..83d0d7db6a93697fecba26bcd1c6657904bc3aba 100644 (file)
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -7,31 +7,20 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
-#include <apt-pkg/edsp.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/cacheset.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/progress.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/pkgrecords.h>
 
 #include <ctype.h>
 #include <stddef.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <algorithm>
 #include <iostream>
-#include <vector>
 #include <limits>
 #include <string>
-#include <list>
 
 #include <apti18n.h>
                                                                        /*}}}*/

diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index a8a528131c322a9c2e7d5a598ba8a58f6a2341ba..409117c5ef8c93c060f40d128f77a511f8752e74 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -12,13 +12,8 @@
 #include <apt-pkg/edsplistparser.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/debindexfile.h>
 #include <apt-pkg/indexfile.h>
-#include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
-#include <apt-pkg/pkgcachegen.h>
 #include <apt-pkg/pkgrecords.h>
 
 #include <stddef.h>

diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index a54a46b1e2767c5a655e21a8cfcfddc1a280c985..ff79b537e889f30a4f488418330624a27cefccf0 100644 (file)
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -18,7 +18,6 @@
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/tagfile.h>
 
-#include <string>
                                                                        /*}}}*/
 
 // ListParser::edspListParser - Constructor                            /*{{{*/

diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index c4583252f730f679a4c628b5efdac115c95a77b5..f577efcbd46c097fa4fd31aa4f720fba3cea7e51 100644 (file)
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -15,7 +15,6 @@
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/edspindexfile.h>
 #include <apt-pkg/edspsystem.h>
-#include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 
@@ -23,7 +22,6 @@
 #include <string>
 #include <vector>
 
-#include <apti18n.h>
                                                                        /*}}}*/
 
 // System::edspSystem - Constructor                                    /*{{{*/

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index f9adb2fb8ec9a5984caba78ec09e7085332c8740..13eccc8dbf3f9df6dc83873c89ccdd0e60c944a9 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -26,7 +26,6 @@
 #include <apt-pkg/debmetaindex.h>
 
 #include <iostream>
-#include <sstream>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdio.h>

diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 316672e1de47587e6a7a35c2ea419b71c8251844..d4f04b5b1f6986788ba27d562ae9d981418b8e90 100644 (file)
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -10,8 +10,10 @@
 #define INDEXCOPY_H
 
 #include <vector>
+#ifndef APT_11_CLEAN_HEADERS
 #include <string>
 #include <stdio.h>
+#endif
 
 #include <apt-pkg/macros.h>
 

diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 06312c173213d72c7d18f5dfccdd09080b5e2428..8e50ecfaef61ec7cecf001e9a2401fc71bd6f64d 100644 (file)
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -24,9 +24,7 @@
 
 #include <apt-pkg/deblistparser.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 
 #include <string>
 #include <vector>

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 509fc1bc7330531f847bfc783cc28b3386534ab7..eab198fac32fb2711e02926b14afb7450e5dbc3b 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -18,7 +18,6 @@
 #include <apt-pkg/macros.h>
 
 #include <string.h>
-#include <string>
 #include <cstdlib>
 
 #include <apti18n.h>

diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc
index 58e552474121e7b0933a8af4768ac3b285747f94..497a360e977244e5d0d3b81f73f1429158476326 100644 (file)
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@ -8,10 +8,8 @@
 #include <signal.h>
 #include <unistd.h>
 #include <iostream>
-#include <string>
 #include <vector>
 #include <sys/ioctl.h>
-#include <sstream>
 #include <fcntl.h>
 #include <algorithm>
 #include <stdio.h>

diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc
index baf695f164e05ccfdbf1ceb1ae8d7e4e081153f1..1632b928cfb57f4a1e40b3ab4f92207b44eea67c 100644 (file)
--- a/apt-pkg/metaindex.cc
+++ b/apt-pkg/metaindex.cc
@@ -3,8 +3,6 @@
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/metaindex.h>
 
-#include <stddef.h>
-
 #include <string>
 #include <vector>
                                                                        /*}}}*/

diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index dae37e8f8f8bc55d147af020eb54ee924ba2e26f..1e0640422533633b6d262bc34463df2bc5c01d39 100644 (file)
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -68,14 +68,12 @@
 #include <apt-pkg/orderlist.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgcache.h>
 
 #include <stdlib.h>
 #include <string.h>
-#include <string>
 #include <iostream>
                                                                        /*}}}*/
 

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index dcae0112614911ae276dc8e0c8fec0bd4a8ec4fc..06ec986ed7c535bad37361fbdb39f133191cd686 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -23,7 +23,6 @@
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 045d7b41ec8c35e88d691a5bd0647a278f88767e..9d3929cd933758ae189ace642f06e41c77b9e837 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -34,7 +34,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <ostream>
 #include <sstream>
 #include <algorithm>
 #include <vector>

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 68175a24ab3dbb9e4c7b750387729eb450853838..6daebbc2aff75c7a5a8c910150ce73b581123058 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -18,8 +18,6 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/metaindex.h>

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index badf702caecdfc728749652bf4e8b13ef415ff48..eaa72f084159c6ada1312bc5a7d480daa9597dd4 100644 (file)
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -22,7 +22,6 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/versionmatch.h>
@@ -34,7 +33,6 @@
 #include <string>
 #include <vector>
 #include <iostream>
-#include <sstream>
 
 #include <apti18n.h>
                                                                        /*}}}*/

diff --git a/apt-pkg/update.cc b/apt-pkg/update.cc
index 6e65c387c0779067ff2a367fcbd083e8ccf1c1aa..eca22f8be3f8b28f66b32b6608cb8fbb5e90ab20 100644 (file)
--- a/apt-pkg/update.cc
+++ b/apt-pkg/update.cc
@@ -8,10 +8,8 @@
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/update.h>
 
 #include <string>
-#include <vector>
 
 #include <apti18n.h>
                                                                        /*}}}*/