Significant include cleanup for fast_library

src/bgp_protocol.cpp

@@ -11,6 +11,8 @@
 
 #include "all_logcpp_libraries.hpp"
 
+#include <boost/algorithm/string.hpp>
+
 // Get log4cpp logger from main programme
 extern log4cpp::Category& logger;
 

src/fast_library.cpp

@@ -28,6 +28,9 @@
 #include <capnp/serialize-packed.h>
 #endif
 
+#include <boost/algorithm/string.hpp>
+#include <boost/regex.hpp>
+
 boost::regex regular_expression_cidr_pattern("^\\d+\\.\\d+\\.\\d+\\.\\d+\\/\\d+$");
 boost::regex regular_expression_host_pattern("^\\d+\\.\\d+\\.\\d+\\.\\d+$");
 

src/fast_library.hpp

@@ -5,27 +5,16 @@
 #include <iostream>
 #include <map>
 #include <sstream>
-#include <stdint.h>
 #include <string>
 
-#include <sys/types.h>
-#include <unistd.h>
 #include <utility>
 #include <vector>
 
-#include <boost/regex.hpp>
 #include <boost/thread.hpp>
-#include <boost/thread/mutex.hpp>
-
 #include "nlohmann/json.hpp"
 
-// Boost libs
-#include <boost/algorithm/string.hpp>
-
 #include "libpatricia/patricia.hpp"
 
-#include "fast_endianless.hpp"
-
 #include "fastnetmon_networks.hpp"
 
 #define TCP_FIN_FLAG_SHIFT 1

src/netflow_plugin/netflow_collector.cpp

@@ -39,6 +39,8 @@
 // For Netflow lite parsing
 #include "../simple_packet_parser_ng.hpp"
 
+#include <boost/algorithm/string.hpp>
+
 // Get it from main programme
 extern log4cpp::Category& logger;
 

src/sflow_plugin/sflow_collector.cpp

@@ -25,6 +25,8 @@ extern log4cpp::Category& logger;
 
 #include "../simple_packet_parser_ng.hpp"
 
+#include <boost/algorithm/string.hpp>
+
 // Global configuration map
 extern std::map<std::string, std::string> configuration_map;
 

src/xdp_plugin/xdp_collector.cpp

@@ -8,6 +8,8 @@
 
 #include <poll.h> // poll
 
+#include <boost/algorithm/string.hpp>
+
 // TODO: add support for multiple interfaces
 
 // Only relatively fresh kernels have this type and we need to declare this type on older kernels to be able to compile