From 5802a362f83bba3959a260ea9e00e4c65cf9508f Mon Sep 17 00:00:00 2001
From: Lane Kolbly <lane.kolbly@ni.com>
Date: Tue, 7 Apr 2020 15:19:32 -0500
Subject: uhd: Replace include guards with pragma once

Pragma once is the more modern version of include guards, eliminating
any potential problems with mistyping include guards. Let's use those.
---
 host/lib/include/uhdlib/rfnoc/async_msg.hpp            | 4 +---
 host/lib/include/uhdlib/rfnoc/block_container.hpp      | 5 +----
 host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp   | 5 +----
 host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp      | 5 +----
 host/lib/include/uhdlib/rfnoc/chdr_packet.hpp          | 5 +----
 host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp   | 5 +----
 host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp   | 5 +----
 host/lib/include/uhdlib/rfnoc/chdr_types.hpp           | 5 +----
 host/lib/include/uhdlib/rfnoc/client_zero.hpp          | 5 +----
 host/lib/include/uhdlib/rfnoc/clock_iface.hpp          | 5 +----
 host/lib/include/uhdlib/rfnoc/ctrlport_endpoint.hpp    | 5 +----
 host/lib/include/uhdlib/rfnoc/device_id.hpp            | 5 +----
 host/lib/include/uhdlib/rfnoc/epid_allocator.hpp       | 5 +----
 host/lib/include/uhdlib/rfnoc/factory.hpp              | 5 +----
 host/lib/include/uhdlib/rfnoc/graph.hpp                | 5 +----
 host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp | 5 +----
 host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp  | 5 +----
 host/lib/include/uhdlib/rfnoc/mb_iface.hpp             | 5 +----
 host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp          | 5 +----
 host/lib/include/uhdlib/rfnoc/node_accessor.hpp        | 5 +----
 host/lib/include/uhdlib/rfnoc/prop_accessor.hpp        | 5 +----
 host/lib/include/uhdlib/rfnoc/reg_iface_adapter.hpp    | 5 +----
 host/lib/include/uhdlib/rfnoc/resolve_context.hpp      | 5 +----
 host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp         | 5 +----
 host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp         | 5 +----
 host/lib/include/uhdlib/rfnoc/rfnoc_rx_streamer.hpp    | 5 +----
 host/lib/include/uhdlib/rfnoc/rfnoc_tx_streamer.hpp    | 5 +----
 host/lib/include/uhdlib/rfnoc/rpc_block_ctrl.hpp       | 5 +----
 host/lib/include/uhdlib/rfnoc/rx_flow_ctrl_state.hpp   | 5 +----
 host/lib/include/uhdlib/rfnoc/tx_async_msg_queue.hpp   | 5 +----
 host/lib/include/uhdlib/rfnoc/tx_flow_ctrl_state.hpp   | 5 +----
 31 files changed, 31 insertions(+), 123 deletions(-)

(limited to 'host/lib/include/uhdlib/rfnoc')

diff --git a/host/lib/include/uhdlib/rfnoc/async_msg.hpp b/host/lib/include/uhdlib/rfnoc/async_msg.hpp
index 988801dc3..88c2aa683 100644
--- a/host/lib/include/uhdlib/rfnoc/async_msg.hpp
+++ b/host/lib/include/uhdlib/rfnoc/async_msg.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_UHD_RFNOC_ASYNC_MSG_HPP
-#define INCLUDED_UHD_RFNOC_ASYNC_MSG_HPP
+#pragma once
 
 #include <uhd/config.hpp>
 #include <uhd/types/sid.hpp>
@@ -84,4 +83,3 @@ struct async_msg_t
 };
 
 }} // namespace uhd::rfnoc
-#endif /* INCLUDED_UHD_RFNOC_ASYNC_MSG_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/block_container.hpp b/host/lib/include/uhdlib/rfnoc/block_container.hpp
index 800902d06..e84eea690 100644
--- a/host/lib/include/uhdlib/rfnoc/block_container.hpp
+++ b/host/lib/include/uhdlib/rfnoc/block_container.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_BLOCK_CONTAINER_HPP
-#define INCLUDED_LIBUHD_BLOCK_CONTAINER_HPP
+#pragma once
 
 #include <uhd/rfnoc/block_id.hpp>
 #include <uhd/rfnoc/noc_block_base.hpp>
