diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c
index b1df90c843b..7c0df8532f1 100644
--- a/drivers/can/can_stm32.c
+++ b/drivers/can/can_stm32.c
@@ -412,17 +412,18 @@ static int can_stm32_init(const struct device *dev)
 
 	/* configure pinmux */
 	if (cfg->pinctrl_len != 0U) {
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
-		int remap;
-		/* Check that remap configuration is coherent across pins */
-		remap = stm32_dt_pinctrl_remap_check(cfg->pinctrl,
-						     cfg->pinctrl_len);
-		if (remap < 0) {
-			return remap;
-		}
 
-		stm32_dt_pinctrl_remap_set((uint32_t)cfg->can, remap);
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
+		if (IS_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl))) {
+			int remap;
+			/* Check remap configuration is coherent across pins */
+			remap = stm32_dt_pinctrl_remap_check(cfg->pinctrl,
+						     cfg->pinctrl_len);
+			if (remap < 0) {
+				return remap;
+			}
+
+			stm32_dt_pinctrl_remap_set((uint32_t)cfg->can, remap);
+		}
 
 		stm32_dt_pinctrl_configure(cfg->pinctrl, cfg->pinctrl_len);
 	}
diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c
index 0b449e20ac9..ba15eb155c4 100644
--- a/drivers/i2c/i2c_ll_stm32.c
+++ b/drivers/i2c/i2c_ll_stm32.c
@@ -189,17 +189,18 @@ static int i2c_stm32_init(const struct device *dev)
 #endif
 
 	if (cfg->pinctrl_list_size != 0) {
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
-		int remap;
-		/* Check that remap configuration is coherent across pins */
-		remap = stm32_dt_pinctrl_remap_check(cfg->pinctrl_list,
-						     cfg->pinctrl_list_size);
-		if (remap < 0) {
-			return remap;
-		}
 
-		stm32_dt_pinctrl_remap_set((uint32_t)cfg->i2c, remap);
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
+		if (IS_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl))) {
+			int remap;
+			/* Check remap configuration is coherent across pins */
+			remap = stm32_dt_pinctrl_remap_check(cfg->pinctrl_list,
+							cfg->pinctrl_list_size);
+			if (remap < 0) {
+				return remap;
+			}
+
+			stm32_dt_pinctrl_remap_set((uint32_t)cfg->i2c, remap);
+		}
 
 		stm32_dt_pinctrl_configure(cfg->pinctrl_list,
 					   cfg->pinctrl_list_size);
diff --git a/drivers/pinmux/stm32/pinmux_stm32.c b/drivers/pinmux/stm32/pinmux_stm32.c
index 2c33c9da3a6..197f3645678 100644
--- a/drivers/pinmux/stm32/pinmux_stm32.c
+++ b/drivers/pinmux/stm32/pinmux_stm32.c
@@ -180,7 +180,6 @@ void stm32_dt_pinctrl_configure(const struct soc_gpio_pinctrl *pinctrl,
 
 }
 
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
 /**
  * @brief Helper function to check provided pinctrl remap configuration (Pin
  *        remapping configuration should be the same on all pins)
@@ -194,6 +193,7 @@ void stm32_dt_pinctrl_configure(const struct soc_gpio_pinctrl *pinctrl,
 int stm32_dt_pinctrl_remap_check(const struct soc_gpio_pinctrl *pinctrl,
 				size_t list_size)
 {
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
 	int remap;
 	uint32_t mux;
 
@@ -210,10 +210,14 @@ int stm32_dt_pinctrl_remap_check(const struct soc_gpio_pinctrl *pinctrl,
 	}
 
 	return remap;
+#else
+	return 0;
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
 }
 
 void stm32_dt_pinctrl_remap_set(uint32_t base, int remap)
 {
+#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
 
 	/* A valid remapping configuration is provided */
 	/* Apply remapping before proceeding with pin configuration */
