Reorganized directory structure - directory 'internal' pulled up one level. No logical changes.

libuavcan/dsdl_compiler/data_type_template.tmpl

@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <uavcan/global_data_type_registry.hpp>
-#include <uavcan/internal/marshal/types.hpp>
+#include <uavcan/node/global_data_type_registry.hpp>
+#include <uavcan/marshal/types.hpp>
 
 % for inc in t.cpp_includes:
 #include <${inc}>

libuavcan/include/uavcan/can_driver.hpp

@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <algorithm>
 #include <string>
-#include <uavcan/internal/impl_constants.hpp>
+#include <uavcan/impl_constants.hpp>
 #include <uavcan/system_clock.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/data_type.hpp

@@ -9,7 +9,7 @@
 #include <string>
 #include <stdint.h>
 #include <algorithm>
-#include <uavcan/internal/transport/transfer.hpp>
+#include <uavcan/transport/transfer.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/internal/marshal/types.hpp

@@ -1,10 +0,0 @@
-/*
- * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
- */
-
-#pragma once
-
-#include <uavcan/internal/marshal/integer_spec.hpp>
-#include <uavcan/internal/marshal/float_spec.hpp>
-#include <uavcan/internal/marshal/array.hpp>
-#include <uavcan/internal/marshal/type_util.hpp>

libuavcan/include/uavcan/map.hpp

@@ -7,9 +7,9 @@
 #include <cassert>
 #include <cstdlib>
 #include <stdint.h>
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/impl_constants.hpp>
-#include <uavcan/internal/dynamic_memory.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/impl_constants.hpp>
+#include <uavcan/dynamic_memory.hpp>
 #include <uavcan/util/compile_time.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/marshal/array.hpp

@@ -9,8 +9,8 @@
 #include <stdexcept>
 #include <cstring>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/internal/impl_constants.hpp>
-#include <uavcan/internal/marshal/type_util.hpp>
+#include <uavcan/impl_constants.hpp>
+#include <uavcan/marshal/type_util.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/marshal/float_spec.hpp

@@ -9,8 +9,8 @@
 #include <math.h>            // Needed for isfinite
 #include <uavcan/data_type.hpp>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/internal/marshal/type_util.hpp>
-#include <uavcan/internal/marshal/integer_spec.hpp>
+#include <uavcan/marshal/type_util.hpp>
+#include <uavcan/marshal/integer_spec.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/marshal/integer_spec.hpp

@@ -8,8 +8,8 @@
 #include <limits>
 #include <uavcan/data_type.hpp>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/internal/marshal/scalar_codec.hpp>
-#include <uavcan/internal/marshal/type_util.hpp>
+#include <uavcan/marshal/scalar_codec.hpp>
+#include <uavcan/marshal/type_util.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/marshal/scalar_codec.hpp

@@ -9,7 +9,7 @@
 #include <limits>
 #include <string>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/internal/marshal/bit_stream.hpp>
+#include <uavcan/marshal/bit_stream.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/marshal/types.hpp

@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
+ */
+
+#pragma once
+
+#include <uavcan/marshal/integer_spec.hpp>
+#include <uavcan/marshal/float_spec.hpp>
+#include <uavcan/marshal/array.hpp>
+#include <uavcan/marshal/type_util.hpp>

libuavcan/include/uavcan/node/generic_publisher.hpp

@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <uavcan/internal/node/scheduler.hpp>
+#include <uavcan/node/scheduler.hpp>
 #include <uavcan/data_type.hpp>
-#include <uavcan/internal/node/marshal_buffer.hpp>
-#include <uavcan/global_data_type_registry.hpp>
+#include <uavcan/node/marshal_buffer.hpp>
+#include <uavcan/node/global_data_type_registry.hpp>
 #include <uavcan/util/lazy_constructor.hpp>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/transfer_sender.hpp>
-#include <uavcan/internal/marshal/scalar_codec.hpp>
-#include <uavcan/internal/marshal/types.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/transfer_sender.hpp>
+#include <uavcan/marshal/scalar_codec.hpp>
+#include <uavcan/marshal/types.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/generic_subscriber.hpp

