diff --git a/libuavcan/include/uavcan/build_config.hpp b/libuavcan/include/uavcan/build_config.hpp
index 06a771c2cc..31c34ecf3f 100644
--- a/libuavcan/include/uavcan/build_config.hpp
+++ b/libuavcan/include/uavcan/build_config.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_BUILD_CONFIG_HPP_INCLUDED
+#define UAVCAN_BUILD_CONFIG_HPP_INCLUDED
 
 /**
  * UAVCAN version definition
@@ -212,3 +213,5 @@ static const unsigned FloatComparisonEpsilonMult = 10;
 #endif
 
 }
+
+#endif // UAVCAN_BUILD_CONFIG_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/data_type.hpp b/libuavcan/include/uavcan/data_type.hpp
index 4fb3daf12f..8e47751647 100644
--- a/libuavcan/include/uavcan/data_type.hpp
+++ b/libuavcan/include/uavcan/data_type.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_DATA_TYPE_HPP_INCLUDED
+#define UAVCAN_DATA_TYPE_HPP_INCLUDED
 
 #include <cassert>
 #include <cstring>
@@ -144,3 +145,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_DATA_TYPE_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/debug.hpp b/libuavcan/include/uavcan/debug.hpp
index bee2dd0ad1..8b2ca17247 100644
--- a/libuavcan/include/uavcan/debug.hpp
+++ b/libuavcan/include/uavcan/debug.hpp
@@ -3,7 +3,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_DEBUG_HPP_INCLUDED
+#define UAVCAN_DEBUG_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 
@@ -30,3 +31,5 @@ static void UAVCAN_TRACE(const char* src, const char* fmt, ...)
 # define UAVCAN_TRACE(...) ((void)0)
 
 #endif
+
+#endif // UAVCAN_DEBUG_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/driver/can.hpp b/libuavcan/include/uavcan/driver/can.hpp
index d55859d0a0..ad77abfcf7 100644
--- a/libuavcan/include/uavcan/driver/can.hpp
+++ b/libuavcan/include/uavcan/driver/can.hpp
@@ -3,7 +3,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_DRIVER_CAN_HPP_INCLUDED
+#define UAVCAN_DRIVER_CAN_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/stdint.hpp>
@@ -187,3 +188,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_DRIVER_CAN_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/driver/system_clock.hpp b/libuavcan/include/uavcan/driver/system_clock.hpp
index d19480e358..22055b457e 100644
--- a/libuavcan/include/uavcan/driver/system_clock.hpp
+++ b/libuavcan/include/uavcan/driver/system_clock.hpp
@@ -3,7 +3,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_DRIVER_SYSTEM_CLOCK_HPP_INCLUDED
+#define UAVCAN_DRIVER_SYSTEM_CLOCK_HPP_INCLUDED
 
 #include <uavcan/stdint.hpp>
 #include <uavcan/build_config.hpp>
@@ -44,3 +45,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_DRIVER_SYSTEM_CLOCK_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/dynamic_memory.hpp b/libuavcan/include/uavcan/dynamic_memory.hpp
index 3783f8ba8f..7c0ffb2038 100644
--- a/libuavcan/include/uavcan/dynamic_memory.hpp
+++ b/libuavcan/include/uavcan/dynamic_memory.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_DYNAMIC_MEMORY_HPP_INCLUDED
+#define UAVCAN_DYNAMIC_MEMORY_HPP_INCLUDED
 
 #include <cassert>
 #include <cstdlib>
@@ -297,3 +298,5 @@ unsigned PoolAllocator<PoolSize, BlockSize>::getNumFreeBlocks() const
 }
 
 }
+
+#endif // UAVCAN_DYNAMIC_MEMORY_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/error.hpp b/libuavcan/include/uavcan/error.hpp
index 13935a1fd6..1cbeafcc22 100644
--- a/libuavcan/include/uavcan/error.hpp
+++ b/libuavcan/include/uavcan/error.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_ERROR_HPP_INCLUDED
+#define UAVCAN_ERROR_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/stdint.hpp>
@@ -53,3 +54,5 @@ UAVCAN_EXPORT
 void handleFatalError(const char* msg);
 
 }
+
+#endif // UAVCAN_ERROR_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/helpers/component_status_manager.hpp b/libuavcan/include/uavcan/helpers/component_status_manager.hpp
index a71610b3ce..78d700b758 100644
--- a/libuavcan/include/uavcan/helpers/component_status_manager.hpp
+++ b/libuavcan/include/uavcan/helpers/component_status_manager.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_HELPERS_COMPONENT_STATUS_MANAGER_HPP_INCLUDED
+#define UAVCAN_HELPERS_COMPONENT_STATUS_MANAGER_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/stdint.hpp>
@@ -68,3 +69,5 @@ template <unsigned NumComponents_>
 const unsigned ComponentStatusManager<NumComponents_>::NumComponents;
 
 }
+
+#endif // UAVCAN_HELPERS_COMPONENT_STATUS_MANAGER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/helpers/ostream.hpp b/libuavcan/include/uavcan/helpers/ostream.hpp
index e75f9d22fe..5add58f4f3 100644
--- a/libuavcan/include/uavcan/helpers/ostream.hpp
+++ b/libuavcan/include/uavcan/helpers/ostream.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_HELPERS_OSTREAM_HPP_INCLUDED
+#define UAVCAN_HELPERS_OSTREAM_HPP_INCLUDED
 
 #include <uavcan/util/templates.hpp>
 #include <cstdio>
@@ -58,3 +59,5 @@ inline OStream& operator<<(OStream& s, const char* x) { std::printf("%s", x); re
 inline OStream& operator<<(OStream& s, OStream&(*manip)(OStream&)) { return manip(s); }
 
 }
+
+#endif // UAVCAN_HELPERS_OSTREAM_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/marshal/array.hpp b/libuavcan/include/uavcan/marshal/array.hpp
index 8fc64f350f..70f1c27d97 100644
--- a/libuavcan/include/uavcan/marshal/array.hpp
+++ b/libuavcan/include/uavcan/marshal/array.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_MARSHAL_ARRAY_HPP_INCLUDED
+#define UAVCAN_MARSHAL_ARRAY_HPP_INCLUDED
 
 #include <cassert>
 #include <cstdio>
@@ -1034,3 +1035,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_MARSHAL_ARRAY_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/marshal/bit_stream.hpp b/libuavcan/include/uavcan/marshal/bit_stream.hpp
index 413893e627..b7504112ec 100644
--- a/libuavcan/include/uavcan/marshal/bit_stream.hpp
+++ b/libuavcan/include/uavcan/marshal/bit_stream.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_MARSHAL_BIT_STREAM_HPP_INCLUDED
+#define UAVCAN_MARSHAL_BIT_STREAM_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/stdint.hpp>
@@ -116,3 +117,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_MARSHAL_BIT_STREAM_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/marshal/char_array_formatter.hpp b/libuavcan/include/uavcan/marshal/char_array_formatter.hpp
index 85e9d37678..244c3b1204 100644
--- a/libuavcan/include/uavcan/marshal/char_array_formatter.hpp
+++ b/libuavcan/include/uavcan/marshal/char_array_formatter.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_MARSHAL_CHAR_ARRAY_FORMATTER_HPP_INCLUDED
+#define UAVCAN_MARSHAL_CHAR_ARRAY_FORMATTER_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/marshal/array.hpp>
@@ -137,3 +138,5 @@ public:
 #endif
 
 }
+
+#endif // UAVCAN_MARSHAL_CHAR_ARRAY_FORMATTER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/marshal/float_spec.hpp b/libuavcan/include/uavcan/marshal/float_spec.hpp
index ec06e53f60..ab0063056a 100644
--- a/libuavcan/include/uavcan/marshal/float_spec.hpp
+++ b/libuavcan/include/uavcan/marshal/float_spec.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_MARSHAL_FLOAT_SPEC_HPP_INCLUDED
+#define UAVCAN_MARSHAL_FLOAT_SPEC_HPP_INCLUDED
 
 #include <cmath>
 #include <uavcan/stdint.hpp>
@@ -222,3 +223,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_MARSHAL_FLOAT_SPEC_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/marshal/integer_spec.hpp b/libuavcan/include/uavcan/marshal/integer_spec.hpp
index 8561b02155..2a74218581 100644
--- a/libuavcan/include/uavcan/marshal/integer_spec.hpp
+++ b/libuavcan/include/uavcan/marshal/integer_spec.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_MARSHAL_INTEGER_SPEC_HPP_INCLUDED
+#define UAVCAN_MARSHAL_INTEGER_SPEC_HPP_INCLUDED
 
 #include <uavcan/stdint.hpp>
 #include <uavcan/data_type.hpp>
@@ -164,3 +165,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_MARSHAL_INTEGER_SPEC_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/marshal/scalar_codec.hpp b/libuavcan/include/uavcan/marshal/scalar_codec.hpp
index 6bc62c8e80..b46c1b16bb 100644
--- a/libuavcan/include/uavcan/marshal/scalar_codec.hpp
+++ b/libuavcan/include/uavcan/marshal/scalar_codec.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_MARSHAL_SCALAR_CODEC_HPP_INCLUDED
+#define UAVCAN_MARSHAL_SCALAR_CODEC_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/stdint.hpp>
@@ -135,3 +136,5 @@ int ScalarCodec::decode(T& value)
 }
 
 }
+
+#endif // UAVCAN_MARSHAL_SCALAR_CODEC_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/marshal/type_util.hpp b/libuavcan/include/uavcan/marshal/type_util.hpp
index 45df4d03c4..5be02921e8 100644
--- a/libuavcan/include/uavcan/marshal/type_util.hpp
+++ b/libuavcan/include/uavcan/marshal/type_util.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_MARSHAL_TYPE_UTIL_HPP_INCLUDED
+#define UAVCAN_MARSHAL_TYPE_UTIL_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/util/templates.hpp>
@@ -83,3 +84,5 @@ template <typename T>
 class UAVCAN_EXPORT YamlStreamer;
 
 }
+
+#endif // UAVCAN_MARSHAL_TYPE_UTIL_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/marshal/types.hpp b/libuavcan/include/uavcan/marshal/types.hpp
index a9df753a21..4fbbe98371 100644
--- a/libuavcan/include/uavcan/marshal/types.hpp
+++ b/libuavcan/include/uavcan/marshal/types.hpp
@@ -2,9 +2,12 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_MARSHAL_TYPES_HPP_INCLUDED
+#define UAVCAN_MARSHAL_TYPES_HPP_INCLUDED
 
 #include <uavcan/marshal/integer_spec.hpp>
 #include <uavcan/marshal/float_spec.hpp>
 #include <uavcan/marshal/array.hpp>
 #include <uavcan/marshal/type_util.hpp>
+
+#endif // UAVCAN_MARSHAL_TYPES_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/abstract_node.hpp b/libuavcan/include/uavcan/node/abstract_node.hpp
index 9b93646000..cebdcec7fc 100644
--- a/libuavcan/include/uavcan/node/abstract_node.hpp
+++ b/libuavcan/include/uavcan/node/abstract_node.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_ABSTRACT_NODE_HPP_INCLUDED
+#define UAVCAN_NODE_ABSTRACT_NODE_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/node/scheduler.hpp>
@@ -78,3 +79,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_NODE_ABSTRACT_NODE_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/generic_publisher.hpp b/libuavcan/include/uavcan/node/generic_publisher.hpp
index 38bb31826f..aece082ddb 100644
--- a/libuavcan/include/uavcan/node/generic_publisher.hpp
+++ b/libuavcan/include/uavcan/node/generic_publisher.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_GENERIC_PUBLISHER_HPP_INCLUDED
+#define UAVCAN_NODE_GENERIC_PUBLISHER_HPP_INCLUDED
 
 #include <uavcan/error.hpp>
 #include <uavcan/node/abstract_node.hpp>
@@ -172,3 +173,5 @@ int GenericPublisher<DataSpec, DataStruct>::genericPublish(const DataStruct& mes
 }
 
 }
+
+#endif // UAVCAN_NODE_GENERIC_PUBLISHER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/generic_subscriber.hpp b/libuavcan/include/uavcan/node/generic_subscriber.hpp
index 0782d718bf..3ec6b87f92 100644
--- a/libuavcan/include/uavcan/node/generic_subscriber.hpp
+++ b/libuavcan/include/uavcan/node/generic_subscriber.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_GENERIC_SUBSCRIBER_HPP_INCLUDED
+#define UAVCAN_NODE_GENERIC_SUBSCRIBER_HPP_INCLUDED
 
 #include <uavcan/error.hpp>
 #include <uavcan/node/abstract_node.hpp>
@@ -287,3 +288,5 @@ genericStart(bool (Dispatcher::*registration_method)(TransferListenerBase*))
 
 
 }
+
+#endif // UAVCAN_NODE_GENERIC_SUBSCRIBER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/global_data_type_registry.hpp b/libuavcan/include/uavcan/node/global_data_type_registry.hpp
index 8ee9d39a95..f1b8cbf6dd 100644
--- a/libuavcan/include/uavcan/node/global_data_type_registry.hpp
+++ b/libuavcan/include/uavcan/node/global_data_type_registry.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_GLOBAL_DATA_TYPE_REGISTRY_HPP_INCLUDED
+#define UAVCAN_NODE_GLOBAL_DATA_TYPE_REGISTRY_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/error.hpp>
@@ -246,3 +247,5 @@ GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::regist(DataTypeID i
 }
 
 }
+
+#endif // UAVCAN_NODE_GLOBAL_DATA_TYPE_REGISTRY_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/marshal_buffer.hpp b/libuavcan/include/uavcan/node/marshal_buffer.hpp
index f33c037653..7e55ce49dc 100644
--- a/libuavcan/include/uavcan/node/marshal_buffer.hpp
+++ b/libuavcan/include/uavcan/node/marshal_buffer.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_MARSHAL_BUFFER_HPP_INCLUDED
+#define UAVCAN_NODE_MARSHAL_BUFFER_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/transport/transfer.hpp>
@@ -87,3 +88,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_NODE_MARSHAL_BUFFER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/node.hpp b/libuavcan/include/uavcan/node/node.hpp
index 7f20d714c3..c04bf1103b 100644
--- a/libuavcan/include/uavcan/node/node.hpp
+++ b/libuavcan/include/uavcan/node/node.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_NODE_HPP_INCLUDED
+#define UAVCAN_NODE_NODE_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/error.hpp>
@@ -322,3 +323,5 @@ checkNetworkCompatibility(NetworkCompatibilityCheckResult& result)
 #endif
 
 }
+
+#endif // UAVCAN_NODE_NODE_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/publisher.hpp b/libuavcan/include/uavcan/node/publisher.hpp
index 5d1524f4da..6abb3bd533 100644
--- a/libuavcan/include/uavcan/node/publisher.hpp
+++ b/libuavcan/include/uavcan/node/publisher.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_PUBLISHER_HPP_INCLUDED
+#define UAVCAN_NODE_PUBLISHER_HPP_INCLUDED
 
 #include <uavcan/node/generic_publisher.hpp>
 
@@ -95,3 +96,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_NODE_PUBLISHER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/scheduler.hpp b/libuavcan/include/uavcan/node/scheduler.hpp
index f283f72e7e..847f76b9d9 100644
--- a/libuavcan/include/uavcan/node/scheduler.hpp
+++ b/libuavcan/include/uavcan/node/scheduler.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_SCHEDULER_HPP_INCLUDED
+#define UAVCAN_NODE_SCHEDULER_HPP_INCLUDED
 
 #include <uavcan/error.hpp>
 #include <uavcan/util/linked_list.hpp>
@@ -130,3 +131,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_NODE_SCHEDULER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/service_client.hpp b/libuavcan/include/uavcan/node/service_client.hpp
index 378c0601ff..1b73c5163b 100644
--- a/libuavcan/include/uavcan/node/service_client.hpp
+++ b/libuavcan/include/uavcan/node/service_client.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_SERVICE_CLIENT_HPP_INCLUDED
+#define UAVCAN_NODE_SERVICE_CLIENT_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/node/generic_publisher.hpp>
@@ -368,3 +369,5 @@ void ServiceClient<DataType_, Callback_>::cancel()
 }
 
 }
+
+#endif // UAVCAN_NODE_SERVICE_CLIENT_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/service_server.hpp b/libuavcan/include/uavcan/node/service_server.hpp
index 5ca6f970b5..6d5695451c 100644
--- a/libuavcan/include/uavcan/node/service_server.hpp
+++ b/libuavcan/include/uavcan/node/service_server.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_SERVICE_SERVER_HPP_INCLUDED
+#define UAVCAN_NODE_SERVICE_SERVER_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/node/generic_publisher.hpp>
@@ -157,3 +158,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_NODE_SERVICE_SERVER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/subscriber.hpp b/libuavcan/include/uavcan/node/subscriber.hpp
index 62b15e11b7..1112a6abc0 100644
--- a/libuavcan/include/uavcan/node/subscriber.hpp
+++ b/libuavcan/include/uavcan/node/subscriber.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_SUBSCRIBER_HPP_INCLUDED
+#define UAVCAN_NODE_SUBSCRIBER_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/build_config.hpp>
@@ -115,3 +116,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_NODE_SUBSCRIBER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/node/timer.hpp b/libuavcan/include/uavcan/node/timer.hpp
index 3e0b360a84..1521489f99 100644
--- a/libuavcan/include/uavcan/node/timer.hpp
+++ b/libuavcan/include/uavcan/node/timer.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_NODE_TIMER_HPP_INCLUDED
+#define UAVCAN_NODE_TIMER_HPP_INCLUDED
 
 #include <uavcan/stdint.hpp>
 #include <uavcan/error.hpp>
@@ -143,3 +144,5 @@ typedef TimerEventForwarder<std::function<void (const TimerEvent& event)> > Time
 #endif
 
 }
+
+#endif // UAVCAN_NODE_TIMER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/data_type_info_provider.hpp b/libuavcan/include/uavcan/protocol/data_type_info_provider.hpp
index 799dc51ac4..9ec95c73d4 100644
--- a/libuavcan/include/uavcan/protocol/data_type_info_provider.hpp
+++ b/libuavcan/include/uavcan/protocol/data_type_info_provider.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_DATA_TYPE_INFO_PROVIDER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_DATA_TYPE_INFO_PROVIDER_HPP_INCLUDED
 
 #include <uavcan/node/service_server.hpp>
 #include <uavcan/util/method_binder.hpp>
@@ -51,3 +52,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_DATA_TYPE_INFO_PROVIDER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/global_time_sync_master.hpp b/libuavcan/include/uavcan/protocol/global_time_sync_master.hpp
index 0d477cc0e1..e658b33730 100644
--- a/libuavcan/include/uavcan/protocol/global_time_sync_master.hpp
+++ b/libuavcan/include/uavcan/protocol/global_time_sync_master.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_GLOBAL_TIME_SYNC_MASTER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_GLOBAL_TIME_SYNC_MASTER_HPP_INCLUDED
 
 #include <uavcan/node/publisher.hpp>
 #include <uavcan/node/subscriber.hpp>
@@ -92,3 +93,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_GLOBAL_TIME_SYNC_MASTER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/global_time_sync_slave.hpp b/libuavcan/include/uavcan/protocol/global_time_sync_slave.hpp
index 04c4e0f955..3da6532998 100644
--- a/libuavcan/include/uavcan/protocol/global_time_sync_slave.hpp
+++ b/libuavcan/include/uavcan/protocol/global_time_sync_slave.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_GLOBAL_TIME_SYNC_SLAVE_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_GLOBAL_TIME_SYNC_SLAVE_HPP_INCLUDED
 
 #include <uavcan/node/subscriber.hpp>
 #include <uavcan/util/method_binder.hpp>
@@ -103,3 +104,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_GLOBAL_TIME_SYNC_SLAVE_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/logger.hpp b/libuavcan/include/uavcan/protocol/logger.hpp
index 9001dcf65f..fcacfc4801 100644
--- a/libuavcan/include/uavcan/protocol/logger.hpp
+++ b/libuavcan/include/uavcan/protocol/logger.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_LOGGER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_LOGGER_HPP_INCLUDED
 
 #include <uavcan/time.hpp>
 #include <uavcan/protocol/debug/LogMessage.hpp>
@@ -235,3 +236,5 @@ int Logger::log(LogLevel level, const char* source, const char* format, Args...
 #endif
 
 }
+
+#endif // UAVCAN_PROTOCOL_LOGGER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/network_compat_checker.hpp b/libuavcan/include/uavcan/protocol/network_compat_checker.hpp
index 2a5799e3bc..5a39b5c6fc 100644
--- a/libuavcan/include/uavcan/protocol/network_compat_checker.hpp
+++ b/libuavcan/include/uavcan/protocol/network_compat_checker.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_NETWORK_COMPAT_CHECKER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_NETWORK_COMPAT_CHECKER_HPP_INCLUDED
 
 #include <uavcan/util/bitset.hpp>
 #include <uavcan/util/method_binder.hpp>
@@ -104,3 +105,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_NETWORK_COMPAT_CHECKER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/node_status_monitor.hpp b/libuavcan/include/uavcan/protocol/node_status_monitor.hpp
index 1c499014ee..0cf829a63a 100644
--- a/libuavcan/include/uavcan/protocol/node_status_monitor.hpp
+++ b/libuavcan/include/uavcan/protocol/node_status_monitor.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_NODE_STATUS_MONITOR_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_NODE_STATUS_MONITOR_HPP_INCLUDED
 
 #include <uavcan/util/method_binder.hpp>
 #include <uavcan/node/subscriber.hpp>
@@ -123,3 +124,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_NODE_STATUS_MONITOR_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/node_status_provider.hpp b/libuavcan/include/uavcan/protocol/node_status_provider.hpp
index 22f6eb2f80..524dd43c35 100644
--- a/libuavcan/include/uavcan/protocol/node_status_provider.hpp
+++ b/libuavcan/include/uavcan/protocol/node_status_provider.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_NODE_STATUS_PROVIDER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_NODE_STATUS_PROVIDER_HPP_INCLUDED
 
 #include <uavcan/node/publisher.hpp>
 #include <uavcan/node/subscriber.hpp>
@@ -110,3 +111,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_NODE_STATUS_PROVIDER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/panic_broadcaster.hpp b/libuavcan/include/uavcan/protocol/panic_broadcaster.hpp
index 0fe5b9fca4..2976933919 100644
--- a/libuavcan/include/uavcan/protocol/panic_broadcaster.hpp
+++ b/libuavcan/include/uavcan/protocol/panic_broadcaster.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_PANIC_BROADCASTER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_PANIC_BROADCASTER_HPP_INCLUDED
 
 #include <uavcan/node/publisher.hpp>
 #include <uavcan/node/timer.hpp>
@@ -47,3 +48,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_PANIC_BROADCASTER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/panic_listener.hpp b/libuavcan/include/uavcan/protocol/panic_listener.hpp
index d39f41115f..4a93252608 100644
--- a/libuavcan/include/uavcan/protocol/panic_listener.hpp
+++ b/libuavcan/include/uavcan/protocol/panic_listener.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_PANIC_LISTENER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_PANIC_LISTENER_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/debug.hpp>
@@ -123,3 +124,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_PANIC_LISTENER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/param_server.hpp b/libuavcan/include/uavcan/protocol/param_server.hpp
index ad82f4f57a..f0292198a2 100644
--- a/libuavcan/include/uavcan/protocol/param_server.hpp
+++ b/libuavcan/include/uavcan/protocol/param_server.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_PARAM_SERVER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_PARAM_SERVER_HPP_INCLUDED
 
 #include <uavcan/protocol/param/GetSet.hpp>
 #include <uavcan/protocol/param/SaveErase.hpp>
@@ -105,3 +106,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_PARAM_SERVER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/restart_request_server.hpp b/libuavcan/include/uavcan/protocol/restart_request_server.hpp
index 7964f61a77..4f9a414e13 100644
--- a/libuavcan/include/uavcan/protocol/restart_request_server.hpp
+++ b/libuavcan/include/uavcan/protocol/restart_request_server.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_RESTART_REQUEST_SERVER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_RESTART_REQUEST_SERVER_HPP_INCLUDED
 
 #include <uavcan/node/service_server.hpp>
 #include <uavcan/util/method_binder.hpp>
@@ -66,3 +67,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_RESTART_REQUEST_SERVER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/protocol/transport_stats_provider.hpp b/libuavcan/include/uavcan/protocol/transport_stats_provider.hpp
index 3687e94015..173e9c4b7c 100644
--- a/libuavcan/include/uavcan/protocol/transport_stats_provider.hpp
+++ b/libuavcan/include/uavcan/protocol/transport_stats_provider.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_PROTOCOL_TRANSPORT_STATS_PROVIDER_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_TRANSPORT_STATS_PROVIDER_HPP_INCLUDED
 
 #include <uavcan/node/service_server.hpp>
 #include <uavcan/util/method_binder.hpp>
@@ -39,3 +40,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_PROTOCOL_TRANSPORT_STATS_PROVIDER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/stdint.hpp b/libuavcan/include/uavcan/stdint.hpp
index a3340a0b77..4fc668a2a7 100644
--- a/libuavcan/include/uavcan/stdint.hpp
+++ b/libuavcan/include/uavcan/stdint.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_STDINT_HPP_INCLUDED
+#define UAVCAN_STDINT_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 
@@ -52,3 +53,5 @@ typedef ::int64_t int64_t;
 }
 
 #endif
+
+#endif // UAVCAN_STDINT_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/time.hpp b/libuavcan/include/uavcan/time.hpp
index 8158c802b9..094016fb35 100644
--- a/libuavcan/include/uavcan/time.hpp
+++ b/libuavcan/include/uavcan/time.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TIME_HPP_INCLUDED
+#define UAVCAN_TIME_HPP_INCLUDED
 
 #include <cstdio>
 #include <uavcan/stdint.hpp>
@@ -286,3 +287,5 @@ Stream& operator<<(Stream& s, const TimeBase<T, D>& t)
 }
 
 }
+
+#endif // UAVCAN_TIME_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/abstract_transfer_buffer.hpp b/libuavcan/include/uavcan/transport/abstract_transfer_buffer.hpp
index 660ae794c7..7cc703c4c2 100644
--- a/libuavcan/include/uavcan/transport/abstract_transfer_buffer.hpp
+++ b/libuavcan/include/uavcan/transport/abstract_transfer_buffer.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_ABSTRACT_TRANSFER_BUFFER_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_ABSTRACT_TRANSFER_BUFFER_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/stdint.hpp>
@@ -22,3 +23,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_TRANSPORT_ABSTRACT_TRANSFER_BUFFER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/can_io.hpp b/libuavcan/include/uavcan/transport/can_io.hpp
index 2d2e945033..cee418569d 100644
--- a/libuavcan/include/uavcan/transport/can_io.hpp
+++ b/libuavcan/include/uavcan/transport/can_io.hpp
@@ -3,7 +3,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_CAN_IO_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_CAN_IO_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/error.hpp>
@@ -179,3 +180,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_TRANSPORT_CAN_IO_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/crc.hpp b/libuavcan/include/uavcan/transport/crc.hpp
index 15b19e4e97..abee099522 100644
--- a/libuavcan/include/uavcan/transport/crc.hpp
+++ b/libuavcan/include/uavcan/transport/crc.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_CRC_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_CRC_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/stdint.hpp>
@@ -75,3 +76,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_TRANSPORT_CRC_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/dispatcher.hpp b/libuavcan/include/uavcan/transport/dispatcher.hpp
index 94e70a6ef4..a34789bf36 100644
--- a/libuavcan/include/uavcan/transport/dispatcher.hpp
+++ b/libuavcan/include/uavcan/transport/dispatcher.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_DISPATCHER_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_DISPATCHER_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/error.hpp>
@@ -192,3 +193,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_TRANSPORT_DISPATCHER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/frame.hpp b/libuavcan/include/uavcan/transport/frame.hpp
index ce8d82cff7..49d1da2214 100644
--- a/libuavcan/include/uavcan/transport/frame.hpp
+++ b/libuavcan/include/uavcan/transport/frame.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_FRAME_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_FRAME_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/transport/transfer.hpp>
@@ -128,3 +129,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_TRANSPORT_FRAME_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp b/libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp
index 72144e7647..9d91ac1955 100644
--- a/libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp
+++ b/libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_OUTGOING_TRANSFER_REGISTRY_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_OUTGOING_TRANSFER_REGISTRY_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/stdint.hpp>
@@ -174,3 +175,5 @@ void OutgoingTransferRegistry<NumStaticEntries>::cleanup(MonotonicTime ts)
 }
 
 }
+
+#endif // UAVCAN_TRANSPORT_OUTGOING_TRANSFER_REGISTRY_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/perf_counter.hpp b/libuavcan/include/uavcan/transport/perf_counter.hpp
index 2e35fdc06e..009dfeec81 100644
--- a/libuavcan/include/uavcan/transport/perf_counter.hpp
+++ b/libuavcan/include/uavcan/transport/perf_counter.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_PERF_COUNTER_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_PERF_COUNTER_HPP_INCLUDED
 
 #include <uavcan/stdint.hpp>
 #include <uavcan/build_config.hpp>
@@ -57,3 +58,5 @@ public:
 #endif
 
 }
+
+#endif // UAVCAN_TRANSPORT_PERF_COUNTER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/transfer.hpp b/libuavcan/include/uavcan/transport/transfer.hpp
index c2ca103008..d5c3f8268f 100644
--- a/libuavcan/include/uavcan/transport/transfer.hpp
+++ b/libuavcan/include/uavcan/transport/transfer.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_TRANSFER_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_TRANSFER_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/build_config.hpp>
@@ -100,3 +101,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_TRANSPORT_TRANSFER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/transfer_buffer.hpp b/libuavcan/include/uavcan/transport/transfer_buffer.hpp
index 15d337daad..d29bcce9ed 100644
--- a/libuavcan/include/uavcan/transport/transfer_buffer.hpp
+++ b/libuavcan/include/uavcan/transport/transfer_buffer.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_TRANSFER_BUFFER_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_TRANSFER_BUFFER_HPP_INCLUDED
 
 #include <uavcan/stdint.hpp>
 #include <uavcan/error.hpp>
@@ -324,3 +325,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_TRANSPORT_TRANSFER_BUFFER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/transfer_listener.hpp b/libuavcan/include/uavcan/transport/transfer_listener.hpp
index 2965415735..a8210821ce 100644
--- a/libuavcan/include/uavcan/transport/transfer_listener.hpp
+++ b/libuavcan/include/uavcan/transport/transfer_listener.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_TRANSFER_LISTENER_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_TRANSFER_LISTENER_HPP_INCLUDED
 
 #include <cassert>
 #include <uavcan/error.hpp>
@@ -246,3 +247,5 @@ void ServiceResponseTransferListener<MaxBufSize>::stopAcceptingAnything()
 }
 
 }
+
+#endif // UAVCAN_TRANSPORT_TRANSFER_LISTENER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/transfer_receiver.hpp b/libuavcan/include/uavcan/transport/transfer_receiver.hpp
index 8fbb6865bd..737c9bc2db 100644
--- a/libuavcan/include/uavcan/transport/transfer_receiver.hpp
+++ b/libuavcan/include/uavcan/transport/transfer_receiver.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_TRANSFER_RECEIVER_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_TRANSFER_RECEIVER_HPP_INCLUDED
 
 #include <cstdlib>
 #include <uavcan/build_config.hpp>
@@ -83,3 +84,5 @@ public:
 UAVCAN_PACKED_END
 
 }
+
+#endif // UAVCAN_TRANSPORT_TRANSFER_RECEIVER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/transport/transfer_sender.hpp b/libuavcan/include/uavcan/transport/transfer_sender.hpp
index 0e5ac32a3a..27ab8a1038 100644
--- a/libuavcan/include/uavcan/transport/transfer_sender.hpp
+++ b/libuavcan/include/uavcan/transport/transfer_sender.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_TRANSPORT_TRANSFER_SENDER_HPP_INCLUDED
+#define UAVCAN_TRANSPORT_TRANSFER_SENDER_HPP_INCLUDED
 
 #include <cstdlib>
 #include <cassert>
@@ -75,3 +76,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_TRANSPORT_TRANSFER_SENDER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/uavcan.hpp b/libuavcan/include/uavcan/uavcan.hpp
index cb925b139c..9a0139aeb3 100644
--- a/libuavcan/include/uavcan/uavcan.hpp
+++ b/libuavcan/include/uavcan/uavcan.hpp
@@ -4,7 +4,8 @@
  * This header should be included by the user application.
  */
 