@@ -62,5 +61,3 @@ private:
 };
 
 }}} /* namespace uhd::rfnoc::detail */
-
-#endif /* INCLUDED_LIBUHD_BLOCK_CONTAINER_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp
index 1281cc0ea..6f56fd956 100644
--- a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp
+++ b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_endpoint.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_CHDR_CTRL_ENDPOINT_HPP
-#define INCLUDED_LIBUHD_RFNOC_CHDR_CTRL_ENDPOINT_HPP
+#pragma once
 
 #include <uhdlib/rfnoc/chdr_ctrl_xport.hpp>
 #include <uhdlib/rfnoc/chdr_packet.hpp>
@@ -58,5 +57,3 @@ public:
 }; // class chdr_ctrl_endpoint
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_RFNOC_CHDR_CTRL_ENDPOINT_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp
index d32ab7222..bf3e03a6b 100644
--- a/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp
+++ b/host/lib/include/uhdlib/rfnoc/chdr_ctrl_xport.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_RFNOC_CHDR_CTRL_XPORT_HPP
-#define INCLUDED_RFNOC_CHDR_CTRL_XPORT_HPP
+#pragma once
 
 #include <uhdlib/rfnoc/chdr_packet.hpp>
 #include <uhdlib/rfnoc/chdr_types.hpp>
@@ -158,5 +157,3 @@ private:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_UHDLIB_RFNOC_CHDR_CTRL_XPORT_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/chdr_packet.hpp b/host/lib/include/uhdlib/rfnoc/chdr_packet.hpp
index 355c15da2..d56f94d0f 100644
--- a/host/lib/include/uhdlib/rfnoc/chdr_packet.hpp
+++ b/host/lib/include/uhdlib/rfnoc/chdr_packet.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_RFNOC_CHDR_PACKET_HPP
-#define INCLUDED_RFNOC_CHDR_PACKET_HPP
+#pragma once
 
 #include <uhd/types/endianness.hpp>
 #include <uhd/utils/byteswap.hpp>
@@ -319,5 +318,3 @@ private:
 };
 
 }}} // namespace uhd::rfnoc::chdr
-
-#endif /* INCLUDED_RFNOC_CHDR_PACKET_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp b/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp
index dab308279..caa94bde3 100644
--- a/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp
+++ b/host/lib/include/uhdlib/rfnoc/chdr_rx_data_xport.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_CHDR_RX_DATA_XPORT_HPP
-#define INCLUDED_LIBUHD_CHDR_RX_DATA_XPORT_HPP
+#pragma once
 
 #include <uhd/config.hpp>
 #include <uhd/exception.hpp>
@@ -408,5 +407,3 @@ private:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_LIBUHD_CHDR_RX_DATA_XPORT_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp b/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp
index 47293f44a..777066c0a 100644
--- a/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp
+++ b/host/lib/include/uhdlib/rfnoc/chdr_tx_data_xport.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_CHDR_TX_DATA_XPORT_HPP
-#define INCLUDED_LIBUHD_CHDR_TX_DATA_XPORT_HPP
+#pragma once
 
 #include <uhd/exception.hpp>
 #include <uhd/types/metadata.hpp>
@@ -401,5 +400,3 @@ private:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_LIBUHD_CHDR_TX_DATA_XPORT_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/chdr_types.hpp b/host/lib/include/uhdlib/rfnoc/chdr_types.hpp
index 25a7c8905..6e650507f 100644
--- a/host/lib/include/uhdlib/rfnoc/chdr_types.hpp
+++ b/host/lib/include/uhdlib/rfnoc/chdr_types.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_RFNOC_CHDR_TYPES_HPP
-#define INCLUDED_RFNOC_CHDR_TYPES_HPP
+#pragma once
 
 #include <uhd/types/endianness.hpp>
 #include <uhd/utils/byteswap.hpp>
