diff --git a/Makefile.base b/Makefile.base
index b9feb37f403a..5e410b62708e 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -155,8 +155,6 @@ OBJ_DEPS += $(RIOTBUILD_CONFIG_HEADER_C)
 
 $(OBJC): $(BINDIR)/$(MODULE)/%.o: %.c $(OBJ_DEPS) | $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
 	$(Q)$(CCACHE) $(CC) \
-		-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-		-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
 		$(CFLAGS) $(INCLUDES) -MQ '$@' -MD -MP -c -o $@ $(abspath $<)
 ifneq (,$(SHOULD_RUN_KCONFIG))
 	$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
@@ -165,8 +163,6 @@ endif
 
 $(GENOBJC): %.o: %.c $(OBJ_DEPS) | $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
 	$(Q) $(CCACHE) $(CC) \
-		-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$<)\" \
-		-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
 		$(CFLAGS) $(INCLUDES) -MQ '$@' -MD -MP -c -o $@ $<
 ifneq (,$(SHOULD_RUN_KCONFIG))
 	$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
@@ -175,8 +171,6 @@ endif
 
 $(OBJCXX): $(BINDIR)/$(MODULE)/%.o: %.$(SRCXXEXT) $(OBJ_DEPS) | $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
 	$(Q)$(CCACHE) $(CXX) \
-		-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-		-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
 		$(CXXFLAGS) $(CXXINCLUDES) $(INCLUDES) -MQ '$@' -MD -MP -c -o $@ $(abspath $<)
 ifneq (,$(SHOULD_RUN_KCONFIG))
 	$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
diff --git a/cpu/esp32/esp-idf/esp_idf.mk b/cpu/esp32/esp-idf/esp_idf.mk
index e7db1b96b144..ac6817b318af 100644
--- a/cpu/esp32/esp-idf/esp_idf.mk
+++ b/cpu/esp32/esp-idf/esp_idf.mk
@@ -67,8 +67,6 @@ $(OBJC): $(BINDIR)/$(MODULE)/%.o: $(ESP32_SDK_DIR)/%.c $(OBJ_DEPS) \
             | $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
 	$(Q)mkdir -p $(dir $@)
 	$(Q)$(CCACHE) $(CC) \
-		-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-		-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
 		$(CFLAGS) $(INCLUDES) -MQ '$@' -MD -MP -c $(abspath $<) -o $@
 ifneq (,$(SHOULD_RUN_KCONFIG))
 	$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
@@ -79,8 +77,6 @@ $(OBJCXX): $(BINDIR)/$(MODULE)/%.o: $(ESP32_SDK_DIR)/%.$(SRCXXEXT) $(OBJ_DEPS) \
             | $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
 	$(Q)mkdir -p $(dir $@)
 	$(Q)$(CCACHE) $(CXX) \
-		-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-		-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
 		$(CXXFLAGS) $(CXXINCLUDES) $(INCLUDES) -MQ '$@' -MD -MP -c $(abspath $<) -o $@
 ifneq (,$(SHOULD_RUN_KCONFIG))
 	$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
@@ -91,8 +87,6 @@ $(ASMOBJ): $(BINDIR)/$(MODULE)/%.o: $(ESP32_SDK_DIR)/%.S $(OBJ_DEPS) \
             | $(if $(SHOULD_RUN_KCONFIG),$(KCONFIG_GENERATED_AUTOCONF_HEADER_C))
 	$(Q)mkdir -p $(dir $@)
 	$(Q)$(CCACHE) $(CC) \
-		-DRIOT_FILE_RELATIVE=\"$(patsubst $(RIOTBASE)/%,%,$(abspath $<))\" \
-		-DRIOT_FILE_NOPATH=\"$(notdir $<)\" \
 		$(CFLAGS) $(INCLUDES) -MQ '$@' -MD -MP -c $(abspath $<) -o $@
 ifneq (,$(SHOULD_RUN_KCONFIG))
 	$(Q)$(FIXDEP) $(@:.o=.d) $@ $(KCONFIG_SYNC_DIR) > $(@:.o=.tmp)