-#pragma once
+#ifndef UAVCAN_UAVCAN_HPP_INCLUDED
+#define UAVCAN_UAVCAN_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/time.hpp>
@@ -22,3 +23,5 @@
 #include <uavcan/util/templates.hpp>
 #include <uavcan/util/lazy_constructor.hpp>
 #include <uavcan/util/method_binder.hpp>
+
+#endif // UAVCAN_UAVCAN_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/util/bitset.hpp b/libuavcan/include/uavcan/util/bitset.hpp
index 0a9c5ea43e..3ef06494bb 100644
--- a/libuavcan/include/uavcan/util/bitset.hpp
+++ b/libuavcan/include/uavcan/util/bitset.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_UTIL_BITSET_HPP_INCLUDED
+#define UAVCAN_UTIL_BITSET_HPP_INCLUDED
 
 #include <cassert>
 #include <cstddef>
@@ -184,3 +185,5 @@ Stream& operator<<(Stream& s, const BitSet<NumBits>& x)
 }
 
 }
+
+#endif // UAVCAN_UTIL_BITSET_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/util/comparison.hpp b/libuavcan/include/uavcan/util/comparison.hpp
index d53116790d..8c8f007371 100644
--- a/libuavcan/include/uavcan/util/comparison.hpp
+++ b/libuavcan/include/uavcan/util/comparison.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_UTIL_COMPARISON_HPP_INCLUDED
+#define UAVCAN_UTIL_COMPARISON_HPP_INCLUDED
 
 #include <uavcan/util/templates.hpp>
 #include <uavcan/build_config.hpp>
