[lmi-commits] [lmi] master 925f946 05/22: Include headers iff appropriate

[Greg Chicares]

branch: master
commit 925f9460bf7e9438ec7b06b1fa6fba7215d9441d
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Include headers iff appropriate
---
 authenticity.cpp      |  6 ++----
 authenticity.hpp      |  2 --
 authenticity_test.cpp |  3 +--
 generate_passkey.cpp  |  6 +++---
 md5sum.cpp            |  8 ++++++--
 md5sum.hpp            |  2 ++
 md5sum_cli.cpp        |  3 +++
 md5sum_test.cpp       | 15 ++++++---------
 8 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/authenticity.cpp b/authenticity.cpp
index 6bf24e0..f752713 100644
--- a/authenticity.cpp
+++ b/authenticity.cpp
@@ -24,15 +24,12 @@
 #include "authenticity.hpp"
 
 #include "alert.hpp"
-#include "assert_lmi.hpp"
 #include "calendar_date.hpp"
 #include "global_settings.hpp"
 #include "handle_exceptions.hpp"
 #include "md5.hpp"
 #include "md5sum.hpp"
 #include "path_utility.hpp"             // fs::path inserter
-#include "platform_dependent.hpp"       // chdir()
-#include "system_command.hpp"
 
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -40,8 +37,9 @@
 #include <cstdio>                       // fclose(), fopen()
 #include <cstdlib>                      // exit(), EXIT_FAILURE
 #include <cstring>                      // memcpy()
-#include <iomanip>
 #include <sstream>
+#include <stdexcept>
+#include <vector>
 
 // TODO ?? Known security hole: data files can be modified after they
 // have been validated with 'md5sum'. This problem will grow worse
diff --git a/authenticity.hpp b/authenticity.hpp
index 928aef7..44f5859 100644
--- a/authenticity.hpp
+++ b/authenticity.hpp
@@ -25,13 +25,11 @@
 #include "config.hpp"
 
 #include "calendar_date.hpp"
-#include "md5sum.hpp"
 #include "so_attributes.hpp"
 
 #include <boost/filesystem/path.hpp>
 
 #include <string>
-#include <vector>
 
 /// Permit running the system iff data files and date are valid.
 ///
diff --git a/authenticity_test.cpp b/authenticity_test.cpp
index 9202864..7ff79a9 100644
--- a/authenticity_test.cpp
+++ b/authenticity_test.cpp
@@ -32,11 +32,10 @@
 #include "test_tools.hpp"
 
 #include <boost/filesystem/convenience.hpp> // basename()
-#include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 
-#include <cstdio>
+#include <cstdio>                       // remove()
 #include <cstring>                      // memcpy(), strlen()
 #include <fstream>
 #include <string>
diff --git a/generate_passkey.cpp b/generate_passkey.cpp
index f454034..dc42a12 100644
--- a/generate_passkey.cpp
+++ b/generate_passkey.cpp
@@ -19,10 +19,10 @@
 // email: <address@hidden>
 // snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-#include "authenticity.hpp"       // md5sum_file()
+#include "authenticity.hpp"             // md5sum_file()
 #include "main_common.hpp"
-#include "md5.hpp"
-#include "md5sum.hpp"             // md5_hex_string()
+#include "md5.hpp"                      // md5_buffer(), md5_stream()
+#include "md5sum.hpp"                   // md5_hex_string()
 
 #include <cstdio>
 #include <cstdlib>
diff --git a/md5sum.cpp b/md5sum.cpp
index dd6ad89..01fcf60 100644
--- a/md5sum.cpp
+++ b/md5sum.cpp
@@ -24,10 +24,14 @@
 #include "assert_lmi.hpp"
 #include "md5.hpp"
 #include "md5sum.hpp"
-#include "miscellany.hpp"
 
+#include <cstddef>                      // size_t
 #include <fstream>
-#include <memory>
+#include <iomanip>                      // hex, setfill(), setw()
+#include <ios>                          // ios_base, streamsize
+#include <istream>
+#include <sstream>
+#include <stdexcept>
 
 std::vector<md5sum_for_file> md5_read_checksum_stream
     (std::istream& is
diff --git a/md5sum.hpp b/md5sum.hpp
index 41ded78..cb86f93 100644
--- a/md5sum.hpp
+++ b/md5sum.hpp
@@ -28,7 +28,9 @@
 #include <boost/filesystem/path.hpp>
 
 #include <climits>                      // CHAR_BIT
+#include <iosfwd>
 #include <string>
+#include <utility>                      // move()
 #include <vector>
 
 // The gnu libc md5 implementation seems to assume this:
diff --git a/md5sum_cli.cpp b/md5sum_cli.cpp
index d243f71..629c066 100644
--- a/md5sum_cli.cpp
+++ b/md5sum_cli.cpp
@@ -25,7 +25,10 @@
 #include "main_common.hpp"
 #include "md5sum.hpp"
 
+#include <cstdio>                       // fflush()
 #include <iostream>
+#include <stdexcept>
+#include <string>
 
 int usage(int status)
 {
diff --git a/md5sum_test.cpp b/md5sum_test.cpp
index a5084a9..b503613 100644
--- a/md5sum_test.cpp
+++ b/md5sum_test.cpp
@@ -21,21 +21,18 @@
 
 #include "pchfile.hpp"
 
-#include "assert_lmi.hpp"
-#include "contains.hpp"
 #include "md5sum.hpp"
-#include "miscellany.hpp"
-#include "system_command.hpp"
 #include "test_tools.hpp"
 
-#include <boost/filesystem/convenience.hpp> // basename()
-#include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/operations.hpp> // fs::exists()
 #include <boost/filesystem/path.hpp>
 
-#include <cstdio>
-#include <cstring>                      // memcpy(), strlen()
+#include <cstdio>                       // remove()
 #include <fstream>
+#include <ios>                          // ios_base
+#include <ostream>
+#include <sstream>
+#include <stdexcept>
 #include <string>
 #include <vector>