@@ -823,5 +822,3 @@ private:
 };
 
 }}} // namespace uhd::rfnoc::chdr
-
-#endif /* INCLUDED_RFNOC_CHDR_TYPES_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/client_zero.hpp b/host/lib/include/uhdlib/rfnoc/client_zero.hpp
index f022c2dfa..682f222c8 100644
--- a/host/lib/include/uhdlib/rfnoc/client_zero.hpp
+++ b/host/lib/include/uhdlib/rfnoc/client_zero.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_CLIENT_ZERO_HPP
-#define INCLUDED_LIBUHD_CLIENT_ZERO_HPP
+#pragma once
 
 #include <uhd/rfnoc/register_iface_holder.hpp>
 #include <uhdlib/rfnoc/chdr_ctrl_endpoint.hpp>
@@ -221,5 +220,3 @@ private:
 };
 
 }}} /* namespace uhd::rfnoc::detail */
-
-#endif /* INCLUDED_LIBUHD_CLIENT_ZERO_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/clock_iface.hpp b/host/lib/include/uhdlib/rfnoc/clock_iface.hpp
index 1a9f18bd5..344968ee4 100644
--- a/host/lib/include/uhdlib/rfnoc/clock_iface.hpp
+++ b/host/lib/include/uhdlib/rfnoc/clock_iface.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_UHD_RFNOC_CLOCK_IFACE_HPP
-#define INCLUDED_UHD_RFNOC_CLOCK_IFACE_HPP
+#pragma once
 
 #include <uhd/config.hpp>
 #include <uhd/exception.hpp>
@@ -83,5 +82,3 @@ private:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_UHD_RFNOC_CLOCK_IFACE_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/ctrlport_endpoint.hpp b/host/lib/include/uhdlib/rfnoc/ctrlport_endpoint.hpp
index 11c456775..bf81ededd 100644
--- a/host/lib/include/uhdlib/rfnoc/ctrlport_endpoint.hpp
+++ b/host/lib/include/uhdlib/rfnoc/ctrlport_endpoint.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_CTRLPORT_ENDPOINT_HPP
-#define INCLUDED_LIBUHD_RFNOC_CTRLPORT_ENDPOINT_HPP
+#pragma once
 
 #include <uhd/rfnoc/register_iface.hpp>
 #include <uhdlib/rfnoc/chdr_types.hpp>
@@ -58,5 +57,3 @@ public:
 }; // class ctrlport_endpoint
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_RFNOC_CTRLPORT_ENDPOINT_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/device_id.hpp b/host/lib/include/uhdlib/rfnoc/device_id.hpp
index c86dd04df..0e861cef4 100644
--- a/host/lib/include/uhdlib/rfnoc/device_id.hpp
+++ b/host/lib/include/uhdlib/rfnoc/device_id.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_DEVICE_ID_HPP
-#define INCLUDED_LIBUHD_DEVICE_ID_HPP
+#pragma once
 
 #include <uhdlib/rfnoc/rfnoc_common.hpp>
 
@@ -17,5 +16,3 @@ namespace uhd { namespace rfnoc {
 device_id_t allocate_device_id();
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_DEVICE_ID_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/epid_allocator.hpp b/host/lib/include/uhdlib/rfnoc/epid_allocator.hpp
index 482cb1dac..40d761548 100644
--- a/host/lib/include/uhdlib/rfnoc/epid_allocator.hpp
+++ b/host/lib/include/uhdlib/rfnoc/epid_allocator.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_EPID_ALLOCATOR_HPP
-#define INCLUDED_LIBUHD_EPID_ALLOCATOR_HPP
+#pragma once
 
 #include <uhdlib/rfnoc/mgmt_portal.hpp>
 #include <uhdlib/rfnoc/rfnoc_common.hpp>
@@ -74,5 +73,3 @@ private:
 };
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_EPID_ALLOCATOR_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/factory.hpp b/host/lib/include/uhdlib/rfnoc/factory.hpp
index 2bd1feb09..f0eb9db97 100644
--- a/host/lib/include/uhdlib/rfnoc/factory.hpp
+++ b/host/lib/include/uhdlib/rfnoc/factory.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_FACTORY_HPP
-#define INCLUDED_LIBUHD_RFNOC_FACTORY_HPP
+#pragma once
 
 #include <uhd/rfnoc/defaults.hpp>
 #include <uhd/rfnoc/noc_block_base.hpp>
@@ -37,5 +36,3 @@ public:
 };
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_RFNOC_FACTORY_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/graph.hpp b/host/lib/include/uhdlib/rfnoc/graph.hpp
index e54c2fe7e..a3f6d4e28 100644
--- a/host/lib/include/uhdlib/rfnoc/graph.hpp
+++ b/host/lib/include/uhdlib/rfnoc/graph.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_GRAPH_HPP
-#define INCLUDED_LIBUHD_GRAPH_HPP
+#pragma once
 
 #include <uhd/rfnoc/actions.hpp>
 #include <uhd/rfnoc/graph_edge.hpp>