@@ -266,3 +267,5 @@ inline bool isCloseToZero<long double>(const long double& x)
 }
 
 }
+
+#endif // UAVCAN_UTIL_COMPARISON_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/util/lazy_constructor.hpp b/libuavcan/include/uavcan/util/lazy_constructor.hpp
index 3ca212d006..93152adc71 100644
--- a/libuavcan/include/uavcan/util/lazy_constructor.hpp
+++ b/libuavcan/include/uavcan/util/lazy_constructor.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_UTIL_LAZY_CONSTRUCTOR_HPP_INCLUDED
+#define UAVCAN_UTIL_LAZY_CONSTRUCTOR_HPP_INCLUDED
 
 #include <cstdlib>
 #include <uavcan/error.hpp>
@@ -173,3 +174,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_UTIL_LAZY_CONSTRUCTOR_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/util/linked_list.hpp b/libuavcan/include/uavcan/util/linked_list.hpp
index dcc91d61ed..9ca898e1fd 100644
--- a/libuavcan/include/uavcan/util/linked_list.hpp
+++ b/libuavcan/include/uavcan/util/linked_list.hpp
@@ -3,7 +3,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_UTIL_LINKED_LIST_HPP_INCLUDED
+#define UAVCAN_UTIL_LINKED_LIST_HPP_INCLUDED
 
 #include <cstdlib>
 #include <cassert>
