1 files changed, 5 insertions, 15 deletions
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index d0de72462..9dfa1538a 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -40,21 +40,16 @@
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/acquire.h>
+// include pkg{DistUpgrade,AllUpgrade,MiniizeUpgrade} here for compatiblity
 using std::ostream;
 #endif
 
+#ifndef APT_9_CLEANER_HEADERS
+#include <apt-pkg/upgrade.h>
+#endif
+
 class pkgAcquireStatus;
 
-namespace APT {
-   namespace Upgrade {
-      // FIXME: make this "enum class UpgradeMode {" once we enable c++11
-      enum UpgradeMode {
-         FORBID_REMOVE_PACKAGES = 1,
-         FORBID_NEW_INSTALL_PACKAGES = 2,
-      };
-      bool Upgrade(pkgDepCache &Cache, int UpgradeMode);
-   }
-}
 
 class pkgSimulate : public pkgPackageManager				/*{{{*/
 {
@@ -152,14 +147,9 @@ class pkgProblemResolver						/*{{{*/
    ~pkgProblemResolver();
 };
 									/*}}}*/
-bool pkgDistUpgrade(pkgDepCache &Cache);
 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);
 
-bool pkgAllUpgrade(pkgDepCache &Cache);
-
-bool pkgMinimizeUpgrade(pkgDepCache &Cache);
-
 void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
 
 bool ListUpdate(pkgAcquireStatus &progress, pkgSourceList &List, int PulseInterval=0);