From 3eec1e18c38bf77a5fdc991650440125ad963bad Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Sat, 19 Apr 2014 17:03:16 +0400
Subject: [PATCH] Include order fix

---
 libuavcan/src/driver/uc_can.cpp                       | 2 +-
 libuavcan/src/marshal/uc_bit_stream.cpp               | 2 +-
 libuavcan/src/marshal/uc_float_spec.cpp               | 2 +-
 libuavcan/src/node/uc_global_data_type_registry.cpp   | 4 ++--
 libuavcan/src/node/uc_scheduler.cpp                   | 2 +-
 libuavcan/src/node/uc_timer.cpp                       | 2 +-
 libuavcan/src/protocol/uc_data_type_info_provider.cpp | 2 +-
 libuavcan/src/protocol/uc_global_time_sync_master.cpp | 4 ++--
 libuavcan/src/protocol/uc_global_time_sync_slave.cpp  | 2 +-
 libuavcan/src/protocol/uc_logger.cpp                  | 2 +-
 libuavcan/src/protocol/uc_network_compat_checker.cpp  | 4 ++--
 libuavcan/src/protocol/uc_node_status_monitor.cpp     | 4 ++--
 libuavcan/src/protocol/uc_node_status_provider.cpp    | 4 ++--
 libuavcan/src/protocol/uc_param_server.cpp            | 4 ++--
 libuavcan/src/transport/uc_can_io.cpp                 | 4 ++--
 libuavcan/src/transport/uc_dispatcher.cpp             | 2 +-
 libuavcan/src/transport/uc_frame.cpp                  | 2 +-
 libuavcan/src/transport/uc_transfer.cpp               | 2 +-
 libuavcan/src/transport/uc_transfer_buffer.cpp        | 2 +-
 libuavcan/src/transport/uc_transfer_listener.cpp      | 4 ++--
 libuavcan/src/transport/uc_transfer_receiver.cpp      | 6 +++---
 libuavcan/src/transport/uc_transfer_sender.cpp        | 4 ++--
 libuavcan/src/uc_data_type.cpp                        | 4 ++--
 libuavcan/src/uc_error.cpp                            | 3 +--
 24 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/libuavcan/src/driver/uc_can.cpp b/libuavcan/src/driver/uc_can.cpp
index 7a6f2e68e2..81b1b24345 100644
--- a/libuavcan/src/driver/uc_can.cpp
+++ b/libuavcan/src/driver/uc_can.cpp
@@ -3,8 +3,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
 #include <uavcan/driver/can.hpp>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/marshal/uc_bit_stream.cpp b/libuavcan/src/marshal/uc_bit_stream.cpp
index c5691c884f..9c68007136 100644
--- a/libuavcan/src/marshal/uc_bit_stream.cpp
+++ b/libuavcan/src/marshal/uc_bit_stream.cpp
@@ -2,9 +2,9 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
 #include <uavcan/marshal/bit_stream.hpp>
 #include <uavcan/transport/transfer_buffer.hpp>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/marshal/uc_float_spec.cpp b/libuavcan/src/marshal/uc_float_spec.cpp
index b6e803ed81..3200128198 100644
--- a/libuavcan/src/marshal/uc_float_spec.cpp
+++ b/libuavcan/src/marshal/uc_float_spec.cpp
@@ -2,8 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <uavcan/impl_constants.hpp>
 #include <uavcan/marshal/float_spec.hpp>
+#include <uavcan/impl_constants.hpp>
 #include <cmath>
 
 #if !defined(UAVCAN_CPP_VERSION) || !defined(UAVCAN_CPP11)
diff --git a/libuavcan/src/node/uc_global_data_type_registry.cpp b/libuavcan/src/node/uc_global_data_type_registry.cpp
index 4bbb6664bf..f8aca9d9f4 100644
--- a/libuavcan/src/node/uc_global_data_type_registry.cpp
+++ b/libuavcan/src/node/uc_global_data_type_registry.cpp
@@ -2,10 +2,10 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
-#include <cstdlib>
 #include <uavcan/node/global_data_type_registry.hpp>
 #include <uavcan/debug.hpp>
+#include <cassert>
+#include <cstdlib>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/node/uc_scheduler.cpp b/libuavcan/src/node/uc_scheduler.cpp
index 20bbd286b4..7f06955662 100644
--- a/libuavcan/src/node/uc_scheduler.cpp
+++ b/libuavcan/src/node/uc_scheduler.cpp
@@ -2,9 +2,9 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
 #include <uavcan/node/scheduler.hpp>
 #include <uavcan/debug.hpp>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/node/uc_timer.cpp b/libuavcan/src/node/uc_timer.cpp
index 231c28e2f0..24caa68694 100644
--- a/libuavcan/src/node/uc_timer.cpp
+++ b/libuavcan/src/node/uc_timer.cpp
@@ -2,8 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
 #include <uavcan/node/timer.hpp>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/protocol/uc_data_type_info_provider.cpp b/libuavcan/src/protocol/uc_data_type_info_provider.cpp
