13 files changed, 14 insertions, 53 deletions
diff --git a/host/lib/include/uhdlib/utils/atomic.hpp b/host/lib/include/uhdlib/utils/atomic.hpp
index 98b1cfa7b..33bc78fed 100644
--- a/host/lib/include/uhdlib/utils/atomic.hpp
+++ b/host/lib/include/uhdlib/utils/atomic.hpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_UHD_UTILS_ATOMIC_HPP
-#define INCLUDED_UHD_UTILS_ATOMIC_HPP
+#pragma once
 
 #include <uhd/config.hpp>
 #include <uhd/types/time_spec.hpp>
@@ -74,5 +73,3 @@ private:
 };
 
 } // namespace uhd
-
-#endif /* INCLUDED_UHD_UTILS_ATOMIC_HPP */
diff --git a/host/lib/include/uhdlib/utils/auto_timer.hpp b/host/lib/include/uhdlib/utils/auto_timer.hpp
index 5d1c88911..f57b95d36 100644
--- a/host/lib/include/uhdlib/utils/auto_timer.hpp
+++ b/host/lib/include/uhdlib/utils/auto_timer.hpp
@@ -10,8 +10,7 @@
 // It should not be used in production code.
 //
 
-#ifndef INCLUDED_UHD_UTILS_AUTO_TIMER_HPP
-#define INCLUDED_UHD_UTILS_AUTO_TIMER_HPP
+#pragma once
 
 // for now, only implemented for windows
 #ifdef UHD_PLATFORM_WIN32
@@ -131,5 +130,3 @@ private:
 #    define PROFILE_TIMING_WITH_THRESHOLD_AND_SCALE(context, threshold, unitScale)
 
 #endif
-
-#endif /* INCLUDED_UHD_UTILS_AUTO_TIMER_HPP */
diff --git a/host/lib/include/uhdlib/utils/compat_check.hpp b/host/lib/include/uhdlib/utils/compat_check.hpp
index 708c5ab16..852307fb2 100644
--- a/host/lib/include/uhdlib/utils/compat_check.hpp
+++ b/host/lib/include/uhdlib/utils/compat_check.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_UHDLIB_UTILS_COMPATCHECK_HPP
-#define INCLUDED_UHDLIB_UTILS_COMPATCHECK_HPP
+#pragma once
 
 #include <cstddef>
 #include <string>
@@ -35,5 +34,3 @@ void assert_fpga_compat(const size_t uhd_major,
     const bool fail_on_minor_behind = false);
 
 } /* namespace uhd */
-
-#endif /* INCLUDED_UHDLIB_UTILS_COMPATCHECK_HPP */
diff --git a/host/lib/include/uhdlib/utils/config_parser.hpp b/host/lib/include/uhdlib/utils/config_parser.hpp
index 13a6346e8..6d17b4154 100644
--- a/host/lib/include/uhdlib/utils/config_parser.hpp
+++ b/host/lib/include/uhdlib/utils/config_parser.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_LIBUHD_CONFIG_PARSER_HPP
-#define INCLUDED_LIBUHD_CONFIG_PARSER_HPP
+#pragma once
 
 #include <uhd/exception.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -107,5 +106,3 @@ private:
 };
 
 } /* namespace uhd */
-
-#endif /* INCLUDED_LIBUHD_CONFIG_PARSER_HPP */
diff --git a/host/lib/include/uhdlib/utils/ihex.hpp b/host/lib/include/uhdlib/utils/ihex.hpp
index 58e4d5637..687b1276c 100644
--- a/host/lib/include/uhdlib/utils/ihex.hpp
+++ b/host/lib/include/uhdlib/utils/ihex.hpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_IHEX_READER_HPP
-#define INCLUDED_IHEX_READER_HPP
+#pragma once
 
 #include <stdint.h>
 #include <functional>
@@ -64,5 +63,3 @@ private:
 };
 
 }; /* namespace uhd */
-
-#endif /* INCLUDED_IHEX_READER_HPP */
diff --git a/host/lib/include/uhdlib/utils/interpolation.hpp b/host/lib/include/uhdlib/utils/interpolation.hpp
index 10fc06559..6105dedc9 100644
--- a/host/lib/include/uhdlib/utils/interpolation.hpp
+++ b/host/lib/include/uhdlib/utils/interpolation.hpp
@@ -6,8 +6,7 @@
 
 // Various interpolation functions used within UHD
 
-#ifndef INCLUDED_UHD_UTILS_INTERP_HPP
-#define INCLUDED_UHD_UTILS_INTERP_HPP
+#pragma once
 
 #include <uhd/utils/math.hpp>
 #include <uhd/utils/interpolation.hpp>
@@ -136,5 +135,3 @@ typename map_type::mapped_type at_lin_interp(
 }
 
 }} // namespace uhd::math
-
-#endif /* INCLUDED_UHD_UTILS_INTERP_HPP */
diff --git a/host/lib/include/uhdlib/utils/isatty.hpp b/host/lib/include/uhdlib/utils/isatty.hpp
index 03ca23893..2942e2600 100644
--- a/host/lib/include/uhdlib/utils/isatty.hpp
+++ b/host/lib/include/uhdlib/utils/isatty.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_UHDLIB_UTILS_ISATTY_HPP
-#define INCLUDED_UHDLIB_UTILS_ISATTY_HPP
+#pragma once
 
 #include <uhd/config.hpp>
 #include <uhdlib/utils/narrow.hpp>