diff --git a/cpu/esp32/include/adc_arch.h b/cpu/esp32/include/adc_arch.h
index 6073cc066741..a0761a8b36ed 100644
--- a/cpu/esp32/include/adc_arch.h
+++ b/cpu/esp32/include/adc_arch.h
@@ -47,16 +47,6 @@ typedef enum {
     ADC_ATTENUATION_12_DB = ADC_ATTEN_DB_12,  /**< full-range is about 3.3 V */
 } adc_attenuation_t;
 
-/**
- * @brief   Attenuation of 11 dB is depcricated and has to be mapped
- *
- * The define ensures the compatibility with older versions.
- *
- * @deprecated `ADC_ATTENUATION_11_DB` is deprecated, use
- *             `ADC_ATTENUATION_12_DB` instead.
- */
-#define ADC_ATTENUATION_11_DB   ADC_ATTENUATION_12_DB
-
 /**
  * @brief   Set the attenuation for the ADC line. Default attenuation is 12 dB.
  *
diff --git a/dist/tools/compile_commands/compile_commands.py b/dist/tools/compile_commands/compile_commands.py
index b0531653d083..53cfc4983fb6 100755
--- a/dist/tools/compile_commands/compile_commands.py
+++ b/dist/tools/compile_commands/compile_commands.py
@@ -209,8 +209,7 @@ def write_compile_command(state, compiler, src, flags, cdetails, path):
     else:
         sys.stdout.write(",\n")
     obj = os.path.splitext(src)[0] + ".o"
-    arguments = [compiler, '-DRIOT_FILE_RELATIVE="' + os.path.join(cdetails.dir, src) + '"',
-                 '-DRIOT_FILE_NOPATH="' + src + '"']
+    arguments = [compiler]
     arguments += flags
     if '-c' in arguments:
         # bindgen is unhappy with multiple -c (that would be created by the -c
diff --git a/dist/tools/genconfigheader/riotbuild-prefix.h.in b/dist/tools/genconfigheader/riotbuild-prefix.h.in
index d3562b06c5c5..4b048ca89f7c 100644
--- a/dist/tools/genconfigheader/riotbuild-prefix.h.in
+++ b/dist/tools/genconfigheader/riotbuild-prefix.h.in
@@ -80,17 +80,4 @@
 #else
 #  define MACRO_DEPRECATED
 #endif
-
-/**
- * @brief   Name of the MCU the app is compiled for as string literal
- *
- * @deprecated  Use @ref RIOT_CPU instead. This will be removed soonest in
- *              release 2025.04
- *
- * This has been renamed to `RIOT_CPU` for consistency. Even though MCU would
- * technically be the better name, CPU is used every else in the source code
- * and folder structure.
- */
-#define RIOT_MCU        MACRO_DEPRECATED RIOT_CPU
-
 /** @} */
diff --git a/doc.txt b/doc.txt
index f55d7a43238a..78dca2c18873 100644
--- a/doc.txt
+++ b/doc.txt
@@ -59,34 +59,6 @@
 #   define DEVELHELP
 #endif
 
