diff options
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/acquire.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/algorithms.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/cdrom.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/debindexfile.cc | 11 | ||||
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/deb/debversion.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/depcache.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/edsp.cc | 11 | ||||
| -rw-r--r-- | apt-pkg/edsp/edspindexfile.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/edsp/edsplistparser.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/edsp/edspsystem.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/indexcopy.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/indexcopy.h | 2 | ||||
| -rw-r--r-- | apt-pkg/indexfile.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/install-progress.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/metaindex.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/orderlist.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/pkgcache.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/policy.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/update.cc | 2 |
28 files changed, 3 insertions, 70 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 3ed52dbf2..e10a278b5 100644 --- 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 e9ef4e9ac..0f1a162a3 100644 --- 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 5fd378096..2b870cf69 100644 --- 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 446afa08d..6d982c551 100644 --- 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 7e20a7d61..f5bc18394 100644 --- 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 463225963..ffbf86735 100644 --- 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 627cd36c5..d3599b353 100644 --- 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 489d0434e..42eca8677 100644 --- 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 123c91648..b2e9eeb00 100644 --- 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 043025912..48462c6a2 100644 --- 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 644e4d8e4..6ae85d2ea 100644 --- 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 8b2099992..39bbe484f 100644 --- 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 34b0b0cc7..83d0d7db6 100644 --- 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 a8a528131..409117c5e 100644 --- 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 a54a46b1e..ff79b537e 100644 --- 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 c4583252f..f577efcbd 100644 --- 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 f9adb2fb8..13eccc8db 100644 --- 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 316672e1d..d4f04b5b1 100644 --- 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 06312c173..8e50ecfae 100644 --- 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 509fc1bc7..eab198fac 100644 --- 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 58e552474..497a360e9 100644 --- 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 baf695f16..1632b928c 100644 --- 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 dae37e8f8..1e0640422 100644 --- 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 dcae01126..06ec986ed 100644 --- 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 045d7b41e..9d3929cd9 100644 --- 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 68175a24a..6daebbc2a 100644 --- 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 badf702ca..eaa72f084 100644 --- 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 6e65c387c..eca22f8be 100644 --- 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> /*}}}*/ |