index 34c3867cce..a520795d46 100644
--- a/libuavcan/src/protocol/uc_data_type_info_provider.cpp
+++ b/libuavcan/src/protocol/uc_data_type_info_provider.cpp
@@ -2,8 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <uavcan/debug.hpp>
 #include <uavcan/protocol/data_type_info_provider.hpp>
+#include <uavcan/debug.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/protocol/uc_global_time_sync_master.cpp b/libuavcan/src/protocol/uc_global_time_sync_master.cpp
index 5cdb1a5173..81f7216e3f 100644
--- a/libuavcan/src/protocol/uc_global_time_sync_master.cpp
+++ b/libuavcan/src/protocol/uc_global_time_sync_master.cpp
@@ -5,10 +5,10 @@
 #include <uavcan/impl_constants.hpp>
 #if !UAVCAN_TINY
 
-#include <cstdlib>
-#include <cassert>
 #include <uavcan/protocol/global_time_sync_master.hpp>
 #include <uavcan/debug.hpp>
+#include <cstdlib>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/protocol/uc_global_time_sync_slave.cpp b/libuavcan/src/protocol/uc_global_time_sync_slave.cpp
index 5bc0639ba3..f7b54a4d08 100644
--- a/libuavcan/src/protocol/uc_global_time_sync_slave.cpp
+++ b/libuavcan/src/protocol/uc_global_time_sync_slave.cpp
@@ -2,9 +2,9 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
 #include <uavcan/protocol/global_time_sync_slave.hpp>
 #include <uavcan/debug.hpp>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/protocol/uc_logger.cpp b/libuavcan/src/protocol/uc_logger.cpp
index d9f578e7f6..a0e900b285 100644
--- a/libuavcan/src/protocol/uc_logger.cpp
+++ b/libuavcan/src/protocol/uc_logger.cpp
@@ -2,8 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cstdlib>
 #include <uavcan/protocol/logger.hpp>
+#include <cstdlib>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/protocol/uc_network_compat_checker.cpp b/libuavcan/src/protocol/uc_network_compat_checker.cpp
index 2aa367fac1..96904a790c 100644
--- a/libuavcan/src/protocol/uc_network_compat_checker.cpp
+++ b/libuavcan/src/protocol/uc_network_compat_checker.cpp
@@ -5,11 +5,11 @@
 #include <uavcan/impl_constants.hpp>
 #if !UAVCAN_TINY
 
-#include <cassert>
-#include <uavcan/debug.hpp>
 #include <uavcan/protocol/network_compat_checker.hpp>
+#include <uavcan/debug.hpp>
 #include <uavcan/node/publisher.hpp>
 #include <uavcan/protocol/GlobalDiscoveryRequest.hpp>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/protocol/uc_node_status_monitor.cpp b/libuavcan/src/protocol/uc_node_status_monitor.cpp
index c0282c63e9..67505ebcd4 100644
--- a/libuavcan/src/protocol/uc_node_status_monitor.cpp
+++ b/libuavcan/src/protocol/uc_node_status_monitor.cpp
@@ -2,11 +2,11 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
+#include <uavcan/protocol/node_status_monitor.hpp>
+#include <uavcan/debug.hpp>
 #include <algorithm>
 #include <cassert>
 #include <cstdlib>
-#include <uavcan/debug.hpp>
-#include <uavcan/protocol/node_status_monitor.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/protocol/uc_node_status_provider.cpp b/libuavcan/src/protocol/uc_node_status_provider.cpp
index 2552b041f9..cc76c08c89 100644
--- a/libuavcan/src/protocol/uc_node_status_provider.cpp
+++ b/libuavcan/src/protocol/uc_node_status_provider.cpp
@@ -2,9 +2,9 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
-#include <uavcan/debug.hpp>
 #include <uavcan/protocol/node_status_provider.hpp>
+#include <uavcan/debug.hpp>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/protocol/uc_param_server.cpp b/libuavcan/src/protocol/uc_param_server.cpp
index fc9fd1a69e..7c2ae67816 100644
--- a/libuavcan/src/protocol/uc_param_server.cpp
+++ b/libuavcan/src/protocol/uc_param_server.cpp
@@ -2,10 +2,10 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
+#include <uavcan/protocol/param_server.hpp>
+#include <uavcan/debug.hpp>
 #include <cassert>
 #include <cstdlib>
-#include <uavcan/debug.hpp>
-#include <uavcan/protocol/param_server.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/transport/uc_can_io.cpp b/libuavcan/src/transport/uc_can_io.cpp
index a3afe5b92f..7a60934d81 100644
--- a/libuavcan/src/transport/uc_can_io.cpp
+++ b/libuavcan/src/transport/uc_can_io.cpp
@@ -3,11 +3,11 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
+#include <uavcan/transport/can_io.hpp>
+#include <uavcan/debug.hpp>
 #include <algorithm>
 #include <cassert>
 #include <limits>