-/**
- * @def RIOT_FILE_RELATIVE
- * @brief   Provides the current filename relative to the RIOT base directory (RIOTBASE)
- * @warning This only works within `*.c` and `*.cpp` files. For `*.h`/`*.hpp` files the
- *          source compiles, however, the including `*.c`/`*.cpp` file will be
- *          substituted.
- * @see     @ref RIOT_FILE_NOPATH
- * @deprecated  This macro will be removed after the 2025.10 release.
- *              Use the compiler builtin `__FILE__` instead (GCC 8+, clang 10+)
- */
-#if DOXYGEN
-#   define RIOT_FILE_RELATIVE
-#endif
-
-/**
- * @def RIOT_FILE_NOPATH
- * @brief   Provides the current filename without the parent directory path
- * @warning This only works within `*.c` and `*.cpp` files. For `*.h`/`*.hpp` files the
- *          source compiles, however, the including `*.c`/`*.cpp` file will be
- *          substituted.
- * @see     @ref RIOT_FILE_RELATIVE
- * @deprecated  This macro will be removed after the 2025.10 release.
- *              Use the compiler builtin `__FILE_NAME__` instead (GCC 12+, clang 9+)
- */
-#if DOXYGEN
-#   define RIOT_FILE_NOPATH
-#endif
-
 /**
  * @def CONFIG_THREAD_NAMES
  * @brief   This global macro enable storage of thread names to help developers.
diff --git a/drivers/include/net/netdev/ieee802154.h b/drivers/include/net/netdev/ieee802154.h
index ecb073b8609b..e147c903e98b 100644
--- a/drivers/include/net/netdev/ieee802154.h
+++ b/drivers/include/net/netdev/ieee802154.h
@@ -245,24 +245,6 @@ int netdev_ieee802154_get(netdev_ieee802154_t *dev, netopt_t opt, void *value,
 int netdev_ieee802154_set(netdev_ieee802154_t *dev, netopt_t opt, const void *value,
                           size_t value_len);
 
-/**
- * @brief  This function compares destination address and pan id with addresses
- * and pan id of the device
- *
- * this function is meant top be used by drivers that do not support address
- * filtering in hw
- *
- * @deprecated  This function is currently deprecated and will be removed
- * after Release 2022.01. Use @ref ieee802154_dst_filter instead.
- *
- * @param[in] dev       network device descriptor
- * @param[in] mhr       mac header
- *
- * @return 0            successful if packet is for the device
- * @return 1            fails if packet is not for the device or pan
- */
-int netdev_ieee802154_dst_filter(netdev_ieee802154_t *dev, const uint8_t *mhr);
-
 /**
  * @brief   Configure the hardware address of a IEEE 802.15.4 devices
  *
diff --git a/drivers/include/pcf857x.h b/drivers/include/pcf857x.h
index 58bb0258430c..b7ebdbf8193c 100644
--- a/drivers/include/pcf857x.h
+++ b/drivers/include/pcf857x.h
@@ -327,20 +327,6 @@ typedef uint8_t pcf857x_data_t;     /**< type that can mask all expander pins */
 #endif /* MODULE_PCF8575 || DOXYGEN */
 /** @} */
 
-/**
- * @brief       Definition of PCF857X driver error codes
- *
- * @deprecated  These are aliases for errno error codes now, use them directly
- */
-typedef enum {
-    PCF857X_OK              = 0,        /**< success */
-    PCF857X_ERROR_I2C       = ENXIO,    /**< I2C communication error */
-    PCF857X_ERROR_INV_EXP   = ENOTSUP,  /**< invalid expander variant */
-    PCF857X_ERROR_INV_MODE  = EINVAL,   /**< invalid pin mode */
-    PCF857X_ERROR_INV_FLANK = EINVAL,   /**< invalid interrupt flank */
-    PCF857X_ERROR_INT_PIN   = ENOSYS,   /**< interrupt pin initialization failed */
-} pcf857x_error_codes_t;
-
 /**
  * @brief Definition of PCF857X expander variants
  *
diff --git a/drivers/netdev/ieee802154.c b/drivers/netdev/ieee802154.c
index cf5a39d4b44f..d5cd232b8381 100644
--- a/drivers/netdev/ieee802154.c
+++ b/drivers/netdev/ieee802154.c
@@ -300,30 +300,4 @@ int netdev_ieee802154_set(netdev_ieee802154_t *dev, netopt_t opt, const void *va
     }
     return res;
 }
-
-int netdev_ieee802154_dst_filter(netdev_ieee802154_t *dev, const uint8_t *mhr)
-{
-    uint8_t dst_addr[IEEE802154_LONG_ADDRESS_LEN];
-    le_uint16_t dst_pan;
-    uint8_t pan_bcast[] = IEEE802154_PANID_BCAST;
-
-    int addr_len = ieee802154_get_dst(mhr, dst_addr, &dst_pan);
-
-    /* filter PAN ID */
-    if ((memcmp(pan_bcast, dst_pan.u8, 2) != 0) &&
-        (memcmp(&dev->pan, dst_pan.u8, 2) != 0)) {
-        return 1;
-    }
-
-    /* check destination address */
-    if (((addr_len == IEEE802154_SHORT_ADDRESS_LEN) &&
-          (memcmp(dev->short_addr, dst_addr, addr_len) == 0 ||
-           memcmp(ieee802154_addr_bcast, dst_addr, addr_len) == 0)) ||
-        ((addr_len == IEEE802154_LONG_ADDRESS_LEN) &&
-          (memcmp(dev->long_addr, dst_addr, addr_len) == 0))) {
-        return 0;
-    }
-
-    return 1;
-}
 /** @} */
