Modified order of standard includes

include/etl/algorithm.h

@@ -38,15 +38,15 @@ SOFTWARE.
 /// Additional new variants of certain algorithms.
 ///\ingroup utilities
 
-#include <stdint.h>
-#include <string.h>
-
 #include "platform.h"
 #include "type_traits.h"
 #include "iterator.h"
 #include "functional.h"
 #include "utility.h"
 
+#include <stdint.h>
+#include <string.h>
+
 #include "private/minmax_push.h"
 
 #if ETL_USING_STL

include/etl/alignment.h

@@ -31,12 +31,12 @@ SOFTWARE.
 #ifndef ETL_ALIGNMENT_INCLUDED
 #define ETL_ALIGNMENT_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "type_traits.h"
 #include "static_assert.h"
 
+#include <stdint.h>
+
 ///\defgroup alignment alignment
 /// Creates a variable of the specified type at the specified alignment.
 /// \ingroup utilities

include/etl/array.h

@@ -31,10 +31,7 @@ SOFTWARE.
 #ifndef ETL_ARRAY_INCLUDED
 #define ETL_ARRAY_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
-
 #include "algorithm.h"
 #include "iterator.h"
 #include "functional.h"
@@ -46,6 +43,8 @@ SOFTWARE.
 #include "nth_type.h"
 #include "initializer_list.h"
 
+#include <stddef.h>
+
 ///\defgroup array array
 /// A replacement for std::array if you haven't got C++0x11.
 ///\ingroup containers

include/etl/basic_string.h

@@ -31,12 +31,7 @@ SOFTWARE.
 #ifndef ETL_BASIC_STRING_INCLUDED
 #define ETL_BASIC_STRING_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
 #include "platform.h"
-
 #include "algorithm.h"
 #include "iterator.h"
 #include "functional.h"
@@ -53,6 +48,10 @@ SOFTWARE.
 #include "binary.h"
 #include "flags.h"
 
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
 #include "private/minmax_push.h"
 
 //*****************************************************************************

include/etl/bip_buffer_spsc_atomic.h

@@ -38,9 +38,6 @@ SOFTWARE.
 #ifndef ETL_BIP_BUFFER_SPSC_ATOMIC_INCLUDED
 #define ETL_BIP_BUFFER_SPSC_ATOMIC_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "alignment.h"
 #include "parameter_type.h"
@@ -53,6 +50,9 @@ SOFTWARE.
 #include "span.h"
 #include "file_error_numbers.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #if ETL_HAS_ATOMIC
 
 namespace etl

include/etl/bit.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_BIT_INCLUDED
 #define ETL_BIT_INCLUDED
 
-#include <string.h>
-
 #include "platform.h"
 #include "type_traits.h"
 #include "binary.h"
@@ -40,6 +38,8 @@ SOFTWARE.
 #include "endianness.h"
 #include "type_traits.h"
 
+#include <string.h>
+
 #if ETL_USING_CPP20 && ETL_USING_STL
   #include <bit>
 #endif

include/etl/bit_stream.h

@@ -26,9 +26,6 @@ SOFTWARE.
 #ifndef ETL_BIT_STREAM_INCLUDED
 #define ETL_BIT_STREAM_INCLUDED
 
-#include <stdint.h>
-#include <limits.h>
-
 #include "platform.h"
 #include "type_traits.h"
 #include "nullptr.h"
@@ -44,6 +41,9 @@ SOFTWARE.
 #include "exception.h"
 #include "error_handler.h"
 
+#include <stdint.h>
+#include <limits.h>
+
 #include "private/minmax_push.h"
 
 namespace etl

include/etl/bresenham_line.h

@@ -31,14 +31,14 @@ SOFTWARE.
 #ifndef ETL_BRESENHAM_LINE_INCLUDED
 #define ETL_BRESENHAM_LINE_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "iterator.h"
 #include "static_assert.h"
 #include "type_traits.h"
 #include "utility.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/byte_stream.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_BYTE_STREAM_INCLUDED
 #define ETL_BYTE_STREAM_INCLUDED
 
-#include <stdint.h>
-#include <limits.h>
-
 #include "platform.h"
 #include "type_traits.h"
 #include "nullptr.h"
@@ -49,6 +46,9 @@ SOFTWARE.
 #include "exception.h"
 #include "error_handler.h"
 
+#include <stdint.h>
+#include <limits.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/callback_timer.h

@@ -29,8 +29,6 @@ SOFTWARE.
 #ifndef ETL_CALLBACK_TIMER_INCLUDED
 #define ETL_CALLBACK_TIMER_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "nullptr.h"
@@ -42,6 +40,8 @@ SOFTWARE.
 #include "placement_new.h"
 #include "delegate.h"
 
+#include <stdint.h>
+
 #if defined(ETL_IN_UNIT_TEST) && ETL_NOT_USING_STL
   #define ETL_DISABLE_TIMER_UPDATES
   #define ETL_ENABLE_TIMER_UPDATES

include/etl/callback_timer_atomic.h

@@ -29,10 +29,7 @@ SOFTWARE.
 #ifndef ETL_CALLBACK_TIMER_ATOMIC_INCLUDED
 #define ETL_CALLBACK_TIMER_ATOMIC_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
-
 #include "algorithm.h"
 #include "nullptr.h"
 #include "function.h"
@@ -42,6 +39,8 @@ SOFTWARE.
 #include "placement_new.h"
 #include "delegate.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/callback_timer_interrupt.h

@@ -29,10 +29,7 @@ SOFTWARE.
 #ifndef ETL_CALLBACK_TIMER_INTERRUPT_INCLUDED
 #define ETL_CALLBACK_TIMER_INTERRUPT_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
