From daa1352ed3d2bb4bc6aa0f0e7f22be3f0908942d Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Sat, 11 May 2019 17:17:20 +0200
Subject: Run unifdef -DAPT_{8,9,10,15}_CLEANER_HEADERS

---
 apt-pkg/deb/debfile.h       | 6 ------
 apt-pkg/deb/deblistparser.h | 3 ---
 apt-pkg/deb/debmetaindex.h  | 6 ------
 apt-pkg/deb/debrecords.h    | 3 ---
 apt-pkg/deb/debsystem.h     | 3 ---
 apt-pkg/deb/dpkgpm.h        | 7 -------
 6 files changed, 28 deletions(-)

(limited to 'apt-pkg/deb')

diff --git a/apt-pkg/deb/debfile.h b/apt-pkg/deb/debfile.h
index 21c59a567..06b54a43f 100644
--- a/apt-pkg/deb/debfile.h
+++ b/apt-pkg/deb/debfile.h
@@ -29,12 +29,6 @@
 
 #include <string>
 
-#ifndef APT_8_CLEANER_HEADERS
-#include <apt-pkg/md5.h>
-#endif
-#ifndef APT_10_CLEANER_HEADERS
-#include <apt-pkg/pkgcache.h>
-#endif
 
 class FileFd;
 
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 807968452..c041585e6 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -20,9 +20,6 @@
 #include <vector>
 #include <apt-pkg/string_view.h>
 
-#ifndef APT_8_CLEANER_HEADERS
-#include <apt-pkg/indexfile.h>
-#endif
 
 class FileFd;
 
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 864ac3eba..0038f52f9 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -8,12 +8,6 @@
 #include <string>
 #include <vector>
 
-#ifndef APT_8_CLEANER_HEADERS
-#include <apt-pkg/sourcelist.h>
-#endif
-#ifndef APT_10_CLEANER_HEADERS
-#include <apt-pkg/init.h>
-#endif
 
 class pkgAcquire;
 class pkgIndexFile;
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index ea3fc320a..10ef91768 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -20,9 +20,6 @@
 
 #include <string>
 
-#ifndef APT_8_CLEANER_HEADERS
-#include <apt-pkg/indexfile.h>
-#endif
 
 class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
 {
diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index 4503676fa..3a308fb1c 100644
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -19,9 +19,6 @@ class pkgPackageManager;
 class debSystemPrivate;
 class pkgDepCache;
 
-#ifndef APT_10_CLEANER_HEADERS
-class debStatusIndex;
-#endif
 
 class debSystem : public pkgSystem
 {
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 3ba4770e8..a656bf19c 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -18,17 +18,10 @@
 #include <vector>
 #include <stdio.h>
 
-#ifndef APT_10_CLEANER_HEADERS
-#include <apt-pkg/init.h>
-#endif
 
 class pkgDepCache;
 namespace APT { namespace Progress { class PackageManager; } }
 
-#ifndef APT_8_CLEANER_HEADERS
-using std::vector;
-using std::map;
-#endif
 
 class pkgDPkgPMPrivate;
 
-- 
cgit v1.2.3