@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <uavcan/internal/node/scheduler.hpp>
+#include <uavcan/node/scheduler.hpp>
 #include <uavcan/data_type.hpp>
-#include <uavcan/global_data_type_registry.hpp>
+#include <uavcan/node/global_data_type_registry.hpp>
 #include <uavcan/util/compile_time.hpp>
 #include <uavcan/util/lazy_constructor.hpp>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/transfer_listener.hpp>
-#include <uavcan/internal/marshal/scalar_codec.hpp>
-#include <uavcan/internal/marshal/types.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/transfer_listener.hpp>
+#include <uavcan/marshal/scalar_codec.hpp>
+#include <uavcan/marshal/types.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/global_data_type_registry.hpp

@@ -10,10 +10,10 @@
 #include <algorithm>
 #include <uavcan/data_type.hpp>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/internal/fatal_error.hpp>
-#include <uavcan/internal/linked_list.hpp>
+#include <uavcan/fatal_error.hpp>
+#include <uavcan/linked_list.hpp>
 #if UAVCAN_DEBUG
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/debug.hpp>
 #endif
 
 namespace uavcan

libuavcan/include/uavcan/node/marshal_buffer.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/transport/transfer.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/publisher.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <uavcan/internal/node/generic_publisher.hpp>
+#include <uavcan/node/generic_publisher.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/scheduler.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/transport/dispatcher.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/transport/dispatcher.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/service_client.hpp

@@ -2,8 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <uavcan/internal/node/generic_publisher.hpp>
-#include <uavcan/internal/node/generic_subscriber.hpp>
+#include <uavcan/node/generic_publisher.hpp>
+#include <uavcan/node/generic_subscriber.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/service_server.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <uavcan/internal/node/generic_publisher.hpp>
-#include <uavcan/internal/node/generic_subscriber.hpp>
+#include <uavcan/node/generic_publisher.hpp>
+#include <uavcan/node/generic_subscriber.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/subscriber.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <cassert>
-#include <uavcan/internal/node/generic_subscriber.hpp>
+#include <uavcan/node/generic_subscriber.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/timer.hpp

@@ -5,10 +5,10 @@
 #pragma once
 
 #include <stdint.h>
-#include <uavcan/internal/node/scheduler.hpp>
+#include <uavcan/node/scheduler.hpp>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/fatal_error.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/fatal_error.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/system_clock.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <uavcan/internal/impl_constants.hpp>
+#include <uavcan/impl_constants.hpp>
 #include <uavcan/time.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/transport/can_io.hpp

@@ -7,9 +7,9 @@
 
 #include <cassert>
 #include <stdint.h>
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/dynamic_memory.hpp>
-#include <uavcan/internal/impl_constants.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/dynamic_memory.hpp>
+#include <uavcan/impl_constants.hpp>
 #include <uavcan/util/compile_time.hpp>
 #include <uavcan/can_driver.hpp>
 #include <uavcan/system_clock.hpp>

libuavcan/include/uavcan/transport/dispatcher.hpp

@@ -6,10 +6,10 @@
 
 #include <cassert>
 #include <stdint.h>
-#include <uavcan/internal/transport/transfer_listener.hpp>
-#include <uavcan/internal/transport/outgoing_transfer_registry.hpp>
-#include <uavcan/internal/transport/can_io.hpp>
-#include <uavcan/internal/linked_list.hpp>
+#include <uavcan/transport/transfer_listener.hpp>
+#include <uavcan/transport/outgoing_transfer_registry.hpp>
+#include <uavcan/transport/can_io.hpp>
+#include <uavcan/linked_list.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/transport/frame.hpp

@@ -7,8 +7,8 @@
 #include <cassert>
 #include <algorithm>
 #include <string>
-#include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/transport/can_io.hpp>
+#include <uavcan/transport/transfer.hpp>
+#include <uavcan/transport/can_io.hpp>
 #include <uavcan/data_type.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp

@@ -7,11 +7,10 @@
 #include <cassert>
 #include <stdint.h>
 #include <sstream>