-
 #include "algorithm.h"
 #include "nullptr.h"
 #include "delegate.h"
@@ -41,6 +38,8 @@ SOFTWARE.
 #include "error_handler.h"
 #include "placement_new.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/callback_timer_locked.h

@@ -29,10 +29,7 @@ SOFTWARE.
 #ifndef ETL_CALLBACK_TIMER_LOCKED_INCLUDED
 #define ETL_CALLBACK_TIMER_LOCKED_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
-
 #include "algorithm.h"
 #include "nullptr.h"
 #include "delegate.h"
@@ -41,6 +38,8 @@ SOFTWARE.
 #include "error_handler.h"
 #include "placement_new.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/char_traits.h

@@ -31,12 +31,12 @@ SOFTWARE.
 #ifndef ETL_CHAR_TRAITS_INCLUDED
 #define ETL_CHAR_TRAITS_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "iterator.h"
 
+#include <stdint.h>
+
 //*****************************************************************************
 ///\defgroup char_traits char_traits
 /// Character traits

include/etl/checksum.h

@@ -27,12 +27,12 @@ SOFTWARE.
 #ifndef ETL_CHECKSUM_INCLUDED
 #define ETL_CHECKSUM_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "binary.h"
 #include "frame_check_sequence.h"
 
+#include <stdint.h>
+
 ///\defgroup checksum Checksum calculation
 ///\ingroup maths
 

include/etl/container.h

@@ -31,10 +31,10 @@ SOFTWARE.
 #ifndef ETL_CONTAINER_INCLUDED
 #define ETL_CONTAINER_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "iterator.h"
 
+#include <stddef.h>
+
 #endif
 

include/etl/cyclic_value.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_CYCLIC_VALUE_INCLUDED
 #define ETL_CYCLIC_VALUE_INCLUDED
 
-#include <stddef.h>
-
 ///\defgroup cyclic_value cyclic_value
 /// Provides a value that cycles between two limits.
 /// \ingroup utilities
@@ -42,9 +40,10 @@ SOFTWARE.
 #include "exception.h"
 #include "static_assert.h"
 #include "type_traits.h"
-
 #include "algorithm.h"
 
+#include <stddef.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/debounce.h

@@ -31,11 +31,11 @@ SOFTWARE.
 #ifndef ETL_DEBOUNCE_INCLUDED
 #define ETL_DEBOUNCE_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "static_assert.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   namespace private_debounce

include/etl/debug_count.h

@@ -31,12 +31,12 @@ SOFTWARE.
 #ifndef ETL_DEBUG_COUNT_INCLUDED
 #define ETL_DEBUG_COUNT_INCLUDED
 
+#include "platform.h"
+#include "atomic.h"
+
 #include <assert.h>
 #include <stdint.h>
 
-#include "atomic.h"
-#include "platform.h"
-
 ///\defgroup debug_count debug count
 ///\ingroup utilities
 

include/etl/deque.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_DEQUE_INCLUDED
 #define ETL_DEQUE_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "iterator.h"
@@ -48,6 +45,9 @@ SOFTWARE.
 #include "placement_new.h"
 #include "initializer_list.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "private/minmax_push.h"
 
 //*****************************************************************************

include/etl/endianness.h

@@ -31,12 +31,12 @@ SOFTWARE.
 #ifndef ETL_ENDIAN_INCLUDED
 #define ETL_ENDIAN_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "enum_type.h"
 #include "binary.h"
 
+#include <stdint.h>
+
 #if ETL_USING_CPP20 && ETL_USING_STL
   #include <bit>
 #endif

include/etl/error_handler.h

@@ -36,13 +36,13 @@ SOFTWARE.
 /// Error handler for when throwing exceptions is not required.
 ///\ingroup utilities
 
-#include <assert.h>
-
 #include "platform.h"
 #include "exception.h"
 #include "function.h"
 #include "nullptr.h"
 
