Headers cleanup

diff --git a/src/util.cpp b/src/util.cpp
index cd750ab..02c1a88 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -11,13 +11,10 @@
 #include "version.h"
 
 #include <boost/program_options/detail/config_file.hpp>
-#include <boost/program_options/parsers.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread.hpp>
-#include <openssl/crypto.h>
-#include <openssl/rand.h>
 
 #ifdef WIN32
 #include <io.h> /* for _commit */

diff --git a/src/util.h b/src/util.h
index 8a37c03..3138b7c 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -16,25 +16,22 @@
 #include "compat.h"
 #endif
 
-#include <map>
-#include <vector>
-#include <string>
-
 #ifndef Q_MOC_RUN
 #include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/date_time/gregorian/gregorian_types.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #endif
 
-#include <stdarg.h>
-
 #if defined(__USE_MINGW_ANSI_STDIO)
 #undef __USE_MINGW_ANSI_STDIO // This constant forces MinGW to conduct stupid behavior
 #endif
-#include <inttypes.h>
 
+#include <cinttypes>
+#include <map>
+#include <vector>
+#include <string>
+#include <cstdarg>
 
 static const int32_t nOneHour = 60 * 60;
 static const int32_t nOneDay = 24 * 60 * 60;