-#include <uavcan/internal/impl_constants.hpp>
-#include <uavcan/internal/map.hpp>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/impl_constants.hpp>
+#include <uavcan/map.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/transfer.hpp>
 #include <uavcan/time.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/transport/transfer_buffer.hpp

@@ -7,11 +7,11 @@
 #include <stdint.h>
 #include <algorithm>
 #include <limits>
-#include <uavcan/internal/transport/frame.hpp>
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/dynamic_memory.hpp>
-#include <uavcan/internal/impl_constants.hpp>
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/transport/frame.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/dynamic_memory.hpp>
+#include <uavcan/impl_constants.hpp>
+#include <uavcan/debug.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/transport/transfer_listener.hpp

@@ -7,11 +7,11 @@
 #include <cassert>
 #include <algorithm>
 #include <stdint.h>
-#include <uavcan/internal/transport/transfer_receiver.hpp>
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/map.hpp>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/crc.hpp>
+#include <uavcan/transport/transfer_receiver.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/map.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/crc.hpp>
 #include <uavcan/data_type.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/transport/transfer_receiver.hpp

@@ -5,8 +5,8 @@
 #pragma once
 
 #include <cstdlib>
-#include <uavcan/internal/transport/frame.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/transport/frame.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/transport/transfer_sender.hpp

@@ -7,9 +7,9 @@
 #include <cstdlib>
 #include <cassert>
 #include <uavcan/data_type.hpp>
-#include <uavcan/internal/transport/crc.hpp>
-#include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/transport/dispatcher.hpp>
+#include <uavcan/transport/crc.hpp>
+#include <uavcan/transport/transfer.hpp>
+#include <uavcan/transport/dispatcher.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/util/lazy_constructor.hpp

@@ -5,8 +5,8 @@
 #pragma once
 
 #include <cstdlib>
-#include <uavcan/internal/fatal_error.hpp>
-#include <uavcan/internal/impl_constants.hpp>
+#include <uavcan/fatal_error.hpp>
+#include <uavcan/impl_constants.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/util/method_binder.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <uavcan/internal/fatal_error.hpp>
-#include <uavcan/internal/impl_constants.hpp>
+#include <uavcan/fatal_error.hpp>
+#include <uavcan/impl_constants.hpp>
 #include <uavcan/util/compile_time.hpp>
 
 namespace uavcan

libuavcan/src/data_type.cpp

@@ -7,7 +7,7 @@
 #include <iomanip>
 #include <cassert>
 #include <uavcan/data_type.hpp>
