Clean up a bunch of #include blocks in src/cmdline/.

26 files changed, 133 insertions, 52 deletions

diff --git a/src/cmdline/cmdline_action.h b/src/cmdline/cmdline_action.h
index 162f92d0..ae1eda65 100644
--- a/src/cmdline/cmdline_action.h
+++ b/src/cmdline/cmdline_action.h
@@ -20,9 +20,14 @@
 #ifndef CMDLINE_ACTION_H
 #define CMDLINE_ACTION_H
 
+// Local includes:
 #include "cmdline_common.h"
 
+
+// System includes:
 #include <boost/shared_ptr.hpp>
+
+
 /** \file cmdline_action.h
  */
 
diff --git a/src/cmdline/cmdline_changelog.cc b/src/cmdline/cmdline_changelog.cc
index 7ed10c14..8d9bccf9 100644
--- a/src/cmdline/cmdline_changelog.cc
+++ b/src/cmdline/cmdline_changelog.cc
@@ -17,6 +17,7 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+// Local includes:
 #include "cmdline_changelog.h"
 
 #include "cmdline_common.h"
@@ -32,6 +33,7 @@
 #include <generic/apt/download_queue.h>
 #include <generic/apt/pkg_changelog.h>
 
+// System includes:
 #include <apt-pkg/error.h>
 #include <apt-pkg/metaindex.h>
 #include <apt-pkg/progress.h>
diff --git a/src/cmdline/cmdline_changelog.h b/src/cmdline/cmdline_changelog.h
index ed841847..f638e705 100644
--- a/src/cmdline/cmdline_changelog.h
+++ b/src/cmdline/cmdline_changelog.h
@@ -20,6 +20,7 @@
 #ifndef CMDLINE_CHANGELOG_H
 #define CMDLINE_CHANGELOG_H
 
+// System includes:
 #include <boost/shared_ptr.hpp>
 
 #include <string>
diff --git a/src/cmdline/cmdline_clean.cc b/src/cmdline/cmdline_clean.cc
index 605622fb..8d9a1d3f 100644
--- a/src/cmdline/cmdline_clean.cc
+++ b/src/cmdline/cmdline_clean.cc
@@ -17,6 +17,8 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_clean.h"
 
 #include "text_progress.h"
@@ -27,6 +29,8 @@
 #include <generic/apt/apt.h>
 #include <generic/apt/config_signal.h>
 
+
+// System includes:
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/clean.h>
 #include <apt-pkg/error.h>
diff --git a/src/cmdline/cmdline_do_action.cc b/src/cmdline/cmdline_do_action.cc
index d15cb154..84581031 100644
--- a/src/cmdline/cmdline_do_action.cc
+++ b/src/cmdline/cmdline_do_action.cc
@@ -17,6 +17,8 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_do_action.h"
 
 #include "cmdline_action.h"
@@ -35,6 +37,8 @@
 
 #include <aptitude.h>
 
+
+// System includes:
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/policy.h>
diff --git a/src/cmdline/cmdline_extract_cache_subset.cc b/src/cmdline/cmdline_extract_cache_subset.cc
index b2e3b600..7d12dd76 100644
--- a/src/cmdline/cmdline_extract_cache_subset.cc
+++ b/src/cmdline/cmdline_extract_cache_subset.cc
@@ -17,6 +17,8 @@
 //   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 //   Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_extract_cache_subset.h"
 
 #include "cmdline_util.h"
@@ -31,11 +33,13 @@
 #include <generic/apt/matching/parse.h>
 #include <generic/apt/matching/pattern.h>
 
-#include <stdio.h>
 
+// System includes:
 #include <apt-pkg/error.h>
 #include <apt-pkg/progress.h>
 
+#include <stdio.h>
+
 using aptitude::cmdline::create_terminal;
 using aptitude::cmdline::make_text_progress;
 using aptitude::cmdline::terminal;
