Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / vendorlist.h

diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index 62ab78a33e0881e444d38a74f5311c9bdae7528c..bc3702a93852e8952e625420e3810dbb4a8118c5 100644 (file)
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -15,11 +15,19 @@
 
 #include <string>
 #include <vector>
+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/vendor.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/macros.h>
+using std::string;
+using std::vector;
+#endif
+
+class Vendor;
+class Configuration;
 
-class __deprecated pkgVendorList
+class APT_DEPRECATED pkgVendorList
 {
    protected:
    std::vector<Vendor const *> VendorList;