Merge pull request #544 from julianreisch/include-optimization

optimize includes

src/oatpp-test/UnitTest.hpp

@@ -25,7 +25,6 @@
 #ifndef oatpp_test_UnitTest_hpp
 #define oatpp_test_UnitTest_hpp
 
-#include <functional>
 #include "oatpp/core/base/Environment.hpp"
 #include "oatpp/core/macro/basic.hpp"
 

src/oatpp-test/web/ClientServerTestRunner.hpp

@@ -25,19 +25,13 @@
 #ifndef oatpp_test_web_ClientServerTestRunner_hpp
 #define oatpp_test_web_ClientServerTestRunner_hpp
 
-#include "oatpp/web/server/api/ApiController.hpp"
 #include "oatpp/web/server/HttpRouter.hpp"
 
 #include "oatpp/network/Server.hpp"
-#include "oatpp/network/ConnectionProvider.hpp"
 
 #include "oatpp/core/macro/component.hpp"
 
-#include <list>
-#include <chrono>
-#include <mutex>
 #include <condition_variable>
-#include <thread>
 
 namespace oatpp { namespace test { namespace web {
 

src/oatpp/algorithm/CRC.hpp

@@ -27,8 +27,6 @@
 
 #include "oatpp/core/base/Environment.hpp"
 
-#include "oatpp/encoding/Hex.hpp"
-
 namespace oatpp { namespace algorithm {
 
 /**

src/oatpp/core/IODefinitions.hpp

@@ -26,7 +26,7 @@
 #define oatpp_IODefinitions_hpp
 
 #include "oatpp/core/async/Error.hpp"
-#include "oatpp/core/Types.hpp"
+#include "base/Environment.hpp"
 
 namespace oatpp {
 

src/oatpp/core/async/Coroutine.hpp

@@ -26,17 +26,9 @@
 #ifndef oatpp_async_Coroutine_hpp
 #define oatpp_async_Coroutine_hpp
 
-#include "./Error.hpp"
-
 #include "oatpp/core/async/utils/FastQueue.hpp"
 
 #include "oatpp/core/IODefinitions.hpp"
-#include "oatpp/core/base/Environment.hpp"
-
-#include "oatpp/core/Types.hpp"
-
-#include <chrono>
-#include <exception>
 
 namespace oatpp { namespace async {
 

src/oatpp/core/async/CoroutineWaitList.cpp

@@ -27,11 +27,9 @@
 
 #include "./Processor.hpp"
 #include <algorithm>
-#include <set>
 
 namespace oatpp { namespace async {
 
-
 CoroutineWaitList::CoroutineWaitList(CoroutineWaitList&& other) {
   {
     std::lock_guard<oatpp::concurrency::SpinLock> lock{other.m_lock};

src/oatpp/core/async/CoroutineWaitList.hpp

@@ -31,9 +31,8 @@
 
 #include "oatpp/core/concurrency/SpinLock.hpp"
 #include <map>
-#include <mutex>
-#include <thread>
-#include <utility>
+
+#include <vector>
 
 namespace oatpp { namespace async {
 

src/oatpp/core/async/Executor.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "Executor.hpp"
+#include "oatpp/core/concurrency/Thread.hpp"
 #include "oatpp/core/async/worker/IOEventWorker.hpp"
 #include "oatpp/core/async/worker/IOWorker.hpp"
 #include "oatpp/core/async/worker/TimerWorker.hpp"

src/oatpp/core/async/Executor.hpp

@@ -28,13 +28,6 @@
 #include "./Processor.hpp"
 #include "oatpp/core/async/worker/Worker.hpp"
 
-#include "oatpp/core/concurrency/SpinLock.hpp"
-#include "oatpp/core/concurrency/Thread.hpp"
-
-#include <tuple>
-#include <mutex>
-#include <condition_variable>
-
 namespace oatpp { namespace async {
 
 /**

src/oatpp/core/async/Processor.hpp

@@ -27,14 +27,14 @@
 #define oatpp_async_Processor_hpp
 
 #include "./Coroutine.hpp"
-#include "./CoroutineWaitList.hpp"
+#include "oatpp/core/concurrency/SpinLock.hpp"
 #include "oatpp/core/async/utils/FastQueue.hpp"
 
 #include <condition_variable>
 #include <list>
-#include <mutex>
 #include <set>
 #include <vector>
+#include <thread>
 
 namespace oatpp { namespace async {
 

src/oatpp/core/async/utils/FastQueue.hpp

@@ -25,7 +25,6 @@
 #ifndef oatpp_async_utils_FastQueue_hpp
 #define oatpp_async_utils_FastQueue_hpp
 
-#include "oatpp/core/concurrency/SpinLock.hpp"
 #include "oatpp/core/base/Environment.hpp"
 
 namespace oatpp { namespace async { namespace utils {

src/oatpp/core/async/worker/IOEventWorker.hpp

@@ -26,10 +26,11 @@
 #define oatpp_async_worker_IOEventWorker_hpp
 
 #include "./Worker.hpp"
+#include "oatpp/core/async/utils/FastQueue.hpp"
+#include "oatpp/core/async/Coroutine.hpp"
 #include "oatpp/core/concurrency/SpinLock.hpp"
 
 #include <thread>
-#include <mutex>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

src/oatpp/core/async/worker/IOEventWorker_epoll.cpp

@@ -31,7 +31,7 @@
 
 #include "oatpp/core/async/Processor.hpp"
 
-#include <unistd.h>
+#include <cstring>
 #include <sys/epoll.h>
 #include <sys/eventfd.h>
 
@@ -246,7 +246,6 @@ void IOEventWorker::waitEvents() {
 
             break;
 
-
           default:
 
             auto& prevAction = getCoroutineScheduledAction(coroutine);

src/oatpp/core/async/worker/IOWorker.cpp

@@ -26,8 +26,6 @@
 
 #include "oatpp/core/async/Processor.hpp"
 
-#include <chrono>
-
 namespace oatpp { namespace async { namespace worker {
 
 IOWorker::IOWorker()

src/oatpp/core/async/worker/IOWorker.hpp

@@ -26,10 +26,11 @@
 #define oatpp_async_worker_IOWorker_hpp
 
 #include "./Worker.hpp"
+#include "oatpp/core/async/Coroutine.hpp"
+#include "oatpp/core/async/utils/FastQueue.hpp"
 #include "oatpp/core/concurrency/SpinLock.hpp"
 
 #include <thread>
-#include <mutex>
 #include <condition_variable>
 
 namespace oatpp { namespace async { namespace worker {

src/oatpp/core/async/worker/TimerWorker.cpp

@@ -26,8 +26,6 @@
 
 #include "oatpp/core/async/Processor.hpp"
 
-#include <chrono>
-
 namespace oatpp { namespace async { namespace worker {
 
 TimerWorker::TimerWorker(const std::chrono::duration<v_int64, std::micro>& granularity)

src/oatpp/core/async/worker/TimerWorker.hpp

@@ -26,10 +26,11 @@
 #define oatpp_async_worker_TimerWorker_hpp
 
 #include "./Worker.hpp"
+#include "oatpp/core/async/utils/FastQueue.hpp"
+#include "oatpp/core/async/Coroutine.hpp"
 #include "oatpp/core/concurrency/SpinLock.hpp"
 
 #include <thread>
-#include <mutex>
 #include <condition_variable>
 
 namespace oatpp { namespace async { namespace worker {

src/oatpp/core/async/worker/Worker.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "Worker.hpp"
+#include "oatpp/core/async/Coroutine.hpp"
 
 namespace oatpp { namespace async { namespace worker {
 

src/oatpp/core/async/worker/Worker.hpp

@@ -26,7 +26,7 @@
 #define oatpp_async_worker_Worker_hpp
 
 #include "oatpp/core/async/Coroutine.hpp"
-#include <thread>
+#include "oatpp/core/base/Environment.hpp"
 
 namespace oatpp { namespace async { namespace worker {
 

src/oatpp/core/base/Countable.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "Countable.hpp"
+#include "Environment.hpp"
 
 namespace oatpp { namespace base{
   

src/oatpp/core/base/Countable.hpp

@@ -25,9 +25,6 @@
 #ifndef oatpp_base_Countable
 #define oatpp_base_Countable
 
-#include <memory>
-#include "./Environment.hpp"
-
 namespace oatpp { namespace base{
 
 /**
@@ -53,7 +50,6 @@ public:
 
   Countable& operator = (Countable&) = default;
 
-
 };
   
 }}

src/oatpp/core/base/Environment.cpp

@@ -26,12 +26,11 @@
 #include "Environment.hpp"
 
 #include <iomanip>
-#include <chrono>
 #include <iostream>
-#include <cstring>
-#include <ctime>
 #include <cstdarg>
 
+#include <string.h>
+
 #if defined(WIN32) || defined(_WIN32)
 	#include <WinSock2.h>
 
@@ -329,7 +328,6 @@ void Environment::log(v_uint32 priority, const std::string& tag, const std::stri
   }
 }
 
-
 void Environment::logFormatted(v_uint32 priority, const LogCategory& category, const char* message, ...) {
   if (category.categoryEnabled && (category.enabledPriorities & (1 << priority))) {
     va_list args;

src/oatpp/core/base/Environment.hpp

@@ -26,16 +26,10 @@
 #ifndef oatpp_base_Environment_hpp
 #define oatpp_base_Environment_hpp
 
-#include "./Config.hpp"
-
-#include <cstdio>
 #include <atomic>
 #include <mutex>
-#include <string>
 #include <unordered_map>
 #include <memory>
-#include <stdexcept>
-#include <cstdlib>
 
 #define OATPP_VERSION "1.3.0"
 
@@ -509,7 +503,6 @@ if(!(EXP)) { \
 #define OATPP_LOG_CATEGORY(NAME, TAG, ENABLED) \
   oatpp::base::LogCategory NAME = oatpp::base::LogCategory(TAG, ENABLED);
 
-
 #ifndef OATPP_DISABLE_LOGV
 
   /**
@@ -592,5 +585,4 @@ if(!(EXP)) { \
   
 }}
 
-
 #endif /* oatpp_base_Environment_hpp */

src/oatpp/core/base/ObjectHandle.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_base_ObjectHandle_hpp
 #define oatpp_base_ObjectHandle_hpp
 
-#include "./Environment.hpp"
+#include <memory>
 
 namespace oatpp { namespace base {
 

src/oatpp/core/concurrency/Thread.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "Thread.hpp"
+#include "oatpp/core/base/Environment.hpp"
 
 #if defined(_GNU_SOURCE)
   #include <pthread.h>

src/oatpp/core/data/buffer/FIFOBuffer.cpp

@@ -23,7 +23,6 @@
  ***************************************************************************/
 
 #include "FIFOBuffer.hpp"
-#include <mutex>
 
 namespace oatpp { namespace data{ namespace buffer {
 

src/oatpp/core/data/buffer/FIFOBuffer.hpp

@@ -26,9 +26,6 @@
 #define oatpp_data_buffer_FIFOBuffer_hpp
 
 #include "oatpp/core/data/stream/Stream.hpp"
-#include "oatpp/core/IODefinitions.hpp"
-#include "oatpp/core/async/Coroutine.hpp"
-#include "oatpp/core/concurrency/SpinLock.hpp"
 
 namespace oatpp { namespace data { namespace buffer {
 

src/oatpp/core/data/buffer/IOBuffer.hpp

@@ -26,6 +26,7 @@
 #define oatpp_data_buffer_IOBuffer_hpp
 
 #include "oatpp/core/base/Countable.hpp"
+#include "oatpp/core/base/Environment.hpp"
 
 namespace oatpp { namespace data{ namespace buffer {
 

src/oatpp/core/data/mapping/ObjectMapper.hpp

@@ -25,9 +25,6 @@
 #ifndef oatpp_data_mapping_ObjectMapper_hpp
 #define oatpp_data_mapping_ObjectMapper_hpp
 
-#include "type/Object.hpp"
-#include "type/Type.hpp"
-
 #include "oatpp/core/data/stream/Stream.hpp"
 
 #include "oatpp/core/parser/Caret.hpp"

src/oatpp/core/data/mapping/TypeResolver.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "TypeResolver.hpp"
+#include "type/Object.hpp"
 
 namespace oatpp { namespace data { namespace mapping {
 

src/oatpp/core/data/mapping/TypeResolver.hpp

@@ -25,7 +25,7 @@
 #ifndef oatpp_data_mapping_TypeResolver_hpp
 #define oatpp_data_mapping_TypeResolver_hpp
 
-#include "type/Object.hpp"
+#include "type/Type.hpp"
 
 namespace oatpp { namespace data { namespace mapping {
 

src/oatpp/core/data/mapping/type/Enum.hpp

@@ -26,13 +26,8 @@
 #define oatpp_data_mapping_type_Enum_hpp
 
 #include "./Any.hpp"
-#include "./Primitive.hpp"
 #include "oatpp/core/data/share/MemoryLabel.hpp"
 
-#include <type_traits>
-#include <unordered_map>
-#include <vector>
-
 namespace oatpp { namespace data { namespace mapping { namespace type {
 
 /**

src/oatpp/core/data/mapping/type/List.hpp

@@ -26,10 +26,8 @@
 #define oatpp_data_mapping_type_List_hpp
 
 #include "./Collection.hpp"
-#include "./Type.hpp"
 
 #include <list>
-#include <initializer_list>
 
 namespace oatpp { namespace data { namespace mapping { namespace type {
 

src/oatpp/core/data/mapping/type/Object.hpp

@@ -25,10 +25,6 @@
 #ifndef oatpp_data_type_Object_hpp
 #define oatpp_data_type_Object_hpp
 
-#include "./Type.hpp"
-
-#include "./Any.hpp"
-#include "./Primitive.hpp"
 #include "./Enum.hpp"
 #include "./UnorderedMap.hpp"
 #include "./PairList.hpp"
@@ -36,10 +32,6 @@
 #include "./Vector.hpp"
 #include "./UnorderedSet.hpp"
 
-#include "oatpp/core/base/Countable.hpp"
-
-#include <type_traits>
-
 namespace oatpp { namespace data { namespace mapping { namespace type {
 
 /**

src/oatpp/core/data/mapping/type/PairList.hpp

@@ -26,11 +26,6 @@
 #define oatpp_data_mapping_type_PairList_hpp
 
 #include "./Map.hpp"
-#include "./Type.hpp"
-
-#include <list>
-#include <initializer_list>
-#include <utility>
 
 namespace oatpp { namespace data { namespace mapping { namespace type {
 

src/oatpp/core/data/mapping/type/Primitive.cpp

@@ -22,11 +22,7 @@
  *
  ***************************************************************************/
 
-#include "./Primitive.hpp"
-
 #include "oatpp/core/data/stream/BufferStream.hpp"
-#include "oatpp/core/utils/ConversionUtils.hpp"
-#include "oatpp/core/data/share/MemoryLabel.hpp"
 
 #include <fstream>
 

src/oatpp/core/data/mapping/type/Primitive.hpp

@@ -27,12 +27,6 @@
 
 #include "./Type.hpp"
 
-#include "oatpp/core/base/Countable.hpp"
-
-#include <algorithm>
-#include <cctype>
-#include <iterator>
-
 namespace oatpp { namespace data { namespace mapping { namespace type {
 
 namespace __class {
@@ -494,7 +488,6 @@ typedef Primitive<v_float32, __class::Float32> Float32;
  */
 typedef Primitive<v_float64, __class::Float64> Float64;
 
-
 template<>
 struct ObjectWrapperByUnderlyingType <v_int8> {
   typedef Int8 ObjectWrapper;

src/oatpp/core/data/mapping/type/Type.hpp

@@ -25,13 +25,9 @@
 #ifndef oatpp_data_type_Type_hpp
 #define oatpp_data_type_Type_hpp
 
-#include "oatpp/core/base/Countable.hpp"
 #include "oatpp/core/base/Environment.hpp"
 
-#include <list>
-#include <unordered_map>
 #include <vector>
-#include <string>
 
 namespace oatpp { namespace data { namespace mapping { namespace type {
 
@@ -88,7 +84,6 @@ public:
 
 };
 
-
 namespace __class {
   /**
    * Void Object Class.
@@ -617,7 +612,6 @@ public: \
     return *this; \
   } \
 
-
 }}}}
 
 namespace std {

src/oatpp/core/data/mapping/type/UnorderedMap.hpp

@@ -26,11 +26,6 @@
 #define oatpp_data_mapping_type_UnorderedMap_hpp
 
 #include "./Map.hpp"
-#include "./Type.hpp"
-
-#include <unordered_map>
-#include <initializer_list>
-#include <utility>
 
 namespace oatpp { namespace data { namespace mapping { namespace type {
 

src/oatpp/core/data/mapping/type/UnorderedSet.hpp

@@ -26,10 +26,6 @@
 #define oatpp_data_mapping_type_UnorderedSet_hpp
 
 #include "./Collection.hpp"
-#include "./Type.hpp"
-
-#include <unordered_set>
-#include <initializer_list>
 
 namespace oatpp { namespace data { namespace mapping { namespace type {
 

src/oatpp/core/data/mapping/type/Vector.hpp

@@ -26,10 +26,6 @@
 #define oatpp_data_mapping_type_Vector_hpp
 
 #include "./Collection.hpp"
-#include "./Type.hpp"
-
-#include <vector>
-#include <initializer_list>
 
 namespace oatpp { namespace data { namespace mapping { namespace type {
 

src/oatpp/core/data/resource/File.hpp

@@ -26,7 +26,6 @@
 #define oatpp_data_resource_File_hpp
 
 #include "./Resource.hpp"
-#include "oatpp/core/data/stream/Stream.hpp"
 
 namespace oatpp { namespace data { namespace resource {
 

src/oatpp/core/data/resource/InMemoryData.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "InMemoryData.hpp"
+#include "oatpp/core/data/stream/BufferStream.hpp"
 
 namespace oatpp { namespace data { namespace resource {
 

src/oatpp/core/data/resource/Resource.hpp

@@ -26,6 +26,7 @@
 #define oatpp_data_resource_Resource_hpp
 
 #include "oatpp/core/data/stream/Stream.hpp"
+#include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace data { namespace resource {
 

src/oatpp/core/data/resource/TemporaryFile.hpp

@@ -26,7 +26,6 @@
 #define oatpp_data_resource_TemporaryFile_hpp
 
 #include "./Resource.hpp"
-#include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace data { namespace resource {
 

src/oatpp/core/data/share/LazyStringMap.hpp

@@ -28,8 +28,6 @@
 #include "./MemoryLabel.hpp"
 #include "oatpp/core/concurrency/SpinLock.hpp"
 
-#include <unordered_map>
-
 namespace oatpp { namespace data { namespace share {
 
 /**

src/oatpp/core/data/share/MemoryLabel.cpp

@@ -24,8 +24,6 @@
 
 #include "MemoryLabel.hpp"
 
-#include <cstring>
-
 namespace oatpp { namespace data { namespace share {
 
 MemoryLabel::MemoryLabel(const std::shared_ptr<std::string>& memHandle, const void* data, v_buff_size size)

src/oatpp/core/data/share/MemoryLabel.hpp

@@ -29,7 +29,6 @@
 #include "oatpp/core/utils/String.hpp"
 
 #include <cstring>
-#include <memory>
 
 namespace oatpp { namespace data { namespace share {
   

src/oatpp/core/data/share/StringTemplate.hpp

@@ -28,9 +28,6 @@
 #include "oatpp/core/data/stream/Stream.hpp"
 #include "oatpp/core/Types.hpp"
 
-#include <unordered_map>
-#include <vector>
-
 namespace oatpp { namespace data { namespace share {
 
 /**

src/oatpp/core/data/stream/FIFOStream.hpp

@@ -25,12 +25,10 @@
 #ifndef oatpp_data_stream_FIFOStream_hpp
 #define oatpp_data_stream_FIFOStream_hpp
 
-#include "Stream.hpp"
 #include "oatpp/core/data/buffer/FIFOBuffer.hpp"
 
 namespace oatpp { namespace data { namespace stream {
 
-
 /**
  * FIFOInputStream
  */

src/oatpp/core/data/stream/FileStream.hpp

@@ -27,8 +27,6 @@
 
 #include "Stream.hpp"
 
-#include <cstdio>
-
 namespace oatpp { namespace data{ namespace stream {
 
 /**

src/oatpp/core/data/stream/Stream.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "./Stream.hpp"
+#include "oatpp/core/data/buffer/IOBuffer.hpp"
 #include "oatpp/core/utils/ConversionUtils.hpp"
 
 namespace oatpp { namespace data{ namespace stream {
@@ -426,7 +427,6 @@ v_io_size ConsistentOutputStream::writeAsString(bool value) {
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Other functions
 
-
 ConsistentOutputStream& operator << (ConsistentOutputStream& s, const oatpp::String& str) {
   if(str) {
     s.writeSimple(str);

src/oatpp/core/data/stream/Stream.hpp

@@ -30,7 +30,7 @@
 #include "oatpp/core/data/buffer/IOBuffer.hpp"
 #include "oatpp/core/data/buffer/Processor.hpp"
 
-#include "oatpp/core/IODefinitions.hpp"
+#include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace data{ namespace stream {
 
@@ -51,7 +51,6 @@ enum StreamType : v_int32 {
 
 };
 
-
 /**
  * Stream Context.
  */

src/oatpp/core/data/stream/StreamBufferedProxy.hpp

@@ -25,10 +25,7 @@
 #ifndef oatpp_data_stream_StreamBufferedProxy_hpp
 #define oatpp_data_stream_StreamBufferedProxy_hpp
 
-#include "Stream.hpp"
 #include "oatpp/core/data/buffer/FIFOBuffer.hpp"
-#include "oatpp/core/data/share/MemoryLabel.hpp"
-#include "oatpp/core/async/Coroutine.hpp"
 
 namespace oatpp { namespace data{ namespace stream {
   

src/oatpp/core/macro/component.hpp

@@ -38,7 +38,6 @@
 #define oatpp_macro_component_hpp
 
 #include "./basic.hpp"
-#include "oatpp/core/base/Environment.hpp"
 
 #define OATPP_MACRO_GET_COMPONENT_1(TYPE) \
 (*((TYPE*) oatpp::base::Environment::getComponent(typeid(TYPE).name())))
@@ -49,7 +48,6 @@
 #define OATPP_GET_COMPONENT(...) \
 OATPP_MACRO_EXPAND(OATPP_MACRO_MACRO_SELECTOR(OATPP_MACRO_GET_COMPONENT_, (__VA_ARGS__)) (__VA_ARGS__))
 
-
 #define OATPP_MACRO_COMPONENT_1(TYPE, NAME) \
 TYPE& NAME = (*((TYPE*) oatpp::base::Environment::getComponent(typeid(TYPE).name())))
 

src/oatpp/core/parser/Caret.cpp

@@ -24,7 +24,6 @@
 
 #include "Caret.hpp"
 
-#include <cstdlib>
 #include <algorithm>
 
 namespace oatpp { namespace parser {
@@ -312,7 +311,6 @@ v_int64 Caret::StateSaveGuard::getSavedErrorCode() {
     return (m_pos + 1 < m_size && m_data[m_pos] == '\r' && m_data[m_pos + 1] == '\n');
   }
 
-
   bool Caret::findROrN() {
     while(m_pos < m_size) {
       v_char8 a = m_data[m_pos];

src/oatpp/core/provider/Provider.hpp

@@ -28,7 +28,7 @@
 #include "Invalidator.hpp"
 
 #include "oatpp/core/async/Coroutine.hpp"
-#include "oatpp/core/data/share/MemoryLabel.hpp"
+#include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace provider {
 

src/oatpp/core/utils/ConversionUtils.cpp

@@ -22,9 +22,7 @@
  *
  ***************************************************************************/
 
-#include "ConversionUtils.hpp"
-
-#include <cstdlib>
+#include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace utils { namespace conversion {
   

src/oatpp/core/utils/ConversionUtils.hpp

@@ -25,14 +25,9 @@
 #ifndef oatpp_utils_ConversionUtils_hpp
 #define oatpp_utils_ConversionUtils_hpp
 
-#include "oatpp/core/data/mapping/type/Primitive.hpp"
 #include "oatpp/core/Types.hpp"
 
-
-#include "oatpp/core/base/Countable.hpp"
-#include "oatpp/core/base/Environment.hpp"
-
-#include <string>
+#include "oatpp/core/base/Config.hpp"
 
 namespace oatpp { namespace utils { namespace conversion {
 

src/oatpp/core/utils/Random.hpp

@@ -25,8 +25,7 @@
 #ifndef oatpp_utils_Random_hpp
 #define oatpp_utils_Random_hpp
 
-#include "oatpp/core/concurrency/SpinLock.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/core/base/Environment.hpp"
 #include <random>
 
 namespace oatpp { namespace utils { namespace random {

src/oatpp/encoding/Hex.cpp

@@ -23,11 +23,12 @@
  ***************************************************************************/
 
 #include "Hex.hpp"
+#include "oatpp/core/data/stream/Stream.hpp"
 
 #if defined(WIN32) || defined(_WIN32)
   #include <WinSock2.h>
 #else
-  #include <arpa/inet.h>
+  #include <netinet/in.h>
 #endif
 
 namespace oatpp { namespace encoding {

src/oatpp/encoding/Hex.hpp

@@ -26,7 +26,7 @@
 #define oatpp_encoding_Hex_hpp
 
 #include "oatpp/core/data/stream/Stream.hpp"
-#include "oatpp/core/Types.hpp"
+#include "oatpp/core/base/Environment.hpp"
 
 namespace oatpp { namespace encoding {
 

src/oatpp/encoding/Unicode.cpp

@@ -27,7 +27,7 @@
 #if defined(WIN32) || defined(_WIN32)
   #include <Winsock2.h>
 #else
-  #include <arpa/inet.h>
+  #include <netinet/in.h>
 #endif
 
 namespace oatpp { namespace encoding {

src/oatpp/network/ConnectionHandler.hpp

@@ -27,7 +27,6 @@
 
 #include "oatpp/core/provider/Provider.hpp"
 #include "oatpp/core/data/stream/Stream.hpp"
-#include <unordered_map>
 
 namespace oatpp { namespace network {
 

src/oatpp/network/ConnectionProvider.hpp

@@ -25,12 +25,9 @@
 #ifndef oatpp_network_ConnectionProvider_hpp
 #define oatpp_network_ConnectionProvider_hpp
 
-#include "oatpp/core/data/share/MemoryLabel.hpp"
 #include "oatpp/core/data/stream/Stream.hpp"
 #include "oatpp/core/provider/Provider.hpp"
 
-#include <unordered_map>
-
 namespace oatpp { namespace network {
 
 /**

src/oatpp/network/ConnectionProviderSwitch.hpp

@@ -26,7 +26,6 @@
 #define oatpp_network_ConnectionProviderSwitch_hpp
 
 #include "ConnectionProvider.hpp"
-#include <mutex>
 
 namespace oatpp { namespace network {
 

src/oatpp/network/Server.cpp

@@ -24,9 +24,6 @@
 
 #include "Server.hpp"
 
-#include <thread>
-#include <chrono>
-
 namespace oatpp { namespace network {
 
 const v_int32 Server::STATUS_CREATED = 0;

src/oatpp/network/Server.hpp

@@ -28,12 +28,6 @@
 #include "oatpp/network/ConnectionHandler.hpp"
 #include "oatpp/network/ConnectionProvider.hpp"
 
-#include "oatpp/core/Types.hpp"
-
-#include "oatpp/core/base/Countable.hpp"
-#include "oatpp/core/base/Environment.hpp"
-
-#include <atomic>
 #include <thread>
 #include <functional>
 

src/oatpp/network/Url.cpp

@@ -23,8 +23,7 @@
  ***************************************************************************/
 
 #include "Url.hpp"
-
-#include <cstdlib>
+#include "oatpp/core/parser/Caret.hpp"
 
 namespace oatpp { namespace network {
 

src/oatpp/network/monitor/ConnectionInactivityChecker.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "ConnectionInactivityChecker.hpp"
+#include "StatCollector.hpp"
 
 namespace oatpp { namespace network { namespace monitor {
 

src/oatpp/network/monitor/ConnectionMaxAgeChecker.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "ConnectionMaxAgeChecker.hpp"
+#include "StatCollector.hpp"
 
 namespace oatpp { namespace network { namespace monitor {
 

src/oatpp/network/monitor/ConnectionMonitor.cpp

@@ -24,7 +24,6 @@
 
 #include "ConnectionMonitor.hpp"
 
-#include <chrono>
 #include <thread>
 
 namespace oatpp { namespace network { namespace monitor {

src/oatpp/network/monitor/ConnectionMonitor.hpp

@@ -26,11 +26,10 @@
 #define oatpp_network_monitor_ConnectionMonitor_hpp
 
 #include "MetricsChecker.hpp"
+#include "StatCollector.hpp"
 
 #include "oatpp/network/ConnectionProvider.hpp"
-#include "oatpp/core/data/stream/Stream.hpp"
 
-#include <unordered_set>
 #include <condition_variable>
 
 namespace oatpp { namespace network { namespace monitor {

src/oatpp/network/monitor/MetricsChecker.hpp

@@ -26,6 +26,7 @@
 #define oatpp_network_monitor_MetricsChecker_hpp
 
 #include "StatCollector.hpp"
+#include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace network { namespace monitor {
 

src/oatpp/network/tcp/Connection.cpp

@@ -32,8 +32,6 @@
   #include <sys/socket.h>
 #endif
 
-#include <thread>
-#include <chrono>
 #include <fcntl.h>
 
 namespace oatpp { namespace network { namespace tcp {

src/oatpp/network/tcp/client/ConnectionProvider.cpp

@@ -35,8 +35,6 @@
   #include <WS2tcpip.h>
 #else
   #include <netdb.h>
-  #include <arpa/inet.h>
-  #include <sys/socket.h>
   #include <unistd.h>
 #endif
 

src/oatpp/network/tcp/client/ConnectionProvider.hpp

@@ -28,8 +28,6 @@
 #include "oatpp/network/Address.hpp"
 
 #include "oatpp/network/ConnectionProvider.hpp"
-#include "oatpp/core/provider/Invalidator.hpp"
-#include "oatpp/core/Types.hpp"
 
 namespace oatpp { namespace network { namespace tcp { namespace client {
 

src/oatpp/network/tcp/server/ConnectionProvider.cpp

@@ -35,15 +35,12 @@
 #else
   #include <netdb.h>
   #include <arpa/inet.h>
-  #include <sys/socket.h>
-  #include <netinet/tcp.h>
   #include <unistd.h>
   #if defined(__FreeBSD__)
     #include <netinet/in.h>
   #endif
 #endif
 
-
 // Workaround for MinGW from: https://www.mail-archive.com/users@ipv6.org/msg02107.html
 #if defined(__MINGW32__) && _WIN32_WINNT < 0x0600
   const char * inet_ntop (int af, const void *src, char *dst, socklen_t cnt) {
@@ -116,7 +113,6 @@ void ConnectionProvider::ConnectionInvalidator::invalidate(const std::shared_ptr
   shutdown(handle, SHUT_RDWR);
 #endif
 
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/oatpp/network/tcp/server/ConnectionProvider.hpp

@@ -29,8 +29,6 @@
 #include "oatpp/network/ConnectionProvider.hpp"
 #include "oatpp/network/tcp/Connection.hpp"
 
-#include "oatpp/core/Types.hpp"
-
 namespace oatpp { namespace network { namespace tcp { namespace server {
 
 /**

src/oatpp/network/virtual_/Interface.hpp

@@ -27,10 +27,6 @@
 
 #include "./Socket.hpp"
 
-#include <list>
-#include <unordered_map>
-#include <chrono>
-
 namespace oatpp { namespace network { namespace virtual_ {
 
 /**

src/oatpp/network/virtual_/Pipe.hpp

@@ -27,14 +27,9 @@
 
 #include "oatpp/core/async/CoroutineWaitList.hpp"
 
-#include "oatpp/core/data/stream/Stream.hpp"
-
 #include "oatpp/core/data/buffer/FIFOBuffer.hpp"
 #include "oatpp/core/data/buffer/IOBuffer.hpp"
 
-#include "oatpp/core/concurrency/SpinLock.hpp"
-
-#include <mutex>
 #include <condition_variable>
 
 namespace oatpp { namespace network { namespace virtual_ {
@@ -270,7 +265,6 @@ public:
    */
   Writer* getWriter();
 
-
   /**
    * Get pointer to &l:Pipe::Reader; for this pipe.
    * There can be only one &l:Pipe::Reader; per pipe.

src/oatpp/network/virtual_/server/ConnectionProvider.cpp

@@ -24,8 +24,6 @@
 
 #include "ConnectionProvider.hpp"
 
-#include <chrono>
-
 namespace oatpp { namespace network { namespace virtual_ { namespace server {
 
 void ConnectionProvider::ConnectionInvalidator::invalidate(const std::shared_ptr<data::stream::IOStream>& connection) {

src/oatpp/orm/DbClient.cpp

@@ -23,8 +23,8 @@
  ***************************************************************************/
 
 #include "DbClient.hpp"
-
-#include "oatpp/core/data/stream/BufferStream.hpp"
+#include "QueryResult.hpp"
+#include "Transaction.hpp"
 
 namespace oatpp { namespace orm {
 

src/oatpp/orm/DbClient.hpp

@@ -28,9 +28,6 @@
 #include "Executor.hpp"
 #include "Transaction.hpp"
 
-#include "oatpp/core/data/stream/Stream.hpp"
-#include "oatpp/core/Types.hpp"
-
 namespace oatpp { namespace orm {
 
 /**

src/oatpp/orm/Executor.cpp

@@ -23,6 +23,9 @@
  ***************************************************************************/
 
 #include "Executor.hpp"
+#include "QueryResult.hpp"
+
+#include "Connection.hpp"
 
 namespace oatpp { namespace orm {
 

src/oatpp/orm/Executor.hpp

@@ -29,9 +29,8 @@
 #include "QueryResult.hpp"
 
 #include "oatpp/core/data/mapping/TypeResolver.hpp"
-#include "oatpp/core/data/mapping/type/Type.hpp"
-#include "oatpp/core/data/share/MemoryLabel.hpp"
 #include "oatpp/core/data/share/StringTemplate.hpp"
+#include "oatpp/core/provider/Provider.hpp"
 
 namespace oatpp { namespace orm {
 

src/oatpp/orm/QueryResult.cpp

@@ -22,9 +22,6 @@
  *
  ***************************************************************************/
 
-#include "QueryResult.hpp"
-
 namespace oatpp { namespace orm {
 
-
 }}

src/oatpp/orm/SchemaMigration.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "SchemaMigration.hpp"
+#include "Connection.hpp"
 
 #include <algorithm>
 

src/oatpp/orm/SchemaMigration.hpp

@@ -26,6 +26,7 @@
 #define oatpp_orm_SchemaMigration_hpp
 
 #include "Executor.hpp"
+#include "oatpp/core/base/ObjectHandle.hpp"
 
 namespace oatpp { namespace orm {
 

src/oatpp/orm/Transaction.cpp

@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "Transaction.hpp"
+#include "QueryResult.hpp"
 
 namespace oatpp { namespace orm {
 

src/oatpp/orm/Transaction.hpp

@@ -26,6 +26,9 @@
 #define oatpp_orm_Transaction_hpp
 
 #include "Executor.hpp"
+#include "Connection.hpp"
+
+#include "oatpp/core/base/ObjectHandle.hpp"
 
 namespace oatpp { namespace orm {
 

src/oatpp/parser/json/Utils.hpp

@@ -26,9 +26,6 @@
 #define oatpp_parser_json_Utils_hpp
 
 #include "oatpp/core/parser/Caret.hpp"
-#include "oatpp/core/Types.hpp"
-
-#include <string>
 
 namespace oatpp { namespace parser { namespace json {
 

src/oatpp/parser/json/mapping/Deserializer.cpp

@@ -24,8 +24,6 @@
 
 #include "Deserializer.hpp"
 
-#include "oatpp/core/utils/ConversionUtils.hpp"
-
 namespace oatpp { namespace parser { namespace json { namespace mapping {
 
 Deserializer::Deserializer(const std::shared_ptr<Config>& config)

src/oatpp/parser/json/mapping/Deserializer.hpp

@@ -26,10 +26,6 @@
 #define oatpp_parser_json_mapping_Deserializer_hpp
 
 #include "oatpp/parser/json/Utils.hpp"
-#include "oatpp/core/parser/Caret.hpp"
-#include "oatpp/core/Types.hpp"
-
-#include <vector>
 
 namespace oatpp { namespace parser { namespace json { namespace mapping {
 

src/oatpp/parser/json/mapping/Serializer.cpp

@@ -24,8 +24,7 @@
 
 #include "Serializer.hpp"
 
-#include "oatpp/parser/json/Utils.hpp"
-#include "oatpp/core/data/mapping/type/Any.hpp"
+#include "oatpp/parser/json/Beautifier.hpp"
 
 namespace oatpp { namespace parser { namespace json { namespace mapping {
 

src/oatpp/parser/json/mapping/Serializer.hpp

@@ -26,9 +26,7 @@
 #define oatpp_parser_json_mapping_Serializer_hpp
 
 #include "oatpp/parser/json/Utils.hpp"
-#include "oatpp/parser/json/Beautifier.hpp"
-#include "oatpp/core/Types.hpp"
-#include <vector>
+#include "oatpp/core/data/stream/Stream.hpp"
 
 namespace oatpp { namespace parser { namespace json { namespace mapping {
 

src/oatpp/web/client/ApiClient.cpp

@@ -24,8 +24,6 @@
 
 #include "ApiClient.hpp"
 
-#include "oatpp/core/data/stream/BufferStream.hpp"
-
 namespace oatpp { namespace web { namespace client {
 
 std::shared_ptr<RequestExecutor::ConnectionHandle> ApiClient::getConnection() {

src/oatpp/web/client/ApiClient.hpp

@@ -27,21 +27,10 @@
 
 #include "./RequestExecutor.hpp"
 
-#include "oatpp/web/protocol/http/incoming/Response.hpp"
-#include "oatpp/web/protocol/http/outgoing/BufferBody.hpp"
-
-#include "oatpp/encoding/Base64.hpp"
-
 #include "oatpp/core/data/share/StringTemplate.hpp"
-#include "oatpp/core/data/mapping/ObjectMapper.hpp"
-#include "oatpp/core/Types.hpp"
 
 #include "oatpp/core/utils/ConversionUtils.hpp"
 
-#include <string>
-#include <list>
-#include <unordered_map>
-
 namespace oatpp { namespace web { namespace client {
 
 /**

src/oatpp/web/client/HttpRequestExecutor.cpp

@@ -27,9 +27,6 @@
 #include "oatpp/web/protocol/http/incoming/ResponseHeadersReader.hpp"
 #include "oatpp/web/protocol/http/outgoing/Request.hpp"
 
-#include "oatpp/network/tcp/Connection.hpp"
-
-#include "oatpp/core/data/stream/BufferStream.hpp"
 #include "oatpp/core/data/stream/StreamBufferedProxy.hpp"
 
 #if defined(WIN32) || defined(_WIN32)
@@ -103,7 +100,6 @@ HttpRequestExecutor::HttpConnectionHandle::HttpConnectionHandle(const std::share
   : m_connectionProxy(connectionProxy)
 {}
 
-
 std::shared_ptr<HttpRequestExecutor::ConnectionProxy> HttpRequestExecutor::HttpConnectionHandle::getConnection() {
   return m_connectionProxy;
 }

src/oatpp/web/client/HttpRequestExecutor.hpp

@@ -28,8 +28,8 @@
 #include "./RequestExecutor.hpp"
 
 #include "oatpp/web/protocol/http/incoming/SimpleBodyDecoder.hpp"
-#include "oatpp/network/ConnectionPool.hpp"
 #include "oatpp/network/ConnectionProvider.hpp"
+#include "oatpp/core/data/buffer/IOBuffer.hpp"
 
 namespace oatpp { namespace web { namespace client {