diff --git a/src/cmdline/cmdline_forget_new.cc b/src/cmdline/cmdline_forget_new.cc
index 33c63456..d27684c5 100644
--- a/src/cmdline/cmdline_forget_new.cc
+++ b/src/cmdline/cmdline_forget_new.cc
@@ -17,6 +17,8 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_forget_new.h"
 
 #include "terminal.h"
@@ -27,6 +29,8 @@
 #include <generic/apt/apt.h>
 #include <generic/apt/config_signal.h>
 
+
+// System includes:
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
diff --git a/src/cmdline/cmdline_progress.cc b/src/cmdline/cmdline_progress.cc
index 31c44668..2cd4407a 100644
--- a/src/cmdline/cmdline_progress.cc
+++ b/src/cmdline/cmdline_progress.cc
@@ -17,16 +17,20 @@
 // along with this program; see the file COPYING.  If not, write to
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
+
+
+// Local includes:
 #include "cmdline_progress.h"
 
 #include "terminal.h"
-#include <sys/ioctl.h>
 
 #include <generic/apt/acqprogress.h>
 #include <generic/apt/apt.h>
 #include <generic/apt/config_signal.h>
 #include <generic/apt/download_signal_log.h>
 
+
+// System includes:
 #include <sigc++/adaptors/bind.h>
 #include <sigc++/functors/mem_fun.h>
 #include <sigc++/functors/ptr_fun.h>
diff --git a/src/cmdline/cmdline_progress.h b/src/cmdline/cmdline_progress.h
index df9a9579..f3050480 100644
--- a/src/cmdline/cmdline_progress.h
+++ b/src/cmdline/cmdline_progress.h
@@ -23,6 +23,8 @@
 /** \file cmdline_progress.h
  */
 
+// System includes:
+
 #include <boost/shared_ptr.hpp>
 
 class download_signal_log;
diff --git a/src/cmdline/cmdline_prompt.cc b/src/cmdline/cmdline_prompt.cc
index da632587..0956b21e 100644
--- a/src/cmdline/cmdline_prompt.cc
+++ b/src/cmdline/cmdline_prompt.cc
@@ -19,6 +19,8 @@
 //
 //   Handles the preview and prompt that's displayed from the command-line.
 
+
+// Local includes:
 #include "cmdline_prompt.h"
 
 #include "cmdline_action.h"
@@ -41,16 +43,17 @@
 
 #include <generic/util/util.h>
 
-#include <cwidget/fragment.h>
-#include <cwidget/generic/util/transcode.h>
-#include <cwidget/toplevel.h>
-
+// System includes:
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/dpkgpm.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/strutl.h>
 
+#include <cwidget/fragment.h>
+#include <cwidget/generic/util/transcode.h>
+#include <cwidget/toplevel.h>
+
 #include <algorithm>
 
 using namespace std;
diff --git a/src/cmdline/cmdline_prompt.h b/src/cmdline/cmdline_prompt.h
index ee9dc40f..26d6ad42 100644
--- a/src/cmdline/cmdline_prompt.h
+++ b/src/cmdline/cmdline_prompt.h
@@ -20,11 +20,14 @@
 #ifndef CMDLINE_PROMPT_H
 #define CMDLINE_PROMPT_H
 
+// Local includes:
 #include "cmdline_common.h"
 
 #include "terminal.h"
 
+// System includes:
 #include <boost/shared_ptr.hpp>