diff --git a/drivers/pcf857x/pcf857x.c b/drivers/pcf857x/pcf857x.c
index 92814fe7df84..a97abdc71513 100644
--- a/drivers/pcf857x/pcf857x.c
+++ b/drivers/pcf857x/pcf857x.c
@@ -126,7 +126,7 @@ int pcf857x_init(pcf857x_t *dev, const pcf857x_params_t *params)
     }
 #endif /* MODULE_PCF857X_IRQ */
 
-    int res = PCF857X_OK;
+    int res = 0;
 
     _acquire(dev);
 
@@ -178,7 +178,7 @@ int pcf857x_gpio_init(pcf857x_t *dev, uint8_t pin, gpio_mode_t mode)
     /* write the mode */
     pcf857x_data_t data = dev->modes | dev->out;
     _acquire(dev);
-    if ((res = _write(dev, data)) != PCF857X_OK) {
+    if ((res = _write(dev, data)) != 0) {
         _release(dev);
         return res;
     }
@@ -215,10 +215,10 @@ int pcf857x_gpio_init_int(pcf857x_t *dev, uint8_t pin,
                                           gpio_cb_t isr,
                                           void *arg)
 {
-    int res = PCF857X_OK;
+    int res = 0;
 
     /* initialize the pin */
-    if ((res = pcf857x_gpio_init(dev, pin, mode)) != PCF857X_OK) {
+    if ((res = pcf857x_gpio_init(dev, pin, mode)) != 0) {
         return res;
     }
 
@@ -234,7 +234,7 @@ int pcf857x_gpio_init_int(pcf857x_t *dev, uint8_t pin,
                  return -EINVAL;
     }
 
-    return PCF857X_OK;
+    return 0;
 }
 
 void pcf857x_gpio_irq_enable(pcf857x_t *dev, uint8_t pin)
@@ -443,7 +443,7 @@ static int _read(const pcf857x_t *dev, pcf857x_data_t *data)
         DEBUG_DEV("data=%04x", dev, *data);
     }
 
-    return PCF857X_OK;
+    return 0;
 }
 
 static int _write(const pcf857x_t *dev, pcf857x_data_t data)
@@ -475,5 +475,5 @@ static int _write(const pcf857x_t *dev, pcf857x_data_t data)
        return res;
     }
 
-    return PCF857X_OK;
+    return 0;
 }
diff --git a/makefiles/deprecated_modules.inc.mk b/makefiles/deprecated_modules.inc.mk
index 5fe57d31d826..a13e016226ed 100644
--- a/makefiles/deprecated_modules.inc.mk
+++ b/makefiles/deprecated_modules.inc.mk
@@ -1,4 +1,3 @@
 # Add deprecated modules here
 # Keep this list ALPHABETICALLY SORTED!!!!111elven
-DEPRECATED_MODULES += gnrc_nettype_lorawan
 DEPRECATED_MODULES += sema_deprecated
diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk
index da50f31d728e..cd8a96c173ee 100644
--- a/makefiles/pseudomodules.inc.mk
+++ b/makefiles/pseudomodules.inc.mk
@@ -91,22 +91,23 @@ PSEUDOMODULES += gcoap_dns
 ## Enable the @ref gcoap_dns_server_proxy_set function
 PSEUDOMODULES += gcoap_dns_proxied
 ## @}
+
 PSEUDOMODULES += fido2_tests
 ## @addtogroup net_dhcpv6_client
 ## @{
+
 ## @defgroup net_gnrc_dhcpv6_client	gnrc_dhcpv6_client: Basic DHCPv6 client implementation in GNRC
-## @{
 PSEUDOMODULES += gnrc_dhcpv6_client
-## @}
+
 ## @defgroup net_gnrc_dhcpv6_client_6lbr gnrc_dhcpv6_client_6lbr: Basic client for GNRC 6LoWPAN BRs
-## @{
 PSEUDOMODULES += gnrc_dhcpv6_client_6lbr
 ## @}