@@ -293,5 +292,3 @@ private:
 
 
 }}} /* namespace uhd::rfnoc::detail */
-
-#endif /* INCLUDED_LIBUHD_GRAPH_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp b/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp
index b9f4205ab..3e1cdeee5 100644
--- a/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp
+++ b/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_GRAPH_STREAM_MANAGER_HPP
-#define INCLUDED_LIBUHD_RFNOC_GRAPH_STREAM_MANAGER_HPP
+#pragma once
 
 #include <uhd/stream.hpp>
 #include <uhd/transport/adapter_id.hpp>
@@ -167,5 +166,3 @@ public:
 }; // class graph_stream_manager
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_RFNOC_GRAPH_STREAM_MANAGER_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp b/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp
index 836a50dcf..4357a2d58 100644
--- a/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp
+++ b/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_LINK_STREAM_MANAGER_HPP
-#define INCLUDED_LIBUHD_RFNOC_LINK_STREAM_MANAGER_HPP
+#pragma once
 
 #include <uhd/transport/adapter_id.hpp>
 #include <uhdlib/rfnoc/chdr_rx_data_xport.hpp>
@@ -160,5 +159,3 @@ public:
 }; // class link_stream_manager
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_RFNOC_LINK_STREAM_MANAGER_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp
index 53f0897f9..40bbc7ee4 100644
--- a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp
+++ b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_MB_IFACE_HPP
-#define INCLUDED_LIBUHD_MB_IFACE_HPP
+#pragma once
 
 #include <uhd/exception.hpp>
 #include <uhd/transport/adapter_id.hpp>
@@ -169,5 +168,3 @@ private:
 };
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_MB_IFACE_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp b/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp
index ecb90e4e9..806c9d1ea 100644
--- a/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp
+++ b/host/lib/include/uhdlib/rfnoc/mgmt_portal.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_MGMT_PORTAL_HPP
-#define INCLUDED_LIBUHD_MGMT_PORTAL_HPP
+#pragma once
 
 #include <uhdlib/rfnoc/chdr_ctrl_xport.hpp>
 #include <uhdlib/rfnoc/chdr_packet.hpp>
@@ -206,5 +205,3 @@ public:
 };
 
 }}} // namespace uhd::rfnoc::mgmt
-
-#endif /* INCLUDED_LIBUHD_MGMT_PORTAL_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/node_accessor.hpp b/host/lib/include/uhdlib/rfnoc/node_accessor.hpp
index bd4af96f4..4c63d29e2 100644
--- a/host/lib/include/uhdlib/rfnoc/node_accessor.hpp
+++ b/host/lib/include/uhdlib/rfnoc/node_accessor.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_NODE_ACCESSOR_HPP
-#define INCLUDED_LIBUHD_NODE_ACCESSOR_HPP
+#pragma once
 
 #include <uhd/rfnoc/actions.hpp>
 #include <uhd/rfnoc/node.hpp>