+
 #include <cwidget/generic/util/exception.h>
 
 /** \file cmdline_prompt.h
diff --git a/src/cmdline/cmdline_resolver.cc b/src/cmdline/cmdline_resolver.cc
index af0aba7f..da2c2f40 100644
--- a/src/cmdline/cmdline_resolver.cc
+++ b/src/cmdline/cmdline_resolver.cc
@@ -17,6 +17,8 @@
 //   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 //   Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_resolver.h"
 
 #include "cmdline_action.h"
@@ -31,20 +33,21 @@
 #include <aptitude.h>
 #include <solution_fragment.h>
 
-#include <boost/lexical_cast.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/ref.hpp>
-
 #include <generic/apt/aptcache.h>
 #include <generic/apt/aptitude_resolver_universe.h>
 #include <generic/apt/config_signal.h>
 #include <generic/apt/resolver_manager.h>
-
 #include <generic/problemresolver/exceptions.h>
 #include <generic/problemresolver/solution.h>
-
 #include <generic/util/util.h>
 
+
+// System includes:
+#include <boost/lexical_cast.hpp>
+#include <boost/make_shared.hpp>
+#include <boost/ref.hpp>
+#include <boost/shared_ptr.hpp>
+
 #include <cwidget/fragment.h>
 #include <cwidget/generic/util/ssprintf.h>
 
diff --git a/src/cmdline/cmdline_resolver.h b/src/cmdline/cmdline_resolver.h
index 84bb92a2..2ffaad46 100644
--- a/src/cmdline/cmdline_resolver.h
+++ b/src/cmdline/cmdline_resolver.h
@@ -20,13 +20,17 @@
 #ifndef CMDLINE_RESOLVER_H
 #define CMDLINE_RESOLVER_H
 
+// Local includes:
 #include "cmdline_common.h"
 
 // We need these two to declare get_current_solution().
 //#include <generic/apt/aptitude_resolver_universe.h>
 #include <generic/problemresolver/solution.h>
 
+
+// System includes:
 #include <boost/shared_ptr.hpp>
+
 /** \file cmdline_resolver.h
  */
 
diff --git a/src/cmdline/cmdline_search.cc b/src/cmdline/cmdline_search.cc
index e6e34e90..f11ce84a 100644
--- a/src/cmdline/cmdline_search.cc
+++ b/src/cmdline/cmdline_search.cc
@@ -18,6 +18,8 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_search.h"
 
 #include "cmdline_common.h"
@@ -39,13 +41,15 @@
 #include <cwidget/config/column_definition.h>
 #include <cwidget/generic/util/transcode.h>
 
+
+// System includes:
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
-#include <algorithm>
-
 #include <boost/scoped_ptr.hpp>
 
+#include <algorithm>
+
 using namespace std;
 namespace cw = cwidget;
 using aptitude::Loggers;
diff --git a/src/cmdline/cmdline_show.cc b/src/cmdline/cmdline_show.cc
index a2d181ea..548e893c 100644
--- a/src/cmdline/cmdline_show.cc
+++ b/src/cmdline/cmdline_show.cc
@@ -17,6 +17,8 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_show.h"
 
 #include <aptitude.h>
@@ -33,6 +35,8 @@
 #include <generic/apt/matching/parse.h>
 #include <generic/apt/matching/pattern.h>
 
+
+// System includes:
 #include <cwidget/fragment.h>
 #include <cwidget/generic/util/transcode.h>
 
diff --git a/src/cmdline/cmdline_show.h b/src/cmdline/cmdline_show.h
index bb23d829..5498d1b6 100644
--- a/src/cmdline/cmdline_show.h
+++ b/src/cmdline/cmdline_show.h
@@ -20,13 +20,14 @@
 #ifndef CMDLINE_SHOW_H
 #define CMDLINE_SHOW_H
 
+// System includes:
+#include <apt-pkg/pkgcache.h>
+
 #include <boost/shared_ptr.hpp>
 
 #include <iosfwd>
 #include <string>
 
-#include <apt-pkg/pkgcache.h>
-
 /** \file cmdline_show.h
  */
 
diff --git a/src/cmdline/cmdline_simulate.cc b/src/cmdline/cmdline_simulate.cc
index 7b975aa1..97a8e835 100644
--- a/src/cmdline/cmdline_simulate.cc
+++ b/src/cmdline/cmdline_simulate.cc
@@ -17,6 +17,8 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_simulate.h"
 
 #include "cmdline_common.h"
@@ -27,6 +29,8 @@
 
 #include <generic/apt/apt.h>
 
+
+// System includes:
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/error.h>
 