+
 ## @addtogroup net_dhcpv6_client_simple_pd
 ## @{
 PSEUDOMODULES += gnrc_dhcpv6_client_simple_pd
 ## @}
-## @}
+
 PSEUDOMODULES += gnrc_ipv6_auto_subnets_auto_init
 PSEUDOMODULES += gnrc_ipv6_auto_subnets_eui
 PSEUDOMODULES += gnrc_ipv6_auto_subnets_simple
@@ -161,16 +162,6 @@ PSEUDOMODULES += gnrc_nettype_ipv6
 PSEUDOMODULES += gnrc_nettype_ipv6_ext
 ## @}
 
-## @defgroup 	net_gnrc_nettype_lorawan    gnrc_nettype_lorawan
-## Enables @ref GNRC_NETTYPE_LORAWAN
-##
-## @deprecated  LoRaWAN payloads do not have a special type anymore and just use
-##              @ref GNRC_NETTYPE_UNDEF. There is no module needed for that.
-##              This module will be removed after 2024.10 release.
-## @{
-PSEUDOMODULES += gnrc_nettype_lorawan
-## @}
-
 ## @defgroup 	net_gnrc_nettype_ndn        gnrc_nettype_ndn
 ## Enables @ref GNRC_NETTYPE_NDN
 ## @{
diff --git a/sys/fido2/ctap/ctap_mem.c b/sys/fido2/ctap/ctap_mem.c
index b48a6f811a8c..5f2828f43e08 100644
--- a/sys/fido2/ctap/ctap_mem.c
+++ b/sys/fido2/ctap/ctap_mem.c
@@ -183,8 +183,7 @@ ctap_status_code_t fido2_ctap_mem_write_rk_to_flash(ctap_resident_key_t *rk)
         ret = mtd_read(_mtd_dev, &tmp, addr, sizeof(ctap_resident_key_t));
 
         if (ret < 0) {
-            DEBUG("%s, %d: mtd_read failed", RIOT_FILE_RELATIVE,
-                  __LINE__);
+            DEBUG("%s, %d: mtd_read failed", __FILE__, __LINE__);
             return false;
         }
 