@@ -170,3 +171,5 @@ void LinkedListRoot<T>::remove(const T* node)
 }
 
 }
+
+#endif // UAVCAN_UTIL_LINKED_LIST_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/util/map.hpp b/libuavcan/include/uavcan/util/map.hpp
index 1cedffb1cc..d72ca18578 100644
--- a/libuavcan/include/uavcan/util/map.hpp
+++ b/libuavcan/include/uavcan/util/map.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_UTIL_MAP_HPP_INCLUDED
+#define UAVCAN_UTIL_MAP_HPP_INCLUDED
 
 #include <cassert>
 #include <cstdlib>
@@ -500,3 +501,5 @@ unsigned MapBase<Key, Value>::getNumDynamicPairs() const
 }
 
 }
+
+#endif // UAVCAN_UTIL_MAP_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/util/method_binder.hpp b/libuavcan/include/uavcan/util/method_binder.hpp
index 23fa476f87..5cf89e07f6 100644
--- a/libuavcan/include/uavcan/util/method_binder.hpp
+++ b/libuavcan/include/uavcan/util/method_binder.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_UTIL_METHOD_BINDER_HPP_INCLUDED
+#define UAVCAN_UTIL_METHOD_BINDER_HPP_INCLUDED
 
 #include <uavcan/error.hpp>
 #include <uavcan/build_config.hpp>