diff --git a/src/cmdline/cmdline_simulate.h b/src/cmdline/cmdline_simulate.h
index d0718b55..93f88718 100644
--- a/src/cmdline/cmdline_simulate.h
+++ b/src/cmdline/cmdline_simulate.h
@@ -20,8 +20,11 @@
 #ifndef CMDLINE_SIMULATE_H
 #define CMDLINE_SIMULATE_H
 
+// Local includes:
 #include "cmdline_common.h"
 
+
+// System includes:
 #include <boost/shared_ptr.hpp>
 
 /** \file cmdline_simulate.h
diff --git a/src/cmdline/cmdline_spinner.cc b/src/cmdline/cmdline_spinner.cc
index a09eb4bc..28b2940e 100644
--- a/src/cmdline/cmdline_spinner.cc
+++ b/src/cmdline/cmdline_spinner.cc
@@ -17,11 +17,14 @@
 //   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 //   Boston, MA 02111-1307, USA.
 
+// Local includes:
 #include "cmdline_spinner.h"
 
 #include "cmdline_common.h"
 #include "terminal.h"
 
+
+// System includes:
 #include <iostream>
 
 using aptitude::cmdline::terminal;
diff --git a/src/cmdline/cmdline_update.cc b/src/cmdline/cmdline_update.cc
index 3e859615..6c24e40b 100644
--- a/src/cmdline/cmdline_update.cc
+++ b/src/cmdline/cmdline_update.cc
@@ -17,6 +17,7 @@
 //   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 //   Boston, MA 02111-1307, USA.
 
+// Local includes:
 #include "cmdline_util.h"
 
 #include "terminal.h"
@@ -27,6 +28,8 @@
 #include <generic/apt/config_signal.h>
 #include <generic/apt/download_update_manager.h>
 
+
+// System includes:
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
diff --git a/src/cmdline/cmdline_user_tag.cc b/src/cmdline/cmdline_user_tag.cc
index c39cfa7e..0a4376e4 100644
--- a/src/cmdline/cmdline_user_tag.cc
+++ b/src/cmdline/cmdline_user_tag.cc
@@ -17,6 +17,8 @@
 //   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 //   Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_user_tag.h"
 
 #include "cmdline_util.h"
diff --git a/src/cmdline/cmdline_util.cc b/src/cmdline/cmdline_util.cc
index aa94ff9f..b13e18ea 100644
--- a/src/cmdline/cmdline_util.cc
+++ b/src/cmdline/cmdline_util.cc
@@ -17,6 +17,8 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_util.h"
 
 #include "cmdline_common.h"
@@ -37,13 +39,8 @@
 #include <generic/apt/matching/parse.h>
 #include <generic/apt/matching/pattern.h>
 
-#include <cwidget/fragment.h>
-#include <cwidget/toplevel.h>
-#include <cwidget/generic/util/ssprintf.h>
-
-#include <sigc++/bind.h>
-#include <sigc++/functors/ptr_fun.h>
 
+// System includes:
 #include <apt-pkg/error.h>
 #include <apt-pkg/indexfile.h>
 #include <apt-pkg/metaindex.h>
@@ -51,6 +48,13 @@
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/version.h>
 
+#include <cwidget/fragment.h>
+#include <cwidget/toplevel.h>
+#include <cwidget/generic/util/ssprintf.h>
+
+#include <sigc++/bind.h>
+#include <sigc++/functors/ptr_fun.h>
+
 #include <algorithm>
 
 namespace cw = cwidget;
diff --git a/src/cmdline/cmdline_util.h b/src/cmdline/cmdline_util.h
index a28a69a2..17d49aec 100644
--- a/src/cmdline/cmdline_util.h
+++ b/src/cmdline/cmdline_util.h
@@ -20,25 +20,28 @@
 #ifndef CMDLINE_UTIL_H
 #define CMDLINE_UTIL_H
 
+// Local includes:
 #include "cmdline_common.h"
 
 #include <pkg_sortpolicy.h>
 
-// Ew: for column_definition_list.
-#include <cwidget/config/column_definition.h>
-#include <cwidget/generic/util/ref_ptr.h>
-
 // For download_manager::result
 #include <generic/apt/download_manager.h>
 #include <generic/apt/matching/pattern.h>
 #include <generic/apt/matching/match.h> // For structural_match.
 
-#include <string>
 
+// System includes:
 #include <apt-pkg/srcrecords.h>
 
 #include <boost/shared_ptr.hpp>
 
+// Ew: for column_definition_list.
+#include <cwidget/config/column_definition.h>
+#include <cwidget/generic/util/ref_ptr.h>
+
+#include <string>
+
 /** \file cmdline_util.h
  */
 