@@ -132,5 +131,3 @@ public:
 
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_NODE_ACCESSOR_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/prop_accessor.hpp b/host/lib/include/uhdlib/rfnoc/prop_accessor.hpp
index 2f39cbbec..6725e82b8 100644
--- a/host/lib/include/uhdlib/rfnoc/prop_accessor.hpp
+++ b/host/lib/include/uhdlib/rfnoc/prop_accessor.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_PROP_ACCESSOR_HPP
-#define INCLUDED_LIBUHD_PROP_ACCESSOR_HPP
+#pragma once
 
 #include <uhd/rfnoc/property.hpp>
 #include <uhd/utils/scope_exit.hpp>
@@ -92,5 +91,3 @@ public:
 
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_PROP_ACCESSOR_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/reg_iface_adapter.hpp b/host/lib/include/uhdlib/rfnoc/reg_iface_adapter.hpp
index f0eb78be4..5e5d06288 100644
--- a/host/lib/include/uhdlib/rfnoc/reg_iface_adapter.hpp
+++ b/host/lib/include/uhdlib/rfnoc/reg_iface_adapter.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_REG2WBIF_ADAPTER_HPP
-#define INCLUDED_LIBUHD_RFNOC_REG2WBIF_ADAPTER_HPP
+#pragma once
 
 #include <uhd/config.hpp>
 #include <uhd/rfnoc/register_iface.hpp>
@@ -116,5 +115,3 @@ private:
 
 
 }} /* namespace uhd::rfnoc */
-
-#endif /* INCLUDED_LIBUHD_RFNOC_REG2WBIF_ADAPTER_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/resolve_context.hpp b/host/lib/include/uhdlib/rfnoc/resolve_context.hpp
index 29a2e5f6f..f3189d07c 100644
--- a/host/lib/include/uhdlib/rfnoc/resolve_context.hpp
+++ b/host/lib/include/uhdlib/rfnoc/resolve_context.hpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_UHD_RFNOC_RESOLVE_CONTEXT_HPP
-#define INCLUDED_UHD_RFNOC_RESOLVE_CONTEXT_HPP
+#pragma once
 
 namespace uhd { namespace rfnoc {
 
@@ -22,5 +21,3 @@ enum class resolve_context {
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_UHD_RFNOC_RESOLVE_CONTEXT_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp
index 226d4f069..9c4944fe2 100644
--- a/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp
+++ b/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_RFNOC_RFNOC_COMMON_HPP
-#define INCLUDED_RFNOC_RFNOC_COMMON_HPP
+#pragma once
 
 #include <uhd/rfnoc/defaults.hpp>
 #include <uhdlib/transport/link_if.hpp>
@@ -101,5 +100,3 @@ constexpr uint32_t MAX_FC_HEADROOM_PKTS  = (uint32_t(1) << 8) - 1;
 constexpr size_t MIN_NUM_FRAMES = 2;
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_RFNOC_RFNOC_COMMON_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp
index a223e17c9..4b2479ae5 100644
--- a/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp
+++ b/host/lib/include/uhdlib/rfnoc/rfnoc_device.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_DEVICE_HPP
-#define INCLUDED_LIBUHD_RFNOC_DEVICE_HPP
+#pragma once
 
 #include <uhd/device.hpp>
 #include <uhd/exception.hpp>
@@ -69,5 +68,3 @@ private:
 }; // class rfnoc_device
 
 }}} // namespace uhd::rfnoc::detail
-
-#endif /* INCLUDED_LIBUHD_RFNOC_DEVICE_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_rx_streamer.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_rx_streamer.hpp
index 1afe5db80..8ce3725a7 100644
--- a/host/lib/include/uhdlib/rfnoc/rfnoc_rx_streamer.hpp
+++ b/host/lib/include/uhdlib/rfnoc/rfnoc_rx_streamer.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_RX_STREAMER_HPP
-#define INCLUDED_LIBUHD_RFNOC_RX_STREAMER_HPP
+#pragma once
 
 #include <uhd/rfnoc/node.hpp>
 #include <uhdlib/rfnoc/chdr_rx_data_xport.hpp>
