Cleanup include usage

src/fast_type_gen/fast_type_gen.cpp

@@ -9,7 +9,6 @@
 #include "hpp_gen.h"
 #include "inl_gen.h"
 #include "cpp_gen.h"
-#include "mfast/coder/common/dictionary_builder.h"
 #include "mfast/coder/common/template_repo.h"
 
 #include <stdlib.h>

src/fast_type_gen/indented_ostream.h

@@ -5,7 +5,6 @@
 // See the file license.txt for licensing information.
 #pragma once
 
-#include <ostream>
 #include <iomanip>
 #include <sstream>
 struct indent_t {};

src/mfast/allocator.cpp

@@ -4,7 +4,6 @@
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
 #include "allocator.h"
-#include <new>
 #include "allocator_utils.h"
 #include <cstring>
 

src/mfast/allocator.h

@@ -6,7 +6,6 @@
 #pragma once
 
 #include <cstddef>
-#include <algorithm>
 #include "mfast/mfast_export.h"
 namespace mfast {
 /// An abstract interface for allocators.

src/mfast/arena_allocator.cpp

@@ -6,8 +6,8 @@
 #include "arena_allocator.h"
 #include "allocator_utils.h"
 #include <cstring>
-#include <algorithm>
 #include <cstdlib>
+#include <new>
 
 namespace mfast {
 

src/mfast/arena_allocator.h

@@ -5,7 +5,6 @@
 // See the file license.txt for licensing information.
 #pragma once
 
-#include <new>
 #include <stdint.h>
 #include <cassert>
 #include <cstddef>

src/mfast/coder/common/codec_helper.h

@@ -7,7 +7,6 @@
 
 #include "../../string_ref.h"
 #include "../../exceptions.h"
-#include <stdexcept>
 
 namespace mfast {
 namespace detail {

src/mfast/coder/common/debug_stream.h

@@ -6,7 +6,6 @@
 #pragma once
 
 #include <iostream>
-#include "../../output.h"
 #ifdef NDEBUG
 
 struct debug_stream {
@@ -25,6 +24,7 @@ struct debug_stream {
 };
 
 #else
+#include "../../output.h"
 
 class debug_stream {
 private:

src/mfast/coder/common/dictionary_builder.cpp

@@ -6,9 +6,6 @@
 #include "exceptions.h"
 #include "template_repo.h"
 #include <cstring>
-#include <iostream>
-#include <sstream>
-#include <stdexcept>
 
 namespace mfast {
 

src/mfast/coder/common/dictionary_builder.h

@@ -9,10 +9,10 @@
 #include "../mfast_coder_export.h"
 #include "../../field_instructions.h"
 #include "../../arena_allocator.h"
+#include "../../instructions/templates_description.h"
 #include <vector>
 #include <map>
 #include <string>
-#include <stdexcept>
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4251) // non dll-interface class used as a member for

src/mfast/coder/decoder/decoder_field_operator.cpp

@@ -3,7 +3,6 @@
 //
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
-#include "../mfast_coder_export.h"
 #include "../common/codec_helper.h"
 #include "fast_istream.h"
 #include "decoder_presence_map.h"

src/mfast/coder/decoder/fast_decoder.cpp

@@ -4,17 +4,13 @@
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
 #include <boost/container/map.hpp>
-#include "../mfast_coder_export.h"
 #include "../fast_decoder.h"
 #include "../../field_visitor.h"
 #include "../../sequence_ref.h"
-#include "../../malloc_allocator.h"
-#include "../../output.h"
 #include "../../composite_type.h"
 #include "../common/exceptions.h"
 #include "../common/debug_stream.h"
 #include "../common/template_repo.h"
-#include "../common/codec_helper.h"
 #include "decoder_presence_map.h"
 #include "decoder_field_operator.h"
 #include "fast_istream.h"

src/mfast/coder/decoder/fast_istreambuf.h

@@ -5,10 +5,7 @@
 // See the file license.txt for licensing information.
 #pragma once
 
-#include <stdexcept>
-
 #include "../../exceptions.h"
-#include <iostream>
 
 namespace mfast {
 class fast_istream;

src/mfast/coder/decoder_v2/fast_decoder_core.h

@@ -7,20 +7,16 @@
 
 #include "../mfast_coder_export.h"
 
-#include "../../sequence_ref.h"
+#include "../../ext_ref.h"
 #include "../../nested_message_ref.h"
-#include "../../malloc_allocator.h"
-#include "../../output.h"
 #include "../../composite_type.h"
 #include "../common/exceptions.h"
-#include "../common/debug_stream.h"
 #include "../common/template_repo.h"
 #include "../common/codec_helper.h"
 #include "../decoder/decoder_presence_map.h"
 #include "../common/codec_helper.h"
 #include "../decoder/fast_istream.h"
 #include "fast_istream_extractor.h"
-#include <tuple>
 #include <vector>
 namespace mfast {
 namespace coder {

src/mfast/coder/encoder/encoder_field_operator.cpp

@@ -5,7 +5,6 @@
 // See the file license.txt for licensing information.
 #include <iterator>
 #include <algorithm>
-#include "../mfast_coder_export.h"
 #include "../common/codec_helper.h"
 #include "fast_ostream.h"
 #include "encoder_presence_map.h"

src/mfast/coder/encoder/fast_encoder.cpp

@@ -3,14 +3,11 @@
 //
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
-#include "../mfast_coder_export.h"
 #include "../../field_visitor.h"
 #include "../../sequence_ref.h"
-#include "../../malloc_allocator.h"
 #include "../fast_encoder.h"
 #include "../common/template_repo.h"
 #include "../common/exceptions.h"
-#include "../../output.h"
 #include "encoder_presence_map.h"
 #include "encoder_field_operator.h"
 #include "fast_ostream.h"

src/mfast/coder/encoder/fast_ostream.h

@@ -5,9 +5,9 @@
 // See the file license.txt for licensing information.
 #pragma once
 
-#include "../../field_instructions.h"
 #include "../common/codec_helper.h"
 #include "fast_ostreambuf.h"
+#include <limits>
 
 namespace mfast {
 class encoder_presence_map;

src/mfast/coder/encoder/fast_ostreambuf.cpp

@@ -3,8 +3,9 @@
 //
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
-#include <cstring>
 #include <algorithm>
+#include <cassert>
+#include <cstring>
 #include "fast_ostreambuf.h"
 
 namespace mfast {

src/mfast/coder/encoder/fast_ostreambuf.h

@@ -7,7 +7,7 @@
 
 #include <stdexcept>
 #include "../mfast_coder_export.h"
-#include "../../exceptions.h"
+#include <boost/exception/all.hpp>
 
 namespace mfast {
 class buffer_overflow_error : public virtual boost::exception,

src/mfast/coder/encoder_v2/fast_encoder_core.cpp

@@ -1,4 +1,5 @@
 #include "fast_encoder_core.h"
+#include "../common/exceptions.h"
 
 namespace mfast {
 namespace coder {

src/mfast/coder/encoder_v2/fast_encoder_core.h

@@ -1,12 +1,9 @@
 #pragma once
 
 #include "../mfast_coder_export.h"
-#include "../../sequence_ref.h"
 #include "../../enum_ref.h"
 #include "../../nested_message_ref.h"
-#include "../../malloc_allocator.h"
 #include "../common/template_repo.h"
-#include "../common/exceptions.h"
 #include "../encoder/fast_ostream.h"
 #include "../encoder/resizable_fast_ostreambuf.h"
 #include "../encoder/encoder_presence_map.h"

src/mfast/coder/encoder_v2/fast_ostream_inserter.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "../../int_ref.h"
 #include "../../string_ref.h"
 #include "../../decimal_ref.h"
 #include "../../ext_ref.h"

src/mfast/coder/fast_decoder.h

@@ -6,6 +6,7 @@
 #pragma once
 
 #include "mfast_coder_export.h"
+#include "../instructions/templates_description.h"
 #include "../message_ref.h"
 #include "../malloc_allocator.h"
 #include <initializer_list>

src/mfast/coder/fast_decoder_v2.h

@@ -7,7 +7,6 @@
 
 #include "decoder_v2/fast_decoder_core.h"
 #include <type_traits>
-#include <tuple>
 
 template <typename... CONDITIONS> struct all_true;
 

src/mfast/coder/fast_encoder.h

@@ -6,6 +6,7 @@
 #pragma once
 
 #include "mfast_coder_export.h"
+#include "../instructions/templates_description.h"
 #include "../message_ref.h"
 #include "../malloc_allocator.h"
 

src/mfast/coder/fast_encoder_v2.h

@@ -6,7 +6,6 @@
 #pragma once
 
 #include <vector>
-#include <tuple>
 #include "encoder_v2/fast_encoder_core.h"
 
 namespace mfast {

src/mfast/decimal_ref.cpp

@@ -3,11 +3,6 @@
 //
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
-#include <cmath>
-#include <cfloat>
-
-#include <iostream>
-
 #include <boost/multiprecision/number.hpp>
 #include <boost/multiprecision/cpp_dec_float.hpp>
 

src/mfast/decimal_ref.h

@@ -5,8 +5,6 @@
 // See the file license.txt for licensing information.
 #pragma once
 
-#include <cmath>
-#include <cfloat>
 #include <boost/utility/string_ref.hpp>
 #include "mfast_export.h"
 #include "field_ref.h"

src/mfast/enum_ref.h

@@ -5,7 +5,6 @@
 // See the file license.txt for licensing information.
 #pragma once
 
-#include "mfast/field_instructions.h"
 #include "mfast/field_ref.h"
 #include "mfast/type_category.h"
 

src/mfast/field_comparator.h

@@ -4,7 +4,6 @@
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
 #pragma once
-#include <utility>
 #include "field_visitor.h"
 namespace mfast {
 namespace detail {

src/mfast/field_ref.h

@@ -6,10 +6,8 @@
 #pragma once
 
 #include "field_instructions.h"
-#include <new>
-#include <iostream>
+#include "mfast_export.h"
 #include <typeinfo>
-#include <type_traits>
 #include <boost/config.hpp>
 #include <boost/exception/all.hpp>
 

src/mfast/field_visitor.h

@@ -11,7 +11,6 @@
 #include "string_ref.h"
 #include "group_ref.h"
 #include "sequence_ref.h"
-#include "message_ref.h"
 #include "nested_message_ref.h"
 #include "set_ref.h"
 

src/mfast/group_ref.h

@@ -5,7 +5,6 @@
 // See the file license.txt for licensing information.
 #pragma once
 
-#include "field_instructions.h"
 #include "field_ref.h"
 #include "field_mref.h"
 #include "aggregate_ref.h"

src/mfast/instructions/decimal_instruction.cpp

@@ -4,7 +4,7 @@
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
 
-#include "../field_instructions.h"
+#include "decimal_instruction.h"
 
 namespace mfast {
 void decimal_field_instruction::construct_value(value_storage &storage,

src/mfast/instructions/field_instruction.h

@@ -12,7 +12,6 @@
 #include "mfast/mfast_export.h"
 #include "mfast/arena_allocator.h"
 #include "mfast/allocator.h"
-#include <algorithm>
 #include <iostream>
 
 namespace mfast {

src/mfast/int_ref.h

@@ -5,7 +5,6 @@
 // See the file license.txt for licensing information.
 #pragma once
 
-#include "field_instructions.h"
 #include "field_ref.h"
 #include "type_category.h"
 

src/mfast/json/json.h

@@ -8,7 +8,8 @@
 #define MFAST_JSON_H
 
 #include "mfast_json_export.h"
-#include "../../mfast.h"
+#include "../aggregate_ref.h"
+#include "../sequence_ref.h"
 #include <iostream>
 
 namespace mfast {

src/mfast/json/json_decode.cpp

@@ -4,6 +4,10 @@
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
 #include "json.h"
+#include "../enum_ref.h"
+#include "../group_ref.h"
+#include "../field_visitor.h"
+#include "../nested_message_ref.h"
 #include <boost/regex/pending/unicode_iterator.hpp>
 namespace mfast {
 

src/mfast/json/json_encode.cpp

@@ -4,6 +4,9 @@
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
 #include "json.h"
+#include "../enum_ref.h"
+#include "../field_visitor.h"
+#include "../nested_message_ref.h"
 #include <boost/io/ios_state.hpp>
 #include <cstdio>
 #ifdef _MSC_VER // someday someone at microsoft will read the C++11 standard.

src/mfast/malloc_allocator.cpp

@@ -4,6 +4,8 @@
 // This file is part of mFAST.
 // See the file license.txt for licensing information.
 #include "malloc_allocator.h"
+#include <algorithm>
+#include <new>
 
 namespace mfast {