Drop cacheiterators.h include

Including cacheiterators.h before pkgcache.h fails because
pkgcache.h depends on cacheiterators.h.

57 files changed, 0 insertions, 57 deletions

diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc
index f50c23e46..6b68d8f9c 100644
--- a/apt-inst/extract.cc
+++ b/apt-inst/extract.cc
@@ -54,7 +54,6 @@
 #include <apt-pkg/filelist.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <string.h>
 #include <string>
diff --git a/apt-inst/extract.h b/apt-inst/extract.h
index a62ff51bd..d2e355474 100644
--- a/apt-inst/extract.h
+++ b/apt-inst/extract.h
@@ -20,7 +20,6 @@
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/filelist.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index f807178e6..f8162a3bd 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -28,7 +28,6 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/gpgv.h>
 
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 343144122..5ce85a5d6 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -24,7 +24,6 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/weakptr.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 #include <vector>
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2c0cd1104..2b4cf9eb7 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -23,7 +23,6 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/prettyprinters.h>
 #include <apt-pkg/dpkgpm.h>
 
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 5148ff19d..64ffef8a0 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -33,7 +33,6 @@
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <iostream>
 #include <string>
diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index e23f37675..097876b3a 100644
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -21,7 +21,6 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/acquire.h>
diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc
index cc4cdf73c..8861d5354 100644
--- a/apt-pkg/cachefilter.cc
+++ b/apt-pkg/cachefilter.cc
@@ -10,7 +10,6 @@
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/macros.h>
 
diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index 30a3368e5..8a6c01341 100644
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -7,7 +7,6 @@
 #define APT_CACHEFILTER_H
 // Include Files							/*{{{*/
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 #include <vector>
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index f8ab7acb9..4591f39b9 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -19,7 +19,6 @@
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/policy.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/macros.h>
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index 1ac61af59..07b1f1f9d 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -28,7 +28,6 @@
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
 #ifndef APT_8_CLEANER_HEADERS
diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 9f408e46e..9fa0fb4e8 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -17,7 +17,6 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 #include <string.h>
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 799144ecb..96a55d4da 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -20,7 +20,6 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/srcrecords.h>
 
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 3652f631c..40a9e4bbc 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -16,7 +16,6 @@
 #define PKGLIB_DEBINDEXFILE_H
 
 #include <apt-pkg/indexfile.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/srcrecords.h>
 
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 3a26b40c4..c35fbe416 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -21,7 +21,6 @@
 #include <apt-pkg/crc-16.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/tagfile-keys.h>
 #include <apt-pkg/macros.h>
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index a132f34a6..54e09e74d 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -15,7 +15,6 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 899f7328b..d2b530cff 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -20,7 +20,6 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <algorithm>
 
diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index 5185c92d8..1a3701046 100644
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -12,7 +12,6 @@
 
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <vector>
 class Configuration;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 80bee03dd..b55cd951f 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -20,7 +20,6 @@
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/statechanges.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/version.h>
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 05b788e45..71026f816 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -22,7 +22,6 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/prettyprinters.h>
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/macros.h>
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 1ab86644d..58422f61b 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -39,7 +39,6 @@
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
 #include <stddef.h>
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index fb23c1c55..f0c3fc42c 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -12,7 +12,6 @@
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/prettyprinters.h>
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/progress.h>
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 2c9082ed3..b3a1d29ea 100644
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -11,7 +11,6 @@
 
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
 #include <stdio.h>
diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index 4119639a6..2afa7538b 100644
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -16,7 +16,6 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/pkgsystem.h>
diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index 1ceb21a17..d921f0126 100644
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -16,7 +16,6 @@
 #include <apt-pkg/edspindexfile.h>
 #include <apt-pkg/edspsystem.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/fileutl.h>
 
 #include <stddef.h>
diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
index c0c9526b5..5ea7a45f3 100644
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -11,7 +11,6 @@
 #define PKGLIB_EDSPSYSTEM_H
 
 #include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgcache.h>
 
 #include <memory>
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index b860e2335..2b3554d2c 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -17,7 +17,6 @@
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgcachegen.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/progress.h>
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 046216ab2..52ec5cb88 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -24,7 +24,6 @@
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
 #include <map>
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 98793e6a9..c7aae6450 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -69,7 +69,6 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/pkgcache.h>
 
 #include <stdlib.h>
diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index 9171c45d6..19a7d5436 100644
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -16,7 +16,6 @@
 #define PKGLIB_ORDERLIST_H
 
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
 #include <string>
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 85ac5f9da..579c31901 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -26,7 +26,6 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/install-progress.h>
 #include <apt-pkg/prettyprinters.h>
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index e52667fbc..cd50d8511 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -27,7 +27,6 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <stddef.h>
 #include <string.h>
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index cb51c113a..f36fadbdc 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -21,7 +21,6 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
 #include <vector>
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index ef4c17cd2..1ec753aac 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -15,7 +15,6 @@
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <stddef.h>
 #include <vector>
diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index affaa5c9a..4b13072e2 100644
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -37,7 +37,6 @@
 #define PKGLIB_PKGSYSTEM_H
 
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <vector>
 
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index e87ba3ee2..639f90991 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/cacheiterators.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/versionmatch.h>
 #include <apt-pkg/version.h>
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 943332bbb..77287fe87 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -34,7 +34,6 @@
 
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/versionmatch.h>
 
 #include <vector>
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index df2e0b46d..39e8a57a0 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -20,7 +20,6 @@
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/debsrcrecords.h>
 
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 65f9c2b89..3971ce4d0 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -23,7 +23,6 @@
 #define PKGLIB_SOURCELIST_H
 
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/macros.h>
 
 #include <time.h>
diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc
index a61789c11..1f3caa7e8 100644
--- a/apt-pkg/upgrade.cc
+++ b/apt-pkg/upgrade.cc
@@ -9,7 +9,6 @@
 #include <apt-pkg/upgrade.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 2376ca8fd..a8ed052a5 100644
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -17,7 +17,6 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index 156ad61cb..ce8f95de5 100644
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -36,7 +36,6 @@
 #define PKGLIB_VERSIONMATCH_H
 
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <string>
 
diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc
index 52cd22d2a..5b15925b2 100644
--- a/apt-private/private-cacheset.cc
+++ b/apt-private/private-cacheset.cc
@@ -3,7 +3,6 @@
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/depcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/cachefilter.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
diff --git a/apt-private/private-depends.cc b/apt-private/private-depends.cc
index 3a3a2737a..2934abc0b 100644
--- a/apt-private/private-depends.cc
+++ b/apt-private/private-depends.cc
@@ -3,7 +3,6 @@
 
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/cmndline.h>
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index e37ff5390..340f4fdbd 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -14,7 +14,6 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/packagemanager.h>
diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index d2a9bed3f..6e571f173 100644
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -4,7 +4,6 @@
 #include <apt-pkg/cachefile.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/macros.h>
 
diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 32c8eeaa2..f85e116e5 100644
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -11,7 +11,6 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <apt-private/private-cacheset.h>
 #include <apt-private/private-list.h>
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 3b8832c21..43f8162a5 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -9,7 +9,6 @@
 #include <apt-pkg/policy.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <apt-private/private-output.h>
 #include <apt-private/private-cachefile.h>
diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc
index bae04173d..831b5246c 100644
--- a/apt-private/private-search.cc
+++ b/apt-private/private-search.cc
@@ -7,7 +7,6 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/policy.h>
 #include <apt-pkg/progress.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/macros.h>
diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index 27338a08c..9dbb90b16 100644
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -12,7 +12,6 @@
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/tagfile.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/macros.h>
diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index e9ec7c6cf..cec56c4c3 100644
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -6,7 +6,6 @@
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/cachefile.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 2fe2e7649..ccec1b1f9 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -34,7 +34,6 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/version.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/macros.h>
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index a4468b989..5a61a0f53 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -18,7 +18,6 @@
 #include <apt-pkg/init.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/pkgcachegen.h>
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 95d88e2ad..ba9d784ec 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -53,7 +53,6 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/upgrade.h>
 #include <apt-pkg/sptr.h>
 
diff --git a/cmdline/apt-internal-planner.cc b/cmdline/apt-internal-planner.cc
index 1f74aa78f..1e9de2e53 100644
--- a/cmdline/apt-internal-planner.cc
+++ b/cmdline/apt-internal-planner.cc
@@ -23,7 +23,6 @@
 #include <apt-pkg/prettyprinters.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <apt-private/private-output.h>
 #include <apt-private/private-cmndline.h>
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index aecb0eaba..7b8fe952a 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -23,7 +23,6 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
 
 #include <apt-private/private-output.h>
 #include <apt-private/private-cmndline.h>
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 0cba31e70..d808f4b9b 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -16,7 +16,6 @@
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/statechanges.h>
-#include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/macros.h>