diff --git a/src/cmdline/cmdline_versions.cc b/src/cmdline/cmdline_versions.cc
index 02da9170..fa4b18e2 100644
--- a/src/cmdline/cmdline_versions.cc
+++ b/src/cmdline/cmdline_versions.cc
@@ -17,6 +17,8 @@
 // the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+
+// Local includes:
 #include "cmdline_versions.h"
 
 #include "cmdline_util.h"
@@ -26,19 +28,21 @@
 #include <pkg_ver_item.h>
 #include <load_sortpolicy.h>
 
-#include <cwidget/generic/util/ref_ptr.h>
-
 #include <generic/apt/matching/parse.h>
 
+
+// System includes:
+#include <apt-pkg/error.h>
+
 #include <boost/format.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
 
-#include <vector>
+#include <cwidget/generic/util/ref_ptr.h>
 
-#include <apt-pkg/error.h>
+#include <vector>
 
 namespace cw = cwidget;
 namespace m = aptitude::matching;
diff --git a/src/cmdline/cmdline_why.cc b/src/cmdline/cmdline_why.cc
index ed0e5409..377e586c 100644
--- a/src/cmdline/cmdline_why.cc
+++ b/src/cmdline/cmdline_why.cc
@@ -21,6 +21,8 @@
 // downgrade it to a non-error.
 #pragma GCC diagnostic warning "-Wuninitialized"
 
+
+// Local includes:
 #include "cmdline_why.h"
 
 #include "cmdline_common.h"
@@ -29,19 +31,10 @@
 #include "terminal.h"
 
 #include <aptitude.h>
-
+#include <pkg_item.h>
 #include <pkg_ver_item.h> // For column formats.
 #include <solution_fragment.h> // For dep_targets()
 
-#include <algorithm>
-#include <deque>
-
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/version.h>
-
 #include <generic/apt/apt.h>
 #include <generic/apt/matching/match.h>
 #include <generic/apt/matching/parse.h>
@@ -50,12 +43,19 @@
 #include <generic/util/immset.h>
 #include <generic/util/util.h>
 
-#include <cwidget/fragment.h>
+// System includes:
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/version.h>
 
 #include <boost/make_shared.hpp>
 
-#include <pkg_item.h>
+#include <cwidget/fragment.h>
 
+#include <algorithm>
+#include <deque>
 #include <set>
 
 namespace cw = cwidget;
diff --git a/src/cmdline/cmdline_why.h b/src/cmdline/cmdline_why.h
index 95f5decb..880efe99 100644
--- a/src/cmdline/cmdline_why.h
+++ b/src/cmdline/cmdline_why.h
@@ -20,23 +20,26 @@
 #ifndef CMDLINE_WHY_H
 #define CMDLINE_WHY_H
 
-#include <deque>
-#include <string>
-#include <vector>
-
+// Local includes:
 #include <aptitude.h>
 
+#include <generic/apt/apt.h>
+#include <generic/apt/aptcache.h>
+#include <generic/apt/matching/pattern.h>
+
+#include <generic/util/immset.h>
+
+
+// System includes:
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/pkgcache.h>
 
 #include <cwidget/fragment.h>
 
-#include <generic/apt/apt.h>
-#include <generic/apt/aptcache.h>
-#include <generic/apt/matching/pattern.h>
-
-#include <generic/util/immset.h>
+#include <deque>
+#include <string>
+#include <vector>
 
 /** \file cmdline_why.h
  */