@@ -52,5 +51,3 @@ bool is_a_tty(const int fd)
 #endif
 
 } /* namespace uhd */
-
-#endif /* INCLUDED_UHDLIB_UTILS_ISATTY_HPP */
diff --git a/host/lib/include/uhdlib/utils/math.hpp b/host/lib/include/uhdlib/utils/math.hpp
index 924459ec9..9b11a3eab 100644
--- a/host/lib/include/uhdlib/utils/math.hpp
+++ b/host/lib/include/uhdlib/utils/math.hpp
@@ -6,8 +6,7 @@
 
 // More math, but not meant for public API
 
-#ifndef INCLUDED_UHDLIB_UTILS_MATH_HPP
-#define INCLUDED_UHDLIB_UTILS_MATH_HPP
+#pragma once
 
 #include <uhdlib/utils/narrow.hpp>
 #include <cmath>
@@ -97,5 +96,3 @@ std::pair<IntegerType, IntegerType> rational_approximation(
 
 
 }} /* namespace uhd::math */
-
-#endif /* INCLUDED_UHDLIB_UTILS_MATH_HPP */
diff --git a/host/lib/include/uhdlib/utils/narrow.hpp b/host/lib/include/uhdlib/utils/narrow.hpp
index daedd55db..396170e5b 100644
--- a/host/lib/include/uhdlib/utils/narrow.hpp
+++ b/host/lib/include/uhdlib/utils/narrow.hpp
@@ -41,8 +41,7 @@
 // [End of GSL license]
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef INCLUDED_UHDLIB_UTILS_NARROW_HPP
-#define INCLUDED_UHDLIB_UTILS_NARROW_HPP
+#pragma once
 
 #include <uhd/exception.hpp>
 #include <utility>
@@ -96,5 +95,3 @@ inline T narrow(U u)
 #if defined(_MSC_VER)
 #    pragma warning(pop)
 #endif // _MSC_VER
-
-#endif /* INCLUDED_UHDLIB_UTILS_NARROW_HPP */
diff --git a/host/lib/include/uhdlib/utils/paths.hpp b/host/lib/include/uhdlib/utils/paths.hpp
index cff9299d6..9475e6174 100644
--- a/host/lib/include/uhdlib/utils/paths.hpp
+++ b/host/lib/include/uhdlib/utils/paths.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0+
 //
 
-#ifndef INCLUDED_UHDLIB_UTILS_PATHS_HPP
-#define INCLUDED_UHDLIB_UTILS_PATHS_HPP
+#pragma once
 
 #include <boost/filesystem.hpp>
 #include <string>
@@ -43,5 +42,3 @@ boost::filesystem::path get_xdg_config_home();
 boost::filesystem::path get_legacy_config_home();
 
 } /* namespace uhd */
-
-#endif /* INCLUDED_UHDLIB_UTILS_PATHS_HPP */
diff --git a/host/lib/include/uhdlib/utils/prefs.hpp b/host/lib/include/uhdlib/utils/prefs.hpp
index 6d75ac7ea..0395842a1 100644
--- a/host/lib/include/uhdlib/utils/prefs.hpp
+++ b/host/lib/include/uhdlib/utils/prefs.hpp
@@ -4,8 +4,7 @@
 // SPDX-License-Identifier: GPL-3.0+
 //
 
-#ifndef INCLUDED_LIBUHD_UTILS_PREFS_HPP
-#define INCLUDED_LIBUHD_UTILS_PREFS_HPP
+#pragma once
 
 #include <uhd/types/device_addr.hpp>
 #include <uhdlib/utils/config_parser.hpp>
@@ -83,5 +82,3 @@ uhd::device_addr_t get_dpdk_args(const uhd::device_addr_t& user_args);
  */
 uhd::device_addr_t get_dpdk_nic_args(const uhd::device_addr_t& user_args);
 }} /* namespace uhd::prefs */
-
-#endif /* INCLUDED_LIBUHD_UTILS_PREFS_HPP */
diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp
index 6a45ba61f..e87a2ee32 100644
--- a/host/lib/include/uhdlib/utils/rpc.hpp
+++ b/host/lib/include/uhdlib/utils/rpc.hpp
@@ -5,8 +5,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#ifndef INCLUDED_UTILS_RPC_HPP
-#define INCLUDED_UTILS_RPC_HPP
+#pragma once
 
 #include <uhd/exception.hpp>
 #include <uhd/utils/log.hpp>
@@ -326,5 +325,3 @@ private:
 };
 
 } /* namespace uhd */
-
-#endif /* INCLUDED_UTILS_RPC_HPP */
diff --git a/host/lib/include/uhdlib/utils/semaphore.hpp b/host/lib/include/uhdlib/utils/semaphore.hpp
index fc869d64a..c497dcc23 100644
--- a/host/lib/include/uhdlib/utils/semaphore.hpp
+++ b/host/lib/include/uhdlib/utils/semaphore.hpp
@@ -4,13 +4,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
+#pragma once
+
 #include <condition_variable>
 #include <chrono>
 #include <mutex>
 
-#ifndef INCLUDED_UHDLIB_UTILS_SEMAPHORE_HPP
-#    define INCLUDED_UHDLIB_UTILS_SEMAPHORE_HPP
-
 namespace uhd {
 
 /*!
@@ -67,5 +66,3 @@ private:
 };
 
 } // namespace uhd
-
-#endif /* INCLUDED_UHDLIB_UTILS_SEMAPHORE_HPP */