From 6234457920c5f8529c5a0f9d2b60aa0da861e37e Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 8 Aug 2019 14:03:24 +0200
Subject: [PATCH] Fix include in stringTools.h

---
 include/tools/stringTools.h | 7 +------
 src/aria2.cpp               | 1 +
 src/libxml_dumper.cpp       | 7 ++++---
 src/opds_dumper.cpp         | 3 ++-
 src/tools/pathTools.cpp     | 5 ++++-
 src/tools/stringTools.cpp   | 7 ++++++-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/include/tools/stringTools.h b/include/tools/stringTools.h
index 7b56a4c08..7dd2605ed 100644
--- a/include/tools/stringTools.h
+++ b/include/tools/stringTools.h
@@ -22,14 +22,9 @@
 
 #include <unicode/unistr.h>
 
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
 #include <string>
 #include <vector>
-
-#include "pathTools.h"
+#include <sstream>
 
 namespace kiwix
 {
diff --git a/src/aria2.cpp b/src/aria2.cpp
index 757f6a151..455b41c32 100644
--- a/src/aria2.cpp
+++ b/src/aria2.cpp
@@ -2,6 +2,7 @@
 
 #include "aria2.h"
 #include "xmlrpc.h"
+#include <iostream>
 #include <sstream>
 #include <thread>
 #include <chrono>
diff --git a/src/libxml_dumper.cpp b/src/libxml_dumper.cpp
index 18b3f1bc9..b6d3b488a 100644
--- a/src/libxml_dumper.cpp
+++ b/src/libxml_dumper.cpp
@@ -20,9 +20,10 @@
 #include "libxml_dumper.h"
 #include "book.h"
 
-#include <tools/base64.h>
-#include <tools/stringTools.h>
-#include <tools/otherTools.h>
+#include "tools/base64.h"
+#include "tools/stringTools.h"
+#include "tools/otherTools.h"
+#include "tools/pathTools.h"
 
 namespace kiwix
 {
diff --git a/src/opds_dumper.cpp b/src/opds_dumper.cpp
index 7f239f61b..af3f1522d 100644
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -20,7 +20,8 @@
 #include "opds_dumper.h"
 #include "book.h"
 
-#include <tools/otherTools.h>
+#include "tools/otherTools.h"
+#include <iomanip>
 
 namespace kiwix
 {
diff --git a/src/tools/pathTools.cpp b/src/tools/pathTools.cpp
index 4dc6e4680..c48784e76 100644
--- a/src/tools/pathTools.cpp
+++ b/src/tools/pathTools.cpp
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-#include <tools/pathTools.h>
+#include "tools/pathTools.h"
 
 #ifdef __APPLE__
 #include <limits.h>
@@ -36,6 +36,9 @@
 #include <vector>
 #include <sys/stat.h>
 #include <sstream>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
 
 #ifdef _WIN32
 const std::string SEPARATOR("\\");
diff --git a/src/tools/stringTools.cpp b/src/tools/stringTools.cpp
index 91d5d0249..feb0f34f0 100644
--- a/src/tools/stringTools.cpp
+++ b/src/tools/stringTools.cpp
@@ -19,6 +19,7 @@
 
 #include <tools/stringTools.h>
 
+#include <tools/pathTools.h>
 #include <unicode/normlzr.h>
 #include <unicode/rep.h>
 #include <unicode/translit.h>
@@ -26,6 +27,10 @@
 #include <unicode/uniset.h>
 #include <unicode/ustring.h>
 
+
+#include <iostream>
+#include <iomanip>
+
 /* tell ICU where to find its dat file (tables) */
 void kiwix::loadICUExternalTables()
 {
@@ -36,7 +41,7 @@ void kiwix::loadICUExternalTables()
       = computeAbsolutePath(executableDirectory, "icudt58l.dat");
   try {
     u_setDataDirectory(datPath.c_str());
-  } catch (exception& e) {
+  } catch (std::exception& e) {
     std::cerr << e.what() << std::endl;
   }
 #endif