@@ -79,3 +80,5 @@ public:
 };
 
 }
+
+#endif // UAVCAN_UTIL_METHOD_BINDER_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/util/placement_new.hpp b/libuavcan/include/uavcan/util/placement_new.hpp
index d05bac40c1..8c13308111 100644
--- a/libuavcan/include/uavcan/util/placement_new.hpp
+++ b/libuavcan/include/uavcan/util/placement_new.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_UTIL_PLACEMENT_NEW_HPP_INCLUDED
+#define UAVCAN_UTIL_PLACEMENT_NEW_HPP_INCLUDED
 
 #include <cstddef>
 #include <uavcan/build_config.hpp>
@@ -33,3 +34,5 @@ inline void  operator delete[](void*, void*) throw() { }
 #else
 # include <new>
 #endif
+
+#endif // UAVCAN_UTIL_PLACEMENT_NEW_HPP_INCLUDED
diff --git a/libuavcan/include/uavcan/util/templates.hpp b/libuavcan/include/uavcan/util/templates.hpp
index 8e2db29b7e..e25102790d 100644
--- a/libuavcan/include/uavcan/util/templates.hpp
+++ b/libuavcan/include/uavcan/util/templates.hpp
@@ -2,7 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#pragma once
+#ifndef UAVCAN_UTIL_TEMPLATES_HPP_INCLUDED
+#define UAVCAN_UTIL_TEMPLATES_HPP_INCLUDED
 
 #include <climits>
 #include <cstddef>
@@ -485,3 +486,5 @@ inline bool getSignBit(T arg)
 }
 
 }
+
+#endif // UAVCAN_UTIL_TEMPLATES_HPP_INCLUDED