@@ -243,8 +242,7 @@ ctap_status_code_t fido2_ctap_mem_read_rk_from_flash(ctap_resident_key_t *key, u
         int ret = mtd_read(_mtd_dev, key, *addr, sizeof(ctap_resident_key_t));
 
         if (ret < 0) {
-            DEBUG("%s, %d: mtd_read failed", RIOT_FILE_RELATIVE,
-                  __LINE__);
+            DEBUG("%s, %d: mtd_read failed", __FILE__, __LINE__);
             return CTAP1_ERR_OTHER;
         }
 
diff --git a/sys/include/net/gnrc/nettype.h b/sys/include/net/gnrc/nettype.h
index 342ea57164d0..d94045dbc07f 100644
--- a/sys/include/net/gnrc/nettype.h
+++ b/sys/include/net/gnrc/nettype.h
@@ -74,15 +74,6 @@ typedef enum {
     GNRC_NETTYPE_SIXLOWPAN,     /**< Protocol is 6LoWPAN */
 #endif
 
-#if IS_USED(MODULE_GNRC_NETTYPE_LORAWAN) || defined(DOXYGEN)
-/**
- * @brief       Protocol is LoRaWAN
- * @deprecated  LoRaWAN payloads do not have a special type anymore and just use
- *              @ref GNRC_NETTYPE_UNDEF. Will be removed after 2024.10 release.
- */
-#define GNRC_NETTYPE_LORAWAN    GNRC_NETTYPE_UNDEF
-#endif
-
     /**
      * @{
      * @name Network layer
diff --git a/sys/include/phydat.h b/sys/include/phydat.h
index 166a95b7ca01..3c16e3d914b7 100644
--- a/sys/include/phydat.h
+++ b/sys/include/phydat.h
@@ -89,18 +89,15 @@ enum {
     UNIT_M3,        /**< cubic meters */
     /* kinetic */
     UNIT_G_FORCE,   /**< gravitational force equivalent */
-    UNIT_G = UNIT_G_FORCE, /**< @deprecated, use UNIT_G_FORCE instead */
     UNIT_DPS,       /**< degree per second */
     /* weight */
     UNIT_GRAM,      /**< grams - not using the SI unit (kg) here to make scale
                      *   handling simpler */
-    UNIT_GR = UNIT_GRAM, /**< @deprecated, use UNIT_GRAM instead */
     /* electricity */
     UNIT_A,         /**< Ampere */
     UNIT_V,         /**< Volts */
     UNIT_W,         /**< Watt */
     UNIT_GAUSS,     /**< gauss */
-    UNIT_GS = UNIT_GAUSS, /**< @deprecated, use UNIT_GAUSS instead */
     UNIT_T,         /**< Tesla */
     UNIT_DBM,       /**< decibel-milliwatts */
     UNIT_COULOMB,   /**< coulomb */
diff --git a/sys/include/xtimer.h b/sys/include/xtimer.h
index 1f157e0c0dbd..1605740e6ac9 100644
--- a/sys/include/xtimer.h
+++ b/sys/include/xtimer.h
@@ -195,23 +195,6 @@ static inline void xtimer_usleep(uint32_t microseconds);
  */
 static inline void xtimer_usleep64(uint64_t microseconds);
 
-/**
- * @brief Stop execution of a thread for some time
- *
- * @deprecated This function is deprecated as no XTIMER backend is currently
- *             configured to run at more than 1 MHz, making nanoseconds accuracy
- *             impossible to achieve.
- *
- * Don't expect nanosecond accuracy. As of now, this function just calls
- * xtimer_usleep(nanoseconds/1000).
- *
- * When called from an ISR, this function will spin-block, so only use it there
- * for *very* short periods.
- *
- * @param[in] nanoseconds   the amount of nanoseconds the thread should sleep
- */
-static inline void xtimer_nanosleep(uint32_t nanoseconds);
-
 /**
  * @brief Stop execution of a thread for some time, 32bit version
  *
diff --git a/sys/include/xtimer/implementation.h b/sys/include/xtimer/implementation.h
index b50f5a9e3a2c..f9f00681d30b 100644
--- a/sys/include/xtimer/implementation.h
+++ b/sys/include/xtimer/implementation.h
@@ -191,11 +191,6 @@ static inline void xtimer_sleep(uint32_t seconds)
     _xtimer_tsleep64(_xtimer_ticks_from_usec64((uint64_t)seconds * US_PER_SEC));
 }
 
-static inline void xtimer_nanosleep(uint32_t nanoseconds)
-{
-    _xtimer_tsleep32(_xtimer_ticks_from_usec(nanoseconds / NS_PER_US));
-}
-
 static inline void xtimer_tsleep32(xtimer_ticks32_t ticks)
 {
     _xtimer_tsleep32(ticks.ticks32);
diff --git a/sys/include/ztimer/xtimer_compat.h b/sys/include/ztimer/xtimer_compat.h
index 7c60580e2be7..9789b17ed497 100644
--- a/sys/include/ztimer/xtimer_compat.h
+++ b/sys/include/ztimer/xtimer_compat.h
@@ -206,11 +206,6 @@ static inline void xtimer_usleep(uint32_t microseconds)
     }
 }
 
-static inline void xtimer_nanosleep(uint32_t nanoseconds)
-{
-    xtimer_usleep(nanoseconds / NS_PER_US);
-}
-
 static inline void xtimer_tsleep32(xtimer_ticks32_t ticks)
 {
     xtimer_usleep(xtimer_usec_from_ticks(ticks));
diff --git a/sys/include/ztimer64/xtimer_compat.h b/sys/include/ztimer64/xtimer_compat.h
index 74fa861bea7b..276657776e56 100644
--- a/sys/include/ztimer64/xtimer_compat.h
+++ b/sys/include/ztimer64/xtimer_compat.h
@@ -136,11 +136,6 @@ static inline void xtimer_usleep(uint32_t microseconds)
     ztimer_sleep(ZTIMER_USEC, microseconds);
 }
 
-static inline void xtimer_nanosleep(uint32_t nanoseconds)
-{
-    ztimer_sleep(ZTIMER_USEC, nanoseconds / NS_PER_US);
-}
-
 static inline void xtimer_set(xtimer_t *timer, uint32_t offset)
 {
     ztimer64_set(ZTIMER64_USEC, timer, offset);
diff --git a/sys/phydat/phydat_str.c b/sys/phydat/phydat_str.c
index d22c2e35eb05..352014337c1c 100644
--- a/sys/phydat/phydat_str.c
+++ b/sys/phydat/phydat_str.c
@@ -152,7 +152,7 @@ static FLASH_ATTR const char * FLASH_ATTR const _unit_to_str[] = {
     [UNIT_V] = _unit_volt,
     [UNIT_W] = _unit_watt,
     [UNIT_DBM] = _unit_decibel_milliwatts,
-    [UNIT_GS] = _unit_gauss,
+    [UNIT_GAUSS] = _unit_gauss,
     [UNIT_T] = _unit_tesla,
     [UNIT_BAR] = _unit_bar,
     [UNIT_PA] = _unit_pascal,
diff --git a/tests/drivers/abp2/main.c b/tests/drivers/abp2/main.c
index 581ac5d8b660..e66557662bb6 100644
--- a/tests/drivers/abp2/main.c
+++ b/tests/drivers/abp2/main.c
@@ -108,8 +108,9 @@ int main(void)
             case ABP2_SAUL:
                 while (saulDev) {
                     int dim = saul_reg_read(saulDev, &saulData);
-                    printf("\nDev: %s\tType: %s" "\n", saulDev->name,
-                            saul_class_to_str(saulDev->driver->type));
+                    printf("\nDev: %s\tType: ", saulDev->name);
+                    saul_class_print(saulDev->driver->type);
+                    puts("");
                     phydat_dump(&saulData, dim);
                     saulDev = saulDev->next;
                 }
diff --git a/tests/drivers/bmx055/main.c b/tests/drivers/bmx055/main.c
index f177e8cf31bb..40ce252f15ea 100644
--- a/tests/drivers/bmx055/main.c
+++ b/tests/drivers/bmx055/main.c
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 
-#include "flash_utils.h"
 #include "phydat.h"
 #include "saul_reg.h"
 #include "xtimer.h"
@@ -42,8 +41,9 @@ int main(void)
 
         while (dev) {
             int dim = saul_reg_read(dev, &res);
-            printf("\nDev: %s\tType: %" PRIsflash "\n", dev->name,
-                   saul_class_to_str(dev->driver->type));
+            printf("\nDev: %s\tType: ", dev->name);
+            saul_class_print(dev->driver->type);
+            puts("");
             phydat_dump(&res, dim);
             dev = dev->next;
         }
diff --git a/tests/drivers/pcf857x/main.c b/tests/drivers/pcf857x/main.c
index 03e9f5cd1f19..5d8886601e19 100644
--- a/tests/drivers/pcf857x/main.c
+++ b/tests/drivers/pcf857x/main.c
@@ -408,7 +408,7 @@ int main(void)
 
     /* initialize configured PCF857X devices */
     for (unsigned i = 0; i < PCF857X_NUM; i++) {
-        if (pcf857x_init(&pcf857x_dev[i], &pcf857x_params[i]) != PCF857X_OK) {
+        if (pcf857x_init(&pcf857x_dev[i], &pcf857x_params[i]) != 0) {
             puts("[Failed]");
             return 1;
         }
diff --git a/tests/drivers/saul/main.c b/tests/drivers/saul/main.c
index 0c5f0eaaefda..927a3f798eea 100644
--- a/tests/drivers/saul/main.c
+++ b/tests/drivers/saul/main.c
@@ -16,7 +16,6 @@
 
 #include <stdio.h>
 
-#include "flash_utils.h"
 #include "phydat.h"
 #include "saul_reg.h"
 #include "xtimer.h"
@@ -43,8 +42,9 @@ int main(void)
 
         while (dev) {
             int dim = saul_reg_read(dev, &res);
-            printf("\nDev: %s\tType: %" PRIsflash "\n", dev->name,
-                   saul_class_to_str(dev->driver->type));
+            printf("\nDev: %s\tType: ", dev->name);
+            saul_class_print(dev->driver->type);
+            puts("");
             phydat_dump(&res, dim);
             dev = dev->next;
         }