@@ -113,5 +112,3 @@ private:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_LIBUHD_RFNOC_RX_STREAMER_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_tx_streamer.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_tx_streamer.hpp
index 3e006f7f9..ce989420c 100644
--- a/host/lib/include/uhdlib/rfnoc/rfnoc_tx_streamer.hpp
+++ b/host/lib/include/uhdlib/rfnoc/rfnoc_tx_streamer.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_TX_STREAMER_HPP
-#define INCLUDED_LIBUHD_RFNOC_TX_STREAMER_HPP
+#pragma once
 
 #include <uhd/rfnoc/node.hpp>
 #include <uhdlib/rfnoc/chdr_tx_data_xport.hpp>
@@ -113,5 +112,3 @@ private:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_LIBUHD_RFNOC_TX_STREAMER_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/rpc_block_ctrl.hpp b/host/lib/include/uhdlib/rfnoc/rpc_block_ctrl.hpp
index 5125aef84..c9e5d6bc9 100644
--- a/host/lib/include/uhdlib/rfnoc/rpc_block_ctrl.hpp
+++ b/host/lib/include/uhdlib/rfnoc/rpc_block_ctrl.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_RPC_BLOCK_CTRL_HPP
-#define INCLUDED_LIBUHD_RFNOC_RPC_BLOCK_CTRL_HPP
+#pragma once
 
 #include <uhd/types/device_addr.hpp>
 #include <uhdlib/utils/rpc.hpp>
@@ -33,5 +32,3 @@ public:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_LIBUHD_RFNOC_RPC_BLOCK_CTRL_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/rx_flow_ctrl_state.hpp b/host/lib/include/uhdlib/rfnoc/rx_flow_ctrl_state.hpp
index b8bb411d4..618715449 100644
--- a/host/lib/include/uhdlib/rfnoc/rx_flow_ctrl_state.hpp
+++ b/host/lib/include/uhdlib/rfnoc/rx_flow_ctrl_state.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_RX_FLOW_CTRL_STATE_HPP
-#define INCLUDED_LIBUHD_RFNOC_RX_FLOW_CTRL_STATE_HPP
+#pragma once
 
 #include <uhd/utils/log.hpp>
 #include <uhdlib/rfnoc/rfnoc_common.hpp>
@@ -117,5 +116,3 @@ private:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_LIBUHD_RFNOC_RX_FLOW_CTRL_STATE_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/tx_async_msg_queue.hpp b/host/lib/include/uhdlib/rfnoc/tx_async_msg_queue.hpp
index 181a31754..228f4cf1e 100644
--- a/host/lib/include/uhdlib/rfnoc/tx_async_msg_queue.hpp
+++ b/host/lib/include/uhdlib/rfnoc/tx_async_msg_queue.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_TX_ASYNC_MSG_QUEUE_HPP
-#define INCLUDED_LIBUHD_TX_ASYNC_MSG_QUEUE_HPP
+#pragma once
 
 #include <uhd/types/metadata.hpp>
 #include <boost/lockfree/queue.hpp>
@@ -45,5 +44,3 @@ private:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_LIBUHD_TX_ASYNC_MSG_QUEUE_HPP */
diff --git a/host/lib/include/uhdlib/rfnoc/tx_flow_ctrl_state.hpp b/host/lib/include/uhdlib/rfnoc/tx_flow_ctrl_state.hpp
index 0005e7584..af6cd28e1 100644
--- a/host/lib/include/uhdlib/rfnoc/tx_flow_ctrl_state.hpp
+++ b/host/lib/include/uhdlib/rfnoc/tx_flow_ctrl_state.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_RFNOC_TX_FLOW_CTRL_STATE_HPP
-#define INCLUDED_LIBUHD_RFNOC_TX_FLOW_CTRL_STATE_HPP
+#pragma once
 
 #include <uhdlib/rfnoc/rfnoc_common.hpp>
 
@@ -92,5 +91,3 @@ private:
 };
 
 }} // namespace uhd::rfnoc
-
-#endif /* INCLUDED_LIBUHD_RFNOC_TX_FLOW_CTRL_STATE_HPP */
-- 
cgit v1.2.3