-#include <uavcan/internal/transport/crc.hpp>
+#include <uavcan/transport/crc.hpp>
 
 namespace uavcan
 {

libuavcan/src/fatal_error.cpp

@@ -5,8 +5,8 @@
 #include <cassert>
 #include <cstdlib>
 #include <stdexcept>
-#include <uavcan/internal/fatal_error.hpp>
-#include <uavcan/internal/impl_constants.hpp>
+#include <uavcan/fatal_error.hpp>
+#include <uavcan/impl_constants.hpp>
 
 namespace uavcan
 {

libuavcan/src/marshal/bit_stream.cpp

@@ -4,8 +4,8 @@
 
 #include <cassert>
 #include <sstream>
-#include <uavcan/internal/marshal/bit_stream.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/marshal/bit_stream.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 namespace uavcan
 {

libuavcan/src/marshal/float_spec.cpp

@@ -2,7 +2,7 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <uavcan/internal/marshal/float_spec.hpp>
+#include <uavcan/marshal/float_spec.hpp>
 #include <cmath>
 
 namespace uavcan

libuavcan/src/node/global_data_type_registry.cpp

@@ -4,8 +4,8 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <uavcan/global_data_type_registry.hpp>
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/node/global_data_type_registry.hpp>
+#include <uavcan/debug.hpp>
 
 namespace uavcan
 {

libuavcan/src/node/scheduler.cpp

@@ -3,8 +3,8 @@
  */
 
 #include <cassert>
-#include <uavcan/internal/node/scheduler.hpp>
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/node/scheduler.hpp>
+#include <uavcan/debug.hpp>
 
 namespace uavcan
 {

libuavcan/src/node/timer.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <cassert>
-#include <uavcan/timer.hpp>
+#include <uavcan/node/timer.hpp>
 
 namespace uavcan
 {

libuavcan/src/transport/can_io.cpp

@@ -7,8 +7,8 @@
 #include <sstream>
 #include <cassert>
 #include <limits>
-#include <uavcan/internal/transport/can_io.hpp>
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/transport/can_io.hpp>
+#include <uavcan/debug.hpp>
 
 namespace uavcan
 {

libuavcan/src/transport/crc.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <cassert>
-#include <uavcan/internal/transport/crc.hpp>
+#include <uavcan/transport/crc.hpp>
 
 namespace uavcan
 {

libuavcan/src/transport/dispatcher.cpp

@@ -3,8 +3,8 @@
  */
 
 #include <cassert>
-#include <uavcan/internal/transport/dispatcher.hpp>
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/transport/dispatcher.hpp>
+#include <uavcan/debug.hpp>
 
 namespace uavcan
 {

libuavcan/src/transport/frame.cpp

@@ -5,8 +5,8 @@
 #include <cassert>
 #include <cstdio>
 #include <sstream>
-#include <uavcan/internal/transport/frame.hpp>
-#include <uavcan/internal/transport/can_io.hpp>
+#include <uavcan/transport/frame.hpp>
+#include <uavcan/transport/can_io.hpp>
 
 namespace uavcan
 {

libuavcan/src/transport/transfer.cpp

@@ -5,8 +5,8 @@
 #include <cassert>
 #include <cstdio>
 #include <sstream>
-#include <uavcan/internal/transport/frame.hpp>
-#include <uavcan/internal/transport/can_io.hpp>
+#include <uavcan/transport/frame.hpp>
+#include <uavcan/transport/can_io.hpp>
 
 namespace uavcan
 {

libuavcan/src/transport/transfer_buffer.cpp

@@ -6,7 +6,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <string>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 namespace uavcan
 {

libuavcan/src/transport/transfer_listener.cpp

@@ -4,8 +4,8 @@
 
 #include <cstdlib>
 #include <cassert>
-#include <uavcan/internal/transport/transfer_listener.hpp>
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/transport/transfer_listener.hpp>
+#include <uavcan/debug.hpp>
 
 namespace uavcan
 {

libuavcan/src/transport/transfer_receiver.cpp

@@ -6,9 +6,9 @@
 #include <cstdio>
 #include <cassert>
 #include <algorithm>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/transfer_receiver.hpp>
-#include <uavcan/internal/transport/crc.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/transfer_receiver.hpp>
+#include <uavcan/transport/crc.hpp>
 
 namespace uavcan
 {

libuavcan/src/transport/transfer_sender.cpp

@@ -3,8 +3,8 @@
  */
 
 #include <cassert>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/transfer_sender.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/transfer_sender.hpp>
 
 
 namespace uavcan

libuavcan/test/dsdl_test/dsdl_test.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 #include <root_ns_a/EmptyService.hpp>
 #include <root_ns_a/EmptyMessage.hpp>
 #include <root_ns_a/NestedMessage.hpp>

libuavcan/test/dynamic_memory.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/dynamic_memory.hpp>
+#include <uavcan/dynamic_memory.hpp>
 
 TEST(DynamicMemory, Basic)
 {

libuavcan/test/linked_list.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/linked_list.hpp>
+#include <uavcan/linked_list.hpp>
 
 struct ListItem : uavcan::LinkedListNode<ListItem>
 {

libuavcan/test/map.cpp

@@ -6,7 +6,7 @@
 #include <cstdio>
 #include <memory>
 #include <gtest/gtest.h>
-#include <uavcan/internal/map.hpp>
+#include <uavcan/map.hpp>
 
 
 static std::string toString(long x)

libuavcan/test/marshal/array.cpp

@@ -3,8 +3,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshal/types.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/marshal/types.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 using uavcan::Array;
 using uavcan::ArrayModeDynamic;

libuavcan/test/marshal/bit_stream.cpp

@@ -3,8 +3,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshal/bit_stream.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/marshal/bit_stream.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 
 TEST(BitStream, ToString)

libuavcan/test/marshal/float_spec.cpp

@@ -3,8 +3,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshal/types.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/marshal/types.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 
 TEST(FloatSpec, Limits)

libuavcan/test/marshal/integer_spec.cpp

@@ -3,8 +3,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshal/types.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/marshal/types.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 
 TEST(IntegerSpec, Limits)

libuavcan/test/marshal/scalar_codec.cpp

@@ -3,8 +3,8 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshal/scalar_codec.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/marshal/scalar_codec.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 
 TEST(ScalarCodec, Basic)

libuavcan/test/marshal/type_util.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshal/types.hpp>
+#include <uavcan/marshal/types.hpp>
 
 
 TEST(MarshalTypeUtil, IntegerBitLen)

libuavcan/test/node/global_data_type_registry.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/global_data_type_registry.hpp>
+#include <uavcan/node/global_data_type_registry.hpp>
 
 namespace
 {

libuavcan/test/node/publisher.cpp

@@ -3,10 +3,10 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/publisher.hpp>
+#include <uavcan/node/publisher.hpp>
 #include <uavcan/mavlink/Message.hpp>
-#include "clock.hpp"
-#include "internal/transport/can/can.hpp"
+#include "../clock.hpp"
+#include "../transport/can/can.hpp"
 
 
 TEST(Publisher, Basic)

libuavcan/test/node/scheduler.cpp

@@ -3,9 +3,9 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/timer.hpp>
+#include <uavcan/node/timer.hpp>
 #include <uavcan/util/method_binder.hpp>
-#include "../../clock.hpp"
+#include "../clock.hpp"
 #include "../transport/can/can.hpp"
 
 struct TimerCallCounter

libuavcan/test/node/service_client.cpp

@@ -3,15 +3,15 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/service_client.hpp>
-#include <uavcan/service_server.hpp>
+#include <uavcan/node/service_client.hpp>
+#include <uavcan/node/service_server.hpp>
 #include <uavcan/util/method_binder.hpp>
 #include <uavcan/protocol/ComputeAggregateTypeSignature.hpp>
 #include <uavcan/protocol/GetDataTypeInfo.hpp>
 #include <root_ns_a/StringService.hpp>
 #include <queue>
-#include "clock.hpp"
-#include "internal/transport/can/can.hpp"
+#include "../clock.hpp"
+#include "../transport/can/can.hpp"
 
 
 template <typename DataType>

libuavcan/test/node/service_server.cpp

@@ -3,11 +3,11 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/service_server.hpp>
+#include <uavcan/node/service_server.hpp>
 #include <uavcan/util/method_binder.hpp>
 #include <root_ns_a/StringService.hpp>
-#include "clock.hpp"
-#include "internal/transport/can/can.hpp"
+#include "../clock.hpp"
+#include "../transport/can/can.hpp"
 
 
 struct ServerImpl

libuavcan/test/node/subscriber.cpp

@@ -3,12 +3,12 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/subscriber.hpp>
+#include <uavcan/node/subscriber.hpp>
 #include <uavcan/util/method_binder.hpp>
 #include <uavcan/mavlink/Message.hpp>
 #include <root_ns_a/EmptyMessage.hpp>
-#include "clock.hpp"
-#include "internal/transport/can/can.hpp"
+#include "../clock.hpp"
+#include "../transport/can/can.hpp"
 
 
 template <typename DataType>

libuavcan/test/transport/can/can.hpp

@@ -8,11 +8,11 @@
 #include <queue>
 #include <vector>
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/can_io.hpp>
-#include <uavcan/internal/transport/frame.hpp>
+#include <uavcan/transport/can_io.hpp>
+#include <uavcan/transport/frame.hpp>
 #include <uavcan/can_driver.hpp>
 #include <uavcan/system_clock.hpp>
-#include "../../../clock.hpp"
+#include "../../clock.hpp"
 
 
 class CanIfaceMock : public uavcan::ICanIface

libuavcan/test/transport/can/tx_queue.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/can_io.hpp>
+#include <uavcan/transport/can_io.hpp>
 #include "can.hpp"
 
 

libuavcan/test/transport/crc.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/crc.hpp>
+#include <uavcan/transport/crc.hpp>
 
 /*
  import crcmod

libuavcan/test/transport/dispatcher.cpp

@@ -6,7 +6,7 @@
 #include <gtest/gtest.h>
 #include "transfer_test_helpers.hpp"
 #include "can/can.hpp"
-#include <uavcan/internal/transport/dispatcher.hpp>
+#include <uavcan/transport/dispatcher.hpp>
 
 
 class DispatcherTransferEmulator : public IncomingTransferEmulatorBase

libuavcan/test/transport/frame.cpp

@@ -4,8 +4,8 @@
 
 #include <string>
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/transfer.hpp>
-#include "../../clock.hpp"
+#include <uavcan/transport/transfer.hpp>
+#include "../clock.hpp"
 #include "can/can.hpp"
 
 

libuavcan/test/transport/incoming_transfer.cpp

@@ -4,8 +4,8 @@
 
 #include <algorithm>
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/transfer_listener.hpp>
-#include "../../clock.hpp"
+#include <uavcan/transport/transfer_listener.hpp>
+#include "../clock.hpp"
 
 
 static uavcan::RxFrame makeFrame()

libuavcan/test/transport/outgoing_transfer_registry.cpp

@@ -4,8 +4,8 @@
 
 #include <algorithm>
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/outgoing_transfer_registry.hpp>
-#include "../../clock.hpp"
+#include <uavcan/transport/outgoing_transfer_registry.hpp>
+#include "../clock.hpp"
 
 
 TEST(OutgoingTransferRegistry, Basic)

libuavcan/test/transport/transfer.cpp

@@ -4,7 +4,7 @@
 
 #include <string>
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/transfer.hpp>
+#include <uavcan/transport/transfer.hpp>
 
 
 TEST(Transfer, TransferID)

libuavcan/test/transport/transfer_buffer.cpp

@@ -5,7 +5,7 @@
 #include <algorithm>
 #include <gtest/gtest.h>
 #include <memory>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 static const std::string TEST_DATA =
     "It was like this: I asked myself one day this question - what if Napoleon, for instance, had happened to be in my "

libuavcan/test/transport/transfer_listener.cpp

@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "transfer_test_helpers.hpp"
-#include "../../clock.hpp"
+#include "../clock.hpp"
 
 
 class TransferListenerEmulator : public IncomingTransferEmulatorBase

libuavcan/test/transport/transfer_receiver.cpp

@@ -4,8 +4,8 @@
 
 #include <algorithm>
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/transfer_receiver.hpp>
-#include "../../clock.hpp"
+#include <uavcan/transport/transfer_receiver.hpp>
+#include "../clock.hpp"
 
 /*
  * Beware!

libuavcan/test/transport/transfer_sender.cpp

@@ -6,7 +6,7 @@
 #include <gtest/gtest.h>
 #include "transfer_test_helpers.hpp"
 #include "can/can.hpp"
-#include <uavcan/internal/transport/transfer_sender.hpp>
+#include <uavcan/transport/transfer_sender.hpp>
 
 
 static int sendOne(uavcan::TransferSender& sender, const std::string& data,

libuavcan/test/transport/transfer_test_helpers.cpp

@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include "transfer_test_helpers.hpp"
-#include "../../clock.hpp"
+#include "../clock.hpp"
 
 
 TEST(TransferTestHelpers, Transfer)

libuavcan/test/transport/transfer_test_helpers.hpp

@@ -8,7 +8,7 @@
 #include <queue>
 #include <vector>
 #include <gtest/gtest.h>
-#include <uavcan/internal/transport/transfer_listener.hpp>
+#include <uavcan/transport/transfer_listener.hpp>
 
 /**
  * UAVCAN transfer representation used in various tests.