Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

[apt.git] / apt-private / private-upgrade.cc

diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index a97e6d25b3afdc02abeb684cc9cf4f35f5fa6f8d..68b2c5e00a2a31691470f8b0a7df6b5518f5a499 100644 (file)
--- a/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@ -1,12 +1,18 @@
-

 // Includes                                                            /*{{{*/
 // Includes                                                            /*{{{*/

-#include <apt-pkg/algorithms.h>
+#include <config.h>
+

 #include <apt-pkg/upgrade.h>
 #include <apt-pkg/upgrade.h>

+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
+
+#include <apt-private/private-install.h>
+#include <apt-private/private-cachefile.h>
+#include <apt-private/private-upgrade.h>
+#include <apt-private/private-output.h>
+

 #include <iostream>
 #include <iostream>

-#include "private-install.h"
-#include "private-cachefile.h"
-#include "private-upgrade.h"
-#include "private-output.h"
+
+#include <apti18n.h>

                                                                        /*}}}*/
 
 // this is actually performing the various upgrade operations 
                                                                        /*}}}*/
 
 // this is actually performing the various upgrade operations