@@ -420,6 +424,7 @@ void stm32_dt_pinctrl_remap_set(uint32_t base, int remap)
 	}
 
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
+}
 
 /**
  * @brief pin setup
diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c
index 89d4d3702b5..80612ba8626 100644
--- a/drivers/pwm/pwm_stm32.c
+++ b/drivers/pwm/pwm_stm32.c
@@ -283,20 +283,21 @@ static int pwm_stm32_init(const struct device *dev)
 
 	/* configure pinmux */
 	if (cfg->pinctrl_len != 0U) {
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
-		/* apply F1 series remaps */
-		int remap;
 
-		remap = stm32_dt_pinctrl_remap_check(cfg->pinctrl,
-						     cfg->pinctrl_len);
-		if (remap < 0) {
-			LOG_ERR("pinctrl remap check failed (%d)", remap);
-			return remap;
+		if (IS_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl))) {
+			int remap;
+
+			remap = stm32_dt_pinctrl_remap_check(cfg->pinctrl,
+							     cfg->pinctrl_len);
+			if (remap < 0) {
+				LOG_ERR("pinctrl remap check failed (%d)",
+					remap);
+				return remap;
+			}
+
+			stm32_dt_pinctrl_remap_set((uint32_t)cfg->timer, remap);
 		}
 
-		stm32_dt_pinctrl_remap_set((uint32_t)cfg->timer, remap);
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
-
 		stm32_dt_pinctrl_configure(cfg->pinctrl, cfg->pinctrl_len);
 	}
 
diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index 8c5f9a395a7..9d65b956b70 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -680,17 +680,19 @@ static int uart_stm32_init(const struct device *dev)
 
 	/* Configure dt provided device signals when available */
 	if (config->pinctrl_list_size != 0) {
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
-		int remap;
-		/* Check that remap configuration is coherent across pins */
-		remap = stm32_dt_pinctrl_remap_check(config->pinctrl_list,
+		if (IS_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl))) {
+			int remap;
+			/* Check remap configuration is coherent across pins */
+			remap = stm32_dt_pinctrl_remap_check(
+						     config->pinctrl_list,
 						     config->pinctrl_list_size);
-		if (remap < 0) {
-			return remap;
-		}
+			if (remap < 0) {
+				return remap;
+			}
 
-		stm32_dt_pinctrl_remap_set((uint32_t)UART_STRUCT(dev), remap);
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
+			stm32_dt_pinctrl_remap_set((uint32_t)UART_STRUCT(dev),
+						   remap);
+		}
 
 		stm32_dt_pinctrl_configure(config->pinctrl_list,
 					   config->pinctrl_list_size);
diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
index f35cb54faea..8627dd4cc5f 100644
--- a/drivers/spi/spi_ll_stm32.c
+++ b/drivers/spi/spi_ll_stm32.c
@@ -800,17 +800,18 @@ static int spi_stm32_init(const struct device *dev)
 
 	/* Configure dt provided device signals when available */
 	if (cfg->pinctrl_list_size != 0) {
-#if DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl)
-		int remap;
-		/* Check that remap configuration is coherent across pins */
-		remap = stm32_dt_pinctrl_remap_check(cfg->pinctrl_list,
-						     cfg->pinctrl_list_size);
-		if (remap < 0) {
-			return remap;
-		}
 
-		stm32_dt_pinctrl_remap_set((uint32_t)cfg->spi, remap);
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl) */
+		if (IS_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32f1_pinctrl))) {
+			int remap;
+			/* Check remap configuration is coherent across pins */
+			remap = stm32_dt_pinctrl_remap_check(cfg->pinctrl_list,
+							cfg->pinctrl_list_size);
+			if (remap < 0) {
+				return remap;
+			}
+
+			stm32_dt_pinctrl_remap_set((uint32_t)cfg->spi, remap);
+		}
 
 		stm32_dt_pinctrl_configure(cfg->pinctrl_list,
 					   cfg->pinctrl_list_size);