Minor header file reorganization

6 files changed, 24 insertions, 13 deletions

diff --git a/src/uscxml/Interpreter.h b/src/uscxml/Interpreter.h
index 25c89a2..eaedeb1 100644
--- a/src/uscxml/Interpreter.h
+++ b/src/uscxml/Interpreter.h
@@ -26,8 +26,7 @@
 
 #include "uscxml/URL.h"
 
-#include <boost/algorithm/string.hpp>
-
+#include <boost/shared_ptr.hpp>
 #include <iostream>
 #include <set>
 #include <map>
diff --git a/src/uscxml/server/HTTPServer.cpp b/src/uscxml/server/HTTPServer.cpp
index 9432c56..ce403ee 100644
--- a/src/uscxml/server/HTTPServer.cpp
+++ b/src/uscxml/server/HTTPServer.cpp
@@ -25,8 +25,6 @@
 #endif
 
 #include "uscxml/server/HTTPServer.h"
-#include "uscxml/Message.h"
-#include "uscxml/Factory.h"
 
 #include <string>
 #include <iostream>
@@ -35,7 +33,6 @@ extern "C" {
 #include <event2/dns.h>
 #include <event2/event.h>
 #include <event2/buffer.h>
-#include <event2/http.h>
 #include <event2/keyvalq_struct.h>
 #include <event2/http_struct.h>
 #include <event2/thread.h>
@@ -45,8 +42,12 @@ extern "C" {
 #include <boost/algorithm/string.hpp>
 
 #ifndef _WIN32
-#include <netdb.h>
-#include <arpa/inet.h>
+#include <netinet/in.h>                 // for INADDR_ANY
+#include <stdint.h>                     // for uint16_t
+#include <stdlib.h>                     // for NULL, free
+#include <unistd.h>                     // for gethostname
+//#include <netdb.h>
+//#include <arpa/inet.h>
 #endif
 
 #if (defined EVENT_SSL_FOUND && defined OPENSSL_FOUND)
@@ -57,6 +58,9 @@ extern "C" {
 #include <event2/bufferevent_ssl.h>
 #endif
 
+#include "uscxml/Message.h"
+#include "uscxml/Convenience.h"         // for toStr
+
 #ifdef BUILD_AS_PLUGINS
 #include <Pluma/Connector.hpp>
 #endif
diff --git a/src/uscxml/server/HTTPServer.h b/src/uscxml/server/HTTPServer.h
index 0b82947..581181c 100644
--- a/src/uscxml/server/HTTPServer.h
+++ b/src/uscxml/server/HTTPServer.h
@@ -20,17 +20,20 @@
 #ifndef HTTPSERVER_H_AIH108EG
 #define HTTPSERVER_H_AIH108EG
 
-#include <string>
-#include <map>
+#include <stddef.h>                     // for NULL
 
-#include "uscxml/Common.h"
+#include <map>                          // for map, map<>::iterator, etc
+#include <string>                       // for string, operator<
 
 extern "C" {
-#include <event2/http.h>
+#include "event2/util.h"                // for evutil_socket_t
+#include <event2/http.h>                // for evhttp_request
 }
 
-#include "uscxml/concurrency/tinythread.h"
-#include "uscxml/Message.h"
+#include "uscxml/Common.h"              // for USCXML_API
+#include "uscxml/Message.h"             // for Data, Event
+#include "uscxml/concurrency/tinythread.h"  // for recursive_mutex, etc
+#include "uscxml/config.h"              // for OPENSSL_FOUND
 
 namespace uscxml {
 
diff --git a/test/src/test-cmdline-parsing.cpp b/test/src/test-cmdline-parsing.cpp
index a610248..25ffb44 100644
--- a/test/src/test-cmdline-parsing.cpp
+++ b/test/src/test-cmdline-parsing.cpp
@@ -2,6 +2,8 @@
 #include "uscxml/Interpreter.h"
 #include <glog/logging.h>
 
+#include <boost/algorithm/string.hpp>
+
 int main(int argc, char** argv) {
 	using namespace uscxml;
 
diff --git a/test/src/test-stress.cpp b/test/src/test-stress.cpp
index 4f15bc3..996e0ee 100644
--- a/test/src/test-stress.cpp
+++ b/test/src/test-stress.cpp
@@ -3,6 +3,7 @@
 #include <glog/logging.h>
 
 #include "uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h"
+#include <boost/algorithm/string.hpp>
 
 #ifdef HAS_SIGNAL_H
 #include <signal.h>
diff --git a/test/src/test-w3c.cpp b/test/src/test-w3c.cpp
index 768f6be..f99e969 100644
--- a/test/src/test-w3c.cpp
+++ b/test/src/test-w3c.cpp
@@ -1,6 +1,7 @@
 #include "uscxml/config.h"
 #include "uscxml/Interpreter.h"
 #include <glog/logging.h>
+#include <boost/algorithm/string.hpp>
 
 #ifdef HAS_SIGNAL_H
 #include <signal.h>
@@ -18,6 +19,7 @@
 #include "XGetopt.h"
 #endif
 
+
 #ifdef HAS_EXECINFO_H
 void printBacktrace(void** array, int size) {
 	char** messages = backtrace_symbols(array, size);