+#include <assert.h>
+
 #if defined(ETL_LOG_ERRORS) || defined(ETL_IN_UNIT_TEST)
 namespace etl
 {

include/etl/factorial.h

@@ -31,10 +31,10 @@ SOFTWARE.
 #ifndef ETL_FACTORIAL_INCLUDED
 #define ETL_FACTORIAL_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 
+#include <stddef.h>
+
 ///\defgroup factorial factorial
 /// fibonacci<N> : Calculates the Nth factorial value.
 ///\ingroup maths

include/etl/fibonacci.h

@@ -31,10 +31,10 @@ SOFTWARE.
 #ifndef ETL_FIBONACCI_INCLUDED
 #define ETL_FIBONACCI_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 
+#include <stddef.h>
+
 ///\defgroup fibonacci fibonacci
 /// fibonacci<N> : Calculates the Nth Fibonacci value.
 ///\ingroup maths

include/etl/flags.h

@@ -31,10 +31,6 @@ SOFTWARE.
 #ifndef ETL_FLAGS_INCLUDED
 #define ETL_FLAGS_INCLUDED
 
-#include <string.h>
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "type_traits.h"
@@ -42,6 +38,10 @@ SOFTWARE.
 #include "static_assert.h"
 #include "initializer_list.h"
 
+#include <string.h>
+#include <stddef.h>
+#include <stdint.h>
+
 namespace etl
 {
   //*************************************************************************

include/etl/fnv_1.h

@@ -31,14 +31,13 @@ SOFTWARE.
 #ifndef ETL_FNV_1_INCLUDED
 #define ETL_FNV_1_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "static_assert.h"
 #include "type_traits.h"
 #include "ihash.h"
 #include "frame_check_sequence.h"
 
+#include <stdint.h>
 
 #if defined(ETL_COMPILER_KEIL)
 #pragma diag_suppress 1300

include/etl/forward_list.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_FORWARD_LIST_INCLUDED
 #define ETL_FORWARD_LIST_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "iterator.h"
@@ -50,6 +48,8 @@ SOFTWARE.
 #include "placement_new.h"
 #include "initializer_list.h"
 
+#include <stddef.h>
+
 #include "private/minmax_push.h"
 
 //*****************************************************************************

include/etl/frame_check_sequence.h

@@ -27,15 +27,14 @@ SOFTWARE.
 #ifndef ETL_FRAME_CHECK_SEQUENCE_INCLUDED
 #define ETL_FRAME_CHECK_SEQUENCE_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "static_assert.h"
 #include "type_traits.h"
 #include "binary.h"
-
 #include "iterator.h"
 
+#include <stdint.h>
+
 ETL_STATIC_ASSERT(ETL_USING_8BIT_TYPES, "This file does not currently support targets with no 8bit type");
 
 ///\defgroup frame_check_sequence Frame check sequence calculation

include/etl/fsm.h

@@ -51,8 +51,6 @@ SOFTWARE.
 #ifndef ETL_FSM_INCLUDED
 #define ETL_FSM_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "array.h"
 #include "nullptr.h"
@@ -63,6 +61,8 @@ SOFTWARE.
 #include "integral_limits.h"
 #include "largest.h"
 
+#include <stdint.h>
+
 #include "private/minmax_push.h"
 
 namespace etl

include/etl/generators/fsm_generator.h

@@ -63,8 +63,6 @@ cog.outl("//********************************************************************
 #ifndef ETL_FSM_INCLUDED
 #define ETL_FSM_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "array.h"
 #include "nullptr.h"
@@ -75,6 +73,8 @@ cog.outl("//********************************************************************
 #include "integral_limits.h"
 #include "largest.h"
 
+#include <stdint.h>
+
 #include "private/minmax_push.h"
 
 namespace etl

include/etl/generators/message_router_generator.h

@@ -63,8 +63,6 @@ cog.outl("//********************************************************************
 #ifndef ETL_MESSAGE_ROUTER_INCLUDED
 #define ETL_MESSAGE_ROUTER_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "message.h"
 #include "shared_message.h"
@@ -79,6 +77,8 @@ cog.outl("//********************************************************************
 #include "successor.h"
 #include "type_traits.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/generators/smallest_generator.h

@@ -65,11 +65,11 @@ cog.outl("//********************************************************************
 #ifndef ETL_SMALLEST_INCLUDED
 #define ETL_SMALLEST_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "integral_limits.h"
 
+#include <stdint.h>
+
 ///\defgroup smallest smallest
 ///\ingroup utilities
 

include/etl/generators/type_lookup_generator.h

@@ -29,14 +29,14 @@ SOFTWARE.
 #ifndef ETL_TYPE_LOOKUP_INCLUDED
 #define ETL_TYPE_LOOKUP_INCLUDED
 
-#include <limits.h>
-
 #include "platform.h"
 #include "type_traits.h"
 #include "static_assert.h"
 #include "integral_limits.h"
 #include "null_type.h"
 
+#include <limits.h>
+
 /*[[[cog
 import cog
 cog.outl("#if 0")

include/etl/generators/type_traits_generator.h

@@ -65,13 +65,13 @@ cog.outl("//********************************************************************
 #ifndef ETL_TYPE_TRAITS_INCLUDED
 #define ETL_TYPE_TRAITS_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "nullptr.h"
 #include "static_assert.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 ///\defgroup type_traits type_traits
 /// A set of type traits definitions.
 /// Derived from either the standard or alternate definitions, dependant on whether or not ETL_NO_STL is defined.

include/etl/generators/variant_pool_generator.h

@@ -63,14 +63,14 @@ cog.outl("//********************************************************************
 #ifndef ETL_VARIANT_POOL_INCLUDED
 #define ETL_VARIANT_POOL_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "pool.h"
 #include "type_traits.h"
 #include "static_assert.h"
 #include "largest.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/hash.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_HASH_INCLUDED
 #define ETL_HASH_INCLUDED
 
-#include <stdint.h>
-#include <stdlib.h>
-
 #include "platform.h"
 
 #if ETL_USING_8BIT_TYPES
@@ -43,6 +40,9 @@ SOFTWARE.
 #include "type_traits.h"
 #include "static_assert.h"
 
+#include <stdint.h>
+#include <stdlib.h>
+
 ///\defgroup hash Standard hash calculations
 ///\ingroup maths
 

include/etl/ihash.h

@@ -31,15 +31,13 @@ SOFTWARE.
 #ifndef ETL_IHASH_INCLUDED
 #define ETL_IHASH_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
-
 #include "utility.h"
-
 #include "exception.h"
 #include "error_handler.h"
 
+#include <stdint.h>
+
 ///\defgroup ihash Common data for all hash type classes.
 ///\ingroup hash
 

include/etl/instance_count.h

@@ -31,10 +31,10 @@ SOFTWARE.
 #ifndef ETL_INSTANCE_COUNT_INCLUDED
 #define ETL_INSTANCE_COUNT_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 
+#include <stdint.h>
+
 ///\defgroup instance_count instance count
 ///\ingroup utilities
 

include/etl/integral_limits.h

@@ -31,12 +31,12 @@ SOFTWARE.
 #ifndef ETL_INTEGRAL_LIMITS_INCLUDED
 #define ETL_INTEGRAL_LIMITS_INCLUDED
 
-#include <stddef.h>
-#include <limits.h>
-
 #include "platform.h"
 #include "type_traits.h"
 
+#include <stddef.h>
+#include <limits.h>
+
 #include "private/minmax_push.h"
 
 //*****************************************************************************

include/etl/intrusive_forward_list.h

@@ -32,23 +32,18 @@ SOFTWARE.
 #define ETL_INTRUSIVE_FORWARD_LIST_INCLUDED
 
 #include "platform.h"
-
 #include "algorithm.h"
 #include "iterator.h"
 #include "functional.h"
-
-#include "private/minmax_push.h"
-
-#include <stddef.h>
-
-#include "platform.h"
 #include "nullptr.h"
 #include "type_traits.h"
 #include "exception.h"
 #include "error_handler.h"
 #include "intrusive_links.h"
-#include "algorithm.h"
-#include "iterator.h"
+
+#include <stddef.h>
+
+#include "private/minmax_push.h"
 
 namespace etl
 {

include/etl/intrusive_links.h

@@ -31,17 +31,16 @@ SOFTWARE.
 #ifndef ETL_INTRUSIVE_LINKS_INCLUDED
 #define ETL_INTRUSIVE_LINKS_INCLUDED
 
-#include <assert.h>
-
 #include "platform.h"
 #include "nullptr.h"
 #include "type_traits.h"
 #include "exception.h"
 #include "error_handler.h"
-
 #include "utility.h"
 #include "algorithm.h"
 
+#include <assert.h>
+
 //*****************************************************************************
 // Note:
 // The link functions work slightly differently to the STL 'insert' convention

include/etl/intrusive_list.h

@@ -31,12 +31,6 @@ SOFTWARE.
 #ifndef ETL_INTRUSIVE_LIST_INCLUDED
 #define ETL_INTRUSIVE_LIST_INCLUDED
 
-#include "platform.h"
-
-#include "private/minmax_push.h"
-
-#include <stddef.h>
-
 #include "platform.h"
 #include "nullptr.h"
 #include "type_traits.h"
@@ -44,13 +38,14 @@ SOFTWARE.
 #include "error_handler.h"
 #include "intrusive_links.h"
 #include "static_assert.h"
-#include "algorithm.h"
-#include "iterator.h"
-
 #include "algorithm.h"
 #include "iterator.h"
 #include "functional.h"
 
+#include <stddef.h>
+
+#include "private/minmax_push.h"
+
 namespace etl
 {
   //***************************************************************************

include/etl/intrusive_queue.h

@@ -31,13 +31,13 @@ SOFTWARE.
 #ifndef ETL_INTRUSIVE_QUEUE_INCLUDED
 #define ETL_INTRUSIVE_QUEUE_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "type_traits.h"
 #include "error_handler.h"
 #include "intrusive_links.h"
 
+#include <stddef.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/intrusive_stack.h

@@ -31,13 +31,13 @@ SOFTWARE.
 #ifndef ETL_INTRUSIVE_STACK_INCLUDED
 #define ETL_INTRUSIVE_STACK_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "type_traits.h"
 #include "error_handler.h"
 #include "intrusive_links.h"
 
+#include <stddef.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/io_port.h

@@ -35,13 +35,11 @@ SOFTWARE.
 /// IO port access
 ///\ingroup utilities
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "nullptr.h"
 #include "iterator.h"
 
-#include "iterator.h"
+#include <stdint.h>
 
 namespace etl
 {

include/etl/jenkins.h

@@ -31,17 +31,16 @@ SOFTWARE.
 #ifndef ETL_JENKINS_INCLUDED
 #define ETL_JENKINS_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "static_assert.h"
 #include "type_traits.h"
 #include "error_handler.h"
 #include "ihash.h"
 #include "frame_check_sequence.h"
-
 #include "iterator.h"
 
+#include <stdint.h>
+
 #if defined(ETL_COMPILER_KEIL)
 #pragma diag_suppress 1300
 #endif

include/etl/list.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_LIST_INCLUDED
 #define ETL_LIST_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "iterator.h"
@@ -51,6 +49,8 @@ SOFTWARE.
 #include "placement_new.h"
 #include "initializer_list.h"
 
+#include <stddef.h>
+
 #include "private/minmax_push.h"
 
 //*****************************************************************************

include/etl/log.h

@@ -31,10 +31,10 @@ SOFTWARE.
 #ifndef ETL_LOG_INCLUDED
 #define ETL_LOG_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 
+#include <stddef.h>
+
 ///\defgroup log log
 /// log<N, BASE> : Calculates logs to any base, rounded down to the nearest integer.<br>
 /// log2<N>      : Calculates logs to base 2, rounded down to the nearest integer.<br>

include/etl/map.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_MAP_INCLUDED
 #define ETL_MAP_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "iterator.h"
@@ -50,6 +48,8 @@ SOFTWARE.
 #include "placement_new.h"
 #include "initializer_list.h"
 
+#include <stddef.h>
+
 #include "private/minmax_push.h"
 #include "private/comparator_is_transparent.h"
 

include/etl/mem_cast.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_MEM_CAST_INCLUDED
 #define ETL_MEM_CAST_INCLUDED
 
-#include <stdint.h>
-#include <string.h>
-
 #include "platform.h"
 #include "memory.h"
 #include "static_assert.h"
@@ -45,6 +42,9 @@ SOFTWARE.
 #include "file_error_numbers.h"
 #include "binary.h"
 
+#include <stdint.h>
+#include <string.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/memory_model.h

@@ -31,10 +31,12 @@ SOFTWARE.
 #ifndef ETL_MEMORY_MODEL_INCLUDED
 #define ETL_MEMORY_MODEL_INCLUDED
 
+#include "platform.h"
 #include "user_type.h"
-#include <stdint.h>
 #include "type_lookup.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   ETL_DECLARE_USER_TYPE(memory_model, int)

include/etl/message.h

@@ -29,8 +29,6 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_INCLUDED
 #define ETL_MESSAGE_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "error_handler.h"
 #include "exception.h"
@@ -38,6 +36,8 @@ SOFTWARE.
 #include "type_traits.h"
 #include "static_assert.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/message_broker.h

@@ -29,8 +29,6 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_BROKER_INCLUDED
 #define ETL_MESSAGE_BROKER_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "nullptr.h"
 #include "message_types.h"
@@ -38,6 +36,8 @@ SOFTWARE.
 #include "message_router.h"
 #include "span.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/message_bus.h

@@ -29,7 +29,6 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_BUS_INCLUDED
 #define ETL_MESSAGE_BUS_INCLUDED
 
-#include <stdint.h>
 #include "platform.h"
 #include "algorithm.h"
 #include "vector.h"
@@ -40,6 +39,8 @@ SOFTWARE.
 #include "message.h"
 #include "message_router.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/message_router.h

@@ -51,8 +51,6 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_ROUTER_INCLUDED
 #define ETL_MESSAGE_ROUTER_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "message.h"
 #include "shared_message.h"
@@ -67,6 +65,8 @@ SOFTWARE.
 #include "successor.h"
 #include "type_traits.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/message_router_registry.h

@@ -29,8 +29,6 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_ROUTER_REGISTRY_INCLUDED
 #define ETL_MESSAGE_ROUTER_REGISTRY_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "file_error_numbers.h"
 #include "message_router.h"
@@ -40,6 +38,8 @@ SOFTWARE.
 #include "iterator.h"
 #include "memory.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/message_timer.h

@@ -29,9 +29,6 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_TIMER_INCLUDED
 #define ETL_MESSAGE_TIMER_INCLUDED
 
-#include <stdint.h>
-#include "algorithm.h"
-
 #include "platform.h"
 #include "nullptr.h"
 #include "message_types.h"
@@ -41,6 +38,9 @@ SOFTWARE.
 #include "static_assert.h"
 #include "timer.h"
 #include "atomic.h"
+#include "algorithm.h"
+
+#include <stdint.h>
 
 #if defined(ETL_IN_UNIT_TEST) && ETL_NOT_USING_STL
   #define ETL_DISABLE_TIMER_UPDATES

include/etl/message_timer_atomic.h

@@ -29,9 +29,6 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_TIMER_ATOMIC_INCLUDED
 #define ETL_MESSAGE_TIMER_ATOMIC_INCLUDED
 
-#include <stdint.h>
-#include "algorithm.h"
-
 #include "platform.h"
 #include "nullptr.h"
 #include "message_types.h"
@@ -41,6 +38,9 @@ SOFTWARE.
 #include "static_assert.h"
 #include "timer.h"
 #include "atomic.h"
+#include "algorithm.h"
+
+#include <stdint.h>
 
 #if ETL_HAS_ATOMIC
 

include/etl/message_timer_interrupt.h

@@ -29,9 +29,6 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_TIMER_INTERRUPT_INCLUDED
 #define ETL_MESSAGE_TIMER_INTERRUPT_INCLUDED
 
-#include <stdint.h>
-#include "algorithm.h"
-
 #include "platform.h"
 #include "nullptr.h"
 #include "message_types.h"
@@ -41,6 +38,9 @@ SOFTWARE.
 #include "static_assert.h"
 #include "timer.h"
 #include "delegate.h"
+#include "algorithm.h"
+
+#include <stdint.h>
 
 namespace etl
 {

include/etl/message_timer_locked.h

@@ -29,9 +29,6 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_TIMER_LOCKED_INCLUDED
 #define ETL_MESSAGE_TIMER_LOCKED_INCLUDED
 
-#include <stdint.h>
-#include "algorithm.h"
-
 #include "platform.h"
 #include "nullptr.h"
 #include "message_types.h"
@@ -41,6 +38,9 @@ SOFTWARE.
 #include "static_assert.h"
 #include "timer.h"
 #include "delegate.h"
+#include "algorithm.h"
+
+#include <stdint.h>
 
 namespace etl
 {

include/etl/message_types.h

@@ -29,10 +29,10 @@ SOFTWARE.
 #ifndef ETL_MESSAGE_DEFS_INCLUDED
 #define ETL_MESSAGE_DEFS_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   /// Allow alternative type for message id.

include/etl/multimap.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_MULTIMAP_INCLUDED
 #define ETL_MULTIMAP_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "iterator.h"
@@ -50,6 +48,8 @@ SOFTWARE.
 #include "placement_new.h"
 #include "initializer_list.h"
 
+#include <stddef.h>
+
 #include "private/minmax_push.h"
 #include "private/comparator_is_transparent.h"
 

include/etl/multiset.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_MULTISET_INCLUDED
 #define ETL_MULTISET_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "iterator.h"
@@ -49,6 +47,8 @@ SOFTWARE.
 #include "placement_new.h"
 #include "initializer_list.h"
 
+#include <stddef.h>
+
 #include "private/minmax_push.h"
 #include "private/comparator_is_transparent.h"
 

include/etl/murmur3.h

@@ -31,13 +31,13 @@ SOFTWARE.
 #ifndef ETL_MURMUR3_INCLUDED
 #define ETL_MURMUR3_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "ihash.h"
 #include "binary.h"
 #include "error_handler.h"
 
+#include <stdint.h>
+
 #if defined(ETL_COMPILER_KEIL)
 #pragma diag_suppress 1300
 #endif

include/etl/null_type.h

@@ -29,6 +29,8 @@ SOFTWARE.
 #ifndef ETL_NULL_TYPE_INCLUDED
 #define ETL_NULL_TYPE_INCLUDED
 
+#include "platform.h"
+
 #include <stddef.h>
 
 namespace etl

include/etl/parameter_pack.h

@@ -29,11 +29,11 @@ SOFTWARE.
 #ifndef ETL_PARAMETER_PACK
 #define ETL_PARAMETER_PACK
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "type_traits.h"
 
+#include <stdint.h>
+
 #if ETL_CPP11_NOT_SUPPORTED
   #if !defined(ETL_IN_UNIT_TEST)
     #error NOT SUPPORTED FOR C++03 OR BELOW

include/etl/pearson.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_PEARSON_INCLUDED
 #define ETL_PEARSON_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "static_assert.h"
 #include "type_traits.h"
@@ -40,6 +38,8 @@ SOFTWARE.
 #include "array.h"
 #include "iterator.h"
 
+#include <stdint.h>
+
 ETL_STATIC_ASSERT(ETL_USING_8BIT_TYPES, "This file does not currently support targets with no 8bit type");
 
 #if defined(ETL_COMPILER_KEIL)

include/etl/power.h

@@ -31,12 +31,12 @@ SOFTWARE.
 #ifndef ETL_POW_INCLUDED
 #define ETL_POW_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "log.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 ///\defgroup power power
 /// power<N, POWER> : Calculates N to the power POWER.
 ///\ingroup maths

include/etl/priority_queue.h

@@ -31,10 +31,7 @@ SOFTWARE.
 #ifndef ETL_PRIORITY_QUEUE_INCLUDED
 #define ETL_PRIORITY_QUEUE_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
-
 #include "algorithm.h"
 #include "utility.h"
 #include "functional.h"
@@ -45,6 +42,8 @@ SOFTWARE.
 #include "error_handler.h"
 #include "exception.h"
 
+#include <stddef.h>
+
 //*****************************************************************************
 ///\defgroup queue queue
 /// A priority queue with the capacity defined at compile time,

include/etl/private/bitset_legacy.h

@@ -31,10 +31,6 @@ SOFTWARE.
 #ifndef ETL_BITSET_LEGACY_INCLUDED
 #define ETL_BITSET_LEGACY_INCLUDED
 
-#include <string.h>
-#include <stddef.h>
-#include <stdint.h>
-
 #include "../platform.h"
 #include "../algorithm.h"
 #include "../iterator.h"
@@ -51,6 +47,10 @@ SOFTWARE.
 #include "../span.h"
 #include "../string.h"
 
+#include <string.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #include "minmax_push.h"
 
 #if defined(ETL_COMPILER_KEIL)

include/etl/private/bitset_new.h

@@ -31,10 +31,6 @@ SOFTWARE.
 #ifndef ETL_BITSET_NEW_INCLUDED
 #define ETL_BITSET_NEW_INCLUDED
 
-#include <string.h>
-#include <stddef.h>
-#include <stdint.h>
-
 #include "../platform.h"
 #include "../algorithm.h"
 #include "../iterator.h"
@@ -51,6 +47,10 @@ SOFTWARE.
 #include "../span.h"
 #include "../string.h"
 
+#include <string.h>
+#include <stddef.h>
+#include <stdint.h>
+
 #include "minmax_push.h"
 
 #if defined(ETL_COMPILER_KEIL)

include/etl/private/minmax_pop.h

@@ -32,7 +32,7 @@ SOFTWARE.
  * The header include guard has been intentionally omitted.
  * This file is intended to evaluated multiple times by design.
  */
-#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(__ICCAVR__)
+#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_ICCAVR)
   #if !defined(ETL_COMPILER_ARM5)
     #pragma pop_macro("min")
     #pragma pop_macro("max")

include/etl/private/minmax_push.h

@@ -33,7 +33,7 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(__ICCAVR__)
+#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_ICCAVR)
   #if !defined(ETL_COMPILER_ARM5)
     #pragma push_macro("min")
     #pragma push_macro("max")

include/etl/private/pvoidvector.h

@@ -33,17 +33,16 @@ SOFTWARE.
 
 #define ETL_IN_PVOIDVECTOR
 
-#include <stddef.h>
-
 #include "../platform.h"
 #include "../algorithm.h"
 #include "vector_base.h"
 #include "../type_traits.h"
 #include "../error_handler.h"
-
 #include "../functional.h"
 #include "../iterator.h"
 
+#include <stddef.h>
+
 #include "minmax_push.h"
 
 namespace etl

include/etl/private/to_string_helper.h

@@ -33,8 +33,6 @@ SOFTWARE.
 
 ///\ingroup private
 
-#include <math.h>
-
 #include "../platform.h"
 #include "../absolute.h"
 #include "../negative.h"
@@ -46,6 +44,8 @@ SOFTWARE.
 #include "../iterator.h"
 #include "../limits.h"
 
+#include <math.h>
+
 #if ETL_USING_STL && ETL_USING_CPP11
   #include <iterator> // For std::begin, std::end and std::size
 #endif

include/etl/private/variant_legacy.h

@@ -28,8 +28,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#include <stdint.h>
-
 #include "../platform.h"
 #include "../utility.h"
 #include "../array.h"
@@ -43,6 +41,8 @@ SOFTWARE.
 #include "../null_type.h"
 #include "../placement_new.h"
 
+#include <stdint.h>
+
 #if defined(ETL_COMPILER_KEIL)
   #pragma diag_suppress 940
   #pragma diag_suppress 111

include/etl/private/variant_variadic.h

@@ -28,8 +28,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#include <stdint.h>
-
 #include "../platform.h"
 #include "../utility.h"
 #include "../largest.h"
@@ -45,6 +43,8 @@ SOFTWARE.
 #include "../memory.h"
 #include "../initializer_list.h"
 
+#include <stdint.h>
+
 #if defined(ETL_COMPILER_KEIL)
   #pragma diag_suppress 940
   #pragma diag_suppress 111

include/etl/private/vector_base.h

@@ -35,13 +35,13 @@ SOFTWARE.
 #ifndef ETL_VECTOR_BASE_INCLUDED
 #define ETL_VECTOR_BASE_INCLUDED
 
-#include <stddef.h>
-
 #include "../platform.h"
 #include "../exception.h"
 #include "../error_handler.h"
 #include "../debug_count.h"
 
+#include <stddef.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/profiles/determine_compiler.h

@@ -31,6 +31,9 @@ SOFTWARE.
 #ifndef ETL_DETERMINE_COMPILER_H_INCLUDED
 #define ETL_DETERMINE_COMPILER_H_INCLUDED
 
+//*****************************************************************************
+// Macros that are conditionally defined.
+//*****************************************************************************
 #if !defined(ETL_COMPILER_GCC) && \
     !defined(ETL_COMPILER_MICROSOFT) && \
     !defined(ETL_COMPILER_ARM5) && \
@@ -109,6 +112,13 @@ SOFTWARE.
     #endif
   #endif
 
+  #if !defined(ETL_COMPILER_TYPE_DETECTED) && !defined(ETL_COMPILER_ICCAVR)
+    #if defined(__ICCAVR__)
+      #define ETL_COMPILER_ICCAVR
+      #define ETL_COMPILER_TYPE_DETECTED
+    #endif
+  #endif
+
   #if !defined(ETL_COMPILER_TYPE_DETECTED) && !defined(ETL_COMPILER_MICROSOFT)
     #if defined(_MSC_VER)
       #define ETL_COMPILER_MICROSOFT
@@ -121,12 +131,21 @@ SOFTWARE.
   #endif
 #endif
 
+//*****************************************************************************
+// 'Using' macros that are always defined.
+//*****************************************************************************
 #if defined(ETL_COMPILER_GCC)
   #define ETL_USING_GCC_COMPILER 1
 #else
   #define ETL_USING_GCC_COMPILER 0
 #endif
 
+#if defined(ETL_COMPILER_ICCAVR)
+  #define ETL_USING_ICCAVR_COMPILER 1
+#else
+  #define ETL_USING_ICCAVR_COMPILER 0
+#endif
+
 #if defined(ETL_COMPILER_MICROSOFT)
   #define ETL_USING_MICROSOFT_COMPILER 1
 #else

include/etl/profiles/determine_compiler_version.h

@@ -37,6 +37,9 @@ SOFTWARE.
   #if defined(ETL_COMPILER_GCC)
     #define ETL_COMPILER_VERSION      __GNUC__
     #define ETL_COMPILER_FULL_VERSION ((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100) + __GNUC_PATCHLEVEL__)
+  #elif defined(ETL_COMPILER_ICCAVR)
+    #define ETL_COMPILER_VERSION      __VER__
+    #define ETL_COMPILER_FULL_VERSION __VER__
   #elif defined(ETL_COMPILER_MICROSOFT)
     #define ETL_COMPILER_VERSION      _MSC_VER
     #define ETL_COMPILER_FULL_VERSION _MSC_FULL_VER

include/etl/queue.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_QUEUE_INCLUDED
 #define ETL_QUEUE_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "iterator.h"
 #include "alignment.h"
@@ -48,6 +45,9 @@ SOFTWARE.
 #include "utility.h"
 #include "placement_new.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 //*****************************************************************************
 ///\defgroup queue queue
 /// A First-in / first-out queue with the capacity defined at compile time,

include/etl/queue_lockable.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_QUEUE_LOCKABLE_INCLUDED
 #define ETL_QUEUE_LOCKABLE_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "memory.h"
 #include "parameter_type.h"
@@ -43,6 +40,9 @@ SOFTWARE.
 #include "utility.h"
 #include "placement_new.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 namespace etl
 {
   template <size_t VMemory_Model = etl::memory_model::MEMORY_MODEL_LARGE>

include/etl/queue_mpmc_mutex.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_MPMC_QUEUE_MUTEX_INCLUDED
 #define ETL_MPMC_QUEUE_MUTEX_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "mutex.h"
 
@@ -46,6 +43,9 @@ SOFTWARE.
 #include "utility.h"
 #include "placement_new.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 namespace etl
 {
   template <const size_t MEMORY_MODEL = etl::memory_model::MEMORY_MODEL_LARGE>

include/etl/queue_spsc_atomic.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_SPSC_QUEUE_ATOMIC_INCLUDED
 #define ETL_SPSC_QUEUE_ATOMIC_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "alignment.h"
 #include "parameter_type.h"
@@ -43,6 +40,9 @@ SOFTWARE.
 #include "utility.h"
 #include "placement_new.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #if ETL_HAS_ATOMIC
 
 namespace etl

include/etl/queue_spsc_isr.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_SPSC_QUEUE_ISR_INCLUDED
 #define ETL_SPSC_QUEUE_ISR_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "alignment.h"
 #include "parameter_type.h"
@@ -42,6 +39,9 @@ SOFTWARE.
 #include "utility.h"
 #include "placement_new.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 namespace etl
 {
   template <typename T, const size_t MEMORY_MODEL = etl::memory_model::MEMORY_MODEL_LARGE>

include/etl/queue_spsc_locked.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_SPSC_QUEUE_LOCKED_INCLUDED
 #define ETL_SPSC_QUEUE_LOCKED_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "memory.h"
 #include "parameter_type.h"
@@ -43,6 +40,9 @@ SOFTWARE.
 #include "utility.h"
 #include "placement_new.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 namespace etl
 {
   template <size_t MEMORY_MODEL = etl::memory_model::MEMORY_MODEL_LARGE>

include/etl/radix.h

@@ -31,11 +31,11 @@ SOFTWARE.
 #ifndef ETL_RADIX_INCLUDED
 #define ETL_RADIX_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "enum_type.h"
 
+#include <stdint.h>
+
 ///\defgroup radix radix
 /// Radix constants for binary, octal, decimal and hex.
 ///\ingroup etl

include/etl/random.h

@@ -31,11 +31,11 @@ SOFTWARE.
 #ifndef ETL_RANDOM_INCLUDED
 #define ETL_RANDOM_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "binary.h"
 
+#include <stdint.h>
+
 namespace etl
 {
 #if defined(ETL_POLYMORPHIC_RANDOM)

include/etl/ratio.h

@@ -31,11 +31,11 @@ SOFTWARE.
 #ifndef ETL_RATIO_INCLUDED
 #define ETL_RATIO_INCLUDED
 
+#include "platform.h"
+
 #include <stddef.h>
 #include <stdint.h>
 
-#include "platform.h"
-
 ///\defgroup ratio ratio
 ///\ingroup maths
 

include/etl/reference_counted_message.h

@@ -29,8 +29,6 @@ SOFTWARE.
 #ifndef ETL_REFERENCE_COUNTED_MESSAGE_INCLUDED
 #define ETL_REFERENCE_COUNTED_MESSAGE_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "message.h"
 #include "atomic.h"
@@ -39,6 +37,8 @@ SOFTWARE.
 #include "type_traits.h"
 #include "ireference_counted_message_pool.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/reference_counted_object.h

@@ -29,11 +29,11 @@
 #ifndef ETL_REFERENCE_COUNTED_OBJECT_INCLUDED
 #define ETL_REFERENCE_COUNTED_OBJECT_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "atomic.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/reference_flat_map.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_REFERENCE_FLAT_MAP_INCLUDED
 #define ETL_REFERENCE_FLAT_MAP_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "vector.h"
 #include "error_handler.h"
@@ -47,6 +45,8 @@ SOFTWARE.
 
 #include "private/comparator_is_transparent.h"
 
+#include <stddef.h>
+
 //*****************************************************************************
 ///\defgroup reference_flat_map reference_flat_map
 /// An reference_flat_map with the capacity defined at compile time.

include/etl/reference_flat_multimap.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_REFERENCE_FLAT_MULTIMAP_INCLUDED
 #define ETL_REFERENCE_FLAT_MULTIMAP_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "exception.h"
 #include "error_handler.h"
@@ -45,6 +43,8 @@ SOFTWARE.
 
 #include "private/comparator_is_transparent.h"
 
+#include <stddef.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/reference_flat_multiset.h

@@ -31,10 +31,7 @@ SOFTWARE.
 #ifndef ETL_REFERENCE_FLAT_MULTISET_INCLUDED
 #define ETL_REFERENCE_FLAT_MULTISET_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
-
 #include "algorithm.h"
 #include "iterator.h"
 #include "functional.h"
@@ -48,6 +45,8 @@ SOFTWARE.
 
 #include "private/comparator_is_transparent.h"
 
+#include <stddef.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/reference_flat_set.h

@@ -31,10 +31,7 @@ SOFTWARE.
 #ifndef ETL_REFERENCE_FLAT_SET_INCLUDED
 #define ETL_REFERENCE_FLAT_SET_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
-
 #include "algorithm.h"
 #include "iterator.h"
 #include "functional.h"
@@ -49,6 +46,8 @@ SOFTWARE.
 
 #include "private/comparator_is_transparent.h"
 
+#include <stddef.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/scheduler.h

@@ -29,8 +29,6 @@ SOFTWARE.
 #ifndef ETL_SCHEDULER_INCLUDED
 #define ETL_SCHEDULER_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "vector.h"
 #include "nullptr.h"
@@ -40,6 +38,8 @@ SOFTWARE.
 #include "type_traits.h"
 #include "function.h"
 
+#include <stdint.h>
+
 namespace etl
 {
   //***************************************************************************

include/etl/set.h

@@ -31,8 +31,6 @@ SOFTWARE.
 #ifndef ETL_SET_INCLUDED
 #define ETL_SET_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "pool.h"
 #include "exception.h"
@@ -51,6 +49,9 @@ SOFTWARE.
 #include "initializer_list.h"
 
 #include "private/comparator_is_transparent.h"
+
+#include <stddef.h>
+
 #include "private/minmax_push.h"
 
 //*****************************************************************************

include/etl/smallest.h

@@ -53,11 +53,11 @@ SOFTWARE.
 #ifndef ETL_SMALLEST_INCLUDED
 #define ETL_SMALLEST_INCLUDED
 
-#include <stdint.h>
-
 #include "platform.h"
 #include "integral_limits.h"
 
+#include <stdint.h>
+
 ///\defgroup smallest smallest
 ///\ingroup utilities
 

include/etl/sqrt.h

@@ -31,12 +31,12 @@ SOFTWARE.
 #ifndef ETL_SQRT_INCLUDED
 #define ETL_SQRT_INCLUDED
 
-#include <stddef.h>
-
 #include "platform.h"
 #include "type_traits.h"
 #include "constant.h"
 
+#include <stddef.h>
+
 namespace etl 
 {
   //***************************************************************************

include/etl/stack.h

@@ -31,9 +31,6 @@ SOFTWARE.
 #ifndef ETL_STACK_INCLUDED
 #define ETL_STACK_INCLUDED
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include "platform.h"
 #include "algorithm.h"
 #include "utility.h"
@@ -46,6 +43,9 @@ SOFTWARE.
 #include "type_traits.h"
 #include "placement_new.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 //*****************************************************************************
 ///\defgroup stack stack
 /// A Last-in / first-out stack with the capacity defined at compile time,