diff --git a/arch/arm/core/mpu/arm_mpu.c b/arch/arm/core/mpu/arm_mpu.c
index 2e034b8d8ff..3f9cf095754 100644
--- a/arch/arm/core/mpu/arm_mpu.c
+++ b/arch/arm/core/mpu/arm_mpu.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #include <zephyr/device.h>
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
@@ -67,7 +61,6 @@ static uint8_t static_regions_num;
 #error "Unsupported ARM CPU"
 #endif
 
-#line 71
 static int region_allocate_and_init(const uint8_t index,
 	const struct arm_mpu_region *region_conf)
 {
diff --git a/arch/arm/core/mpu/arm_mpu_v7_internal.h b/arch/arm/core/mpu/arm_mpu_v7_internal.h
index e1e13057852..9641ab25000 100644
--- a/arch/arm/core/mpu/arm_mpu_v7_internal.h
+++ b/arch/arm/core/mpu/arm_mpu_v7_internal.h
@@ -14,7 +14,7 @@
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
 #include <zephyr/logging/log.h>
-#line 18
+
 /* Global MPU configuration at system initialization. */
 static void mpu_init(void)
 {
diff --git a/drivers/adc/adc_ite_it8xxx2.c b/drivers/adc/adc_ite_it8xxx2.c
index eecdd1a024d..53aec279fd2 100644
--- a/drivers/adc/adc_ite_it8xxx2.c
+++ b/drivers/adc/adc_ite_it8xxx2.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #define DT_DRV_COMPAT ite_it8xxx2_adc
 
 #define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
diff --git a/drivers/adc/adc_npcx.c b/drivers/adc/adc_npcx.c
index 9c6f0298b15..ae1cf65ffbb 100644
--- a/drivers/adc/adc_npcx.c
+++ b/drivers/adc/adc_npcx.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #define DT_DRV_COMPAT nuvoton_npcx_adc
 
 #include <assert.h>
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index 5166d4d0716..8d776ff7aee 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -13,12 +13,6 @@
  * Hooks into the printk and fputc (for printf) modules. Poll driven.
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 21
-
 #include <zephyr/kernel.h>
 
 #include <stdio.h>
diff --git a/drivers/flash/flash_npcx_fiu_nor.c b/drivers/flash/flash_npcx_fiu_nor.c
index 4d55380934d..e42aa82f896 100644
--- a/drivers/flash/flash_npcx_fiu_nor.c
+++ b/drivers/flash/flash_npcx_fiu_nor.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #define DT_DRV_COMPAT nuvoton_npcx_fiu_nor
 
 #include <zephyr/kernel.h>
@@ -27,7 +21,6 @@
 #include "spi_nor.h"
 
 #include <zephyr/logging/log.h>
-#line 31
 LOG_MODULE_REGISTER(flash_npcx_fiu_nor, CONFIG_FLASH_LOG_LEVEL);
 
 #define BLOCK_64K_SIZE KB(64)
diff --git a/drivers/i2c/i2c_npcx_port.c b/drivers/i2c/i2c_npcx_port.c
index b717e5a48a3..17638909561 100644
--- a/drivers/i2c/i2c_npcx_port.c
+++ b/drivers/i2c/i2c_npcx_port.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #define DT_DRV_COMPAT nuvoton_npcx_i2c_port
 
 /**
diff --git a/drivers/i2c/i2c_shell.c b/drivers/i2c/i2c_shell.c
index 7cac092c1c6..176a0d46c56 100644
--- a/drivers/i2c/i2c_shell.c
+++ b/drivers/i2c/i2c_shell.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/shell/shell.h>
 #include <stdlib.h>
diff --git a/drivers/sensor/nuvoton/nuvoton_tach_npcx/tach_nuvoton_npcx.c b/drivers/sensor/nuvoton/nuvoton_tach_npcx/tach_nuvoton_npcx.c
index f5dd209f75d..b373d998b64 100644
--- a/drivers/sensor/nuvoton/nuvoton_tach_npcx/tach_nuvoton_npcx.c
+++ b/drivers/sensor/nuvoton/nuvoton_tach_npcx/tach_nuvoton_npcx.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #define DT_DRV_COMPAT nuvoton_npcx_tach
 
 /**
diff --git a/drivers/serial/uart_npcx.c b/drivers/serial/uart_npcx.c
index 122026fefda..cc3e9962e2e 100644
--- a/drivers/serial/uart_npcx.c
+++ b/drivers/serial/uart_npcx.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #define DT_DRV_COMPAT nuvoton_npcx_uart
 
 #include <zephyr/sys/__assert.h>
diff --git a/drivers/watchdog/wdt_npcx.c b/drivers/watchdog/wdt_npcx.c
index c482fd61b29..31aadd86345 100644
--- a/drivers/watchdog/wdt_npcx.c
+++ b/drivers/watchdog/wdt_npcx.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #define DT_DRV_COMPAT nuvoton_npcx_watchdog
 
 /**
diff --git a/include/zephyr/arch/arm/asm_inline_gcc.h b/include/zephyr/arch/arm/asm_inline_gcc.h
index 0ec2cc2ee7d..cb8653999f4 100644
--- a/include/zephyr/arch/arm/asm_inline_gcc.h
+++ b/include/zephyr/arch/arm/asm_inline_gcc.h
@@ -27,7 +27,6 @@
 #include <zephyr/arch/arm/cortex_a_r/cpu.h>
 #endif
 
-#line 31
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/zephyr/debug/coredump.h b/include/zephyr/debug/coredump.h
index cb01b7bba03..5ebdca5fc1e 100644
--- a/include/zephyr/debug/coredump.h
+++ b/include/zephyr/debug/coredump.h
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #ifndef ZEPHYR_INCLUDE_DEBUG_COREDUMP_H_
 #define ZEPHYR_INCLUDE_DEBUG_COREDUMP_H_
 
@@ -17,7 +11,6 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#line 21
 /*
  * Define COREDUMP_*_STR as public to allow coredump_backend_other to re-use
  * these strings if necessary
diff --git a/include/zephyr/drivers/clock_control.h b/include/zephyr/drivers/clock_control.h
index 92012e4e3e9..27d65fe3079 100644
--- a/include/zephyr/drivers/clock_control.h
+++ b/include/zephyr/drivers/clock_control.h
@@ -6,12 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 14
-
 /**
  * @file
  * @brief Public Clock Control APIs
diff --git a/include/zephyr/drivers/i2c.h b/include/zephyr/drivers/i2c.h
index d083be2be7f..5f1c3fbe8ae 100644
--- a/include/zephyr/drivers/i2c.h
+++ b/include/zephyr/drivers/i2c.h
@@ -4,12 +4,6 @@
  * @brief Public APIs for the I2C drivers.
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 /*
  * Copyright (c) 2015 Intel Corporation
  *
@@ -35,8 +29,6 @@
 #include <zephyr/sys/slist.h>
 #include <zephyr/rtio/rtio.h>
 
-#line 39
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/zephyr/drivers/pwm.h b/include/zephyr/drivers/pwm.h
index 20402d6413f..4f21f41e876 100644
--- a/include/zephyr/drivers/pwm.h
+++ b/include/zephyr/drivers/pwm.h
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#line 9
 /**
  * @file
  * @brief Public PWM Driver APIs
diff --git a/include/zephyr/drivers/sensor.h b/include/zephyr/drivers/sensor.h
index b106a416a4c..1d958a4b707 100644
--- a/include/zephyr/drivers/sensor.h
+++ b/include/zephyr/drivers/sensor.h
@@ -4,12 +4,6 @@
  * @brief Public APIs for the sensor driver.
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 /*
  * Copyright (c) 2016 Intel Corporation
  *
diff --git a/include/zephyr/logging/log_core.h b/include/zephyr/logging/log_core.h
index 97dbdddaac0..2c22e151134 100644
--- a/include/zephyr/logging/log_core.h
+++ b/include/zephyr/logging/log_core.h
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #ifndef ZEPHYR_INCLUDE_LOGGING_LOG_CORE_H_
 #define ZEPHYR_INCLUDE_LOGGING_LOG_CORE_H_
 
@@ -20,8 +14,6 @@
 #include <stdarg.h>
 #include <zephyr/sys/util.h>
 
-#line 24
-
 /* This header file keeps all macros and functions needed for creating logging
  * messages (macros like @ref LOG_ERR).
  */
diff --git a/include/zephyr/logging/log_instance.h b/include/zephyr/logging/log_instance.h
index 5ba25bd3ec3..009f5f4a039 100644
--- a/include/zephyr/logging/log_instance.h
+++ b/include/zephyr/logging/log_instance.h
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #ifndef ZEPHYR_INCLUDE_LOGGING_LOG_INSTANCE_H_
 #define ZEPHYR_INCLUDE_LOGGING_LOG_INSTANCE_H_
 
diff --git a/include/zephyr/logging/log_msg.h b/include/zephyr/logging/log_msg.h
index 655d4af5994..74e22db6592 100644
--- a/include/zephyr/logging/log_msg.h
+++ b/include/zephyr/logging/log_msg.h
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #ifndef ZEPHYR_INCLUDE_LOGGING_LOG_MSG_H_
 #define ZEPHYR_INCLUDE_LOGGING_LOG_MSG_H_
 
@@ -30,12 +24,6 @@
 #include <alloca.h>
 #endif
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 38
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/zephyr/sys/__assert.h b/include/zephyr/sys/__assert.h
index dab2035206d..9f1ab977bee 100644
--- a/include/zephyr/sys/__assert.h
+++ b/include/zephyr/sys/__assert.h
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #ifndef ZEPHYR_INCLUDE_SYS___ASSERT_H_
 #define ZEPHYR_INCLUDE_SYS___ASSERT_H_
 
diff --git a/include/zephyr/sys/atomic.h b/include/zephyr/sys/atomic.h
index d6afcf36895..31324b13d57 100644
--- a/include/zephyr/sys/atomic.h
+++ b/include/zephyr/sys/atomic.h
@@ -6,12 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 14
-
 #ifndef ZEPHYR_INCLUDE_SYS_ATOMIC_H_
 #define ZEPHYR_INCLUDE_SYS_ATOMIC_H_
 
@@ -23,8 +17,6 @@
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
 
-#line 27
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/zephyr/sys/atomic_builtin.h b/include/zephyr/sys/atomic_builtin.h
index 357cd39bd3e..b45f561a7f3 100644
--- a/include/zephyr/sys/atomic_builtin.h
+++ b/include/zephyr/sys/atomic_builtin.h
@@ -7,12 +7,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 15
-
 #ifndef ZEPHYR_INCLUDE_SYS_ATOMIC_BUILTIN_H_
 #define ZEPHYR_INCLUDE_SYS_ATOMIC_BUILTIN_H_
 
diff --git a/include/zephyr/sys/byteorder.h b/include/zephyr/sys/byteorder.h
index f824959dde3..2b987dd14fe 100644
--- a/include/zephyr/sys/byteorder.h
+++ b/include/zephyr/sys/byteorder.h
@@ -8,12 +8,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 16
-
 #ifndef ZEPHYR_INCLUDE_SYS_BYTEORDER_H_
 #define ZEPHYR_INCLUDE_SYS_BYTEORDER_H_
 
diff --git a/kernel/fatal.c b/kernel/fatal.c
index b61362ba20e..3cf3114364d 100644
--- a/kernel/fatal.c
+++ b/kernel/fatal.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #include <zephyr/kernel.h>
 
 #include <kernel_internal.h>
@@ -21,7 +15,6 @@
 #include <zephyr/fatal.h>
 #include <zephyr/debug/coredump.h>
 
-#line 25
 LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
 
 /* LCOV_EXCL_START */
diff --git a/kernel/include/wait_q.h b/kernel/include/wait_q.h
index 3522ba16571..2203a036ad2 100644
--- a/kernel/include/wait_q.h
+++ b/kernel/include/wait_q.h
@@ -6,12 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 14
-
 #ifndef ZEPHYR_KERNEL_INCLUDE_WAIT_Q_H_
 #define ZEPHYR_KERNEL_INCLUDE_WAIT_Q_H_
 
@@ -21,8 +15,6 @@
 #include <timeout_q.h>
 #include <priority_q.h>
 
-#line 25
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/kernel/init.c b/kernel/init.c
index 903b716106a..db1fd22bec2 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -40,12 +40,6 @@
 #include <zephyr/pm/device_runtime.h>
 #include <zephyr/internal/syscall_handler.h>
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 48
-
 LOG_MODULE_REGISTER(os, CONFIG_KERNEL_LOG_LEVEL);
 
 /* the only struct z_kernel instance */
diff --git a/kernel/msg_q.c b/kernel/msg_q.c
index ebb593e96e0..9adfd9ae34f 100644
--- a/kernel/msg_q.c
+++ b/kernel/msg_q.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 /**
  * @file
  * @brief Message queues.
diff --git a/kernel/poll.c b/kernel/poll.c
index 076f6955aa7..502e97537b9 100644
--- a/kernel/poll.c
+++ b/kernel/poll.c
@@ -5,12 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 13
-
 /**
  * @file
  *
diff --git a/kernel/queue.c b/kernel/queue.c
index 6fcc99eddf7..4b00deeb1e7 100644
--- a/kernel/queue.c
+++ b/kernel/queue.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 /**
  * @file
  *
diff --git a/kernel/sched.c b/kernel/sched.c
index 4fcc70ef62c..74042be5f68 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #include <zephyr/kernel.h>
 #include <ksched.h>
 #include <zephyr/spinlock.h>
diff --git a/kernel/stack.c b/kernel/stack.c
index 33512a783cc..5add38b9c23 100644
--- a/kernel/stack.c
+++ b/kernel/stack.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 /**
  * @brief fixed-size stack object
  */
diff --git a/kernel/thread.c b/kernel/thread.c
index c177daf2365..69728a403d9 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 /**
  * @file
  * @brief Kernel thread support
diff --git a/subsys/pm/pm.c b/subsys/pm/pm.c
index c815e126283..72613c7214c 100644
--- a/subsys/pm/pm.c
+++ b/subsys/pm/pm.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #include <zephyr/device.h>
 #include <zephyr/kernel.h>
 #include <zephyr/kernel_structs.h>
@@ -29,7 +23,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pm, CONFIG_PM_LOG_LEVEL);
 
-#line 33
 static ATOMIC_DEFINE(z_post_ops_required, CONFIG_MP_MAX_NUM_CPUS);
 static sys_slist_t pm_notifiers = SYS_SLIST_STATIC_INIT(&pm_notifiers);
 
diff --git a/subsys/shell/shell.c b/subsys/shell/shell.c
index e32705be87e..0032fed7f78 100644
--- a/subsys/shell/shell.c
+++ b/subsys/shell/shell.c
@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 12
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <zephyr/sys/atomic.h>
@@ -23,7 +17,6 @@
 #include "shell_vt100.h"
 #include "shell_wildcard.h"
 
-#line 27
 /* 2 == 1 char for cmd + 1 char for '\0' */
 #if (CONFIG_SHELL_CMD_BUFF_SIZE < 2)
 	#error too small CONFIG_SHELL_CMD_BUFF_SIZE