-#include <uavcan/transport/can_io.hpp>
-#include <uavcan/debug.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/transport/uc_dispatcher.cpp b/libuavcan/src/transport/uc_dispatcher.cpp
index 22f3e88c09..29460c5cd6 100644
--- a/libuavcan/src/transport/uc_dispatcher.cpp
+++ b/libuavcan/src/transport/uc_dispatcher.cpp
@@ -2,9 +2,9 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
 #include <uavcan/transport/dispatcher.hpp>
 #include <uavcan/debug.hpp>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/transport/uc_frame.cpp b/libuavcan/src/transport/uc_frame.cpp
index b8c800fe69..145f78f58f 100644
--- a/libuavcan/src/transport/uc_frame.cpp
+++ b/libuavcan/src/transport/uc_frame.cpp
@@ -2,9 +2,9 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
 #include <uavcan/transport/frame.hpp>
 #include <uavcan/transport/can_io.hpp>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/transport/uc_transfer.cpp b/libuavcan/src/transport/uc_transfer.cpp
index b4fda4e6c5..5a070939d6 100644
--- a/libuavcan/src/transport/uc_transfer.cpp
+++ b/libuavcan/src/transport/uc_transfer.cpp
@@ -2,7 +2,7 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
+#include <uavcan/transport/transfer.hpp>
 #include <uavcan/transport/frame.hpp>
 #include <uavcan/transport/can_io.hpp>
 
diff --git a/libuavcan/src/transport/uc_transfer_buffer.cpp b/libuavcan/src/transport/uc_transfer_buffer.cpp
index 4aad17ff9c..03c23f9833 100644
--- a/libuavcan/src/transport/uc_transfer_buffer.cpp
+++ b/libuavcan/src/transport/uc_transfer_buffer.cpp
@@ -2,9 +2,9 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
+#include <uavcan/transport/transfer_buffer.hpp>
 #include <cassert>
 #include <cstdlib>
-#include <uavcan/transport/transfer_buffer.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/transport/uc_transfer_listener.cpp b/libuavcan/src/transport/uc_transfer_listener.cpp
index 4c3fb8d4c4..46422c7a1a 100644
--- a/libuavcan/src/transport/uc_transfer_listener.cpp
+++ b/libuavcan/src/transport/uc_transfer_listener.cpp
@@ -2,10 +2,10 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cstdlib>
-#include <cassert>
 #include <uavcan/transport/transfer_listener.hpp>
 #include <uavcan/debug.hpp>
+#include <cstdlib>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/transport/uc_transfer_receiver.cpp b/libuavcan/src/transport/uc_transfer_receiver.cpp
index 25c5dae0f0..f5db8217ea 100644
--- a/libuavcan/src/transport/uc_transfer_receiver.cpp
+++ b/libuavcan/src/transport/uc_transfer_receiver.cpp
@@ -2,12 +2,12 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
+#include <uavcan/transport/transfer_receiver.hpp>
+#include <uavcan/transport/crc.hpp>
+#include <uavcan/debug.hpp>
 #include <cstdlib>
 #include <cassert>
 #include <algorithm>
-#include <uavcan/debug.hpp>
-#include <uavcan/transport/transfer_receiver.hpp>
-#include <uavcan/transport/crc.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/transport/uc_transfer_sender.cpp b/libuavcan/src/transport/uc_transfer_sender.cpp
index 81a1aac13b..45d6948272 100644
--- a/libuavcan/src/transport/uc_transfer_sender.cpp
+++ b/libuavcan/src/transport/uc_transfer_sender.cpp
@@ -2,9 +2,9 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cassert>
-#include <uavcan/debug.hpp>
 #include <uavcan/transport/transfer_sender.hpp>
+#include <uavcan/debug.hpp>
+#include <cassert>
 
 
 namespace uavcan
diff --git a/libuavcan/src/uc_data_type.cpp b/libuavcan/src/uc_data_type.cpp
index 886ddd499f..c90509e2f6 100644
--- a/libuavcan/src/uc_data_type.cpp
+++ b/libuavcan/src/uc_data_type.cpp
@@ -2,10 +2,10 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <cstring>
-#include <cassert>
 #include <uavcan/data_type.hpp>
 #include <uavcan/transport/crc.hpp>
+#include <cstring>
+#include <cassert>
 
 namespace uavcan
 {
diff --git a/libuavcan/src/uc_error.cpp b/libuavcan/src/uc_error.cpp
index 03764ff6e0..938fbe4a87 100644
--- a/libuavcan/src/uc_error.cpp
+++ b/libuavcan/src/uc_error.cpp
@@ -2,11 +2,10 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
+#include <uavcan/error.hpp>
 #include <cassert>
 #include <cstdlib>
 #include <stdexcept>
-#include <uavcan/error.hpp>
-#include <uavcan/impl_constants.hpp>
 
 #ifndef UAVCAN_EXCEPTIONS
 # error UAVCAN_EXCEPTIONS