4 files changed, 22 insertions, 22 deletions
diff --git a/src/include/assert.h b/src/include/assert.h
index 8729bef9f7..0e09eef392 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -96,7 +96,7 @@ void mock_assert(const int result, const char *const expression,
  * ramstage/lib/bootmode.o: In function `display_init_required':
  * bootmode.c:42: undefined reference to `_dead_code_assertion_failed'
  */
-extern void _dead_code_assertion_failed(void) __attribute__((noreturn));
+void _dead_code_assertion_failed(void) __attribute__((noreturn));
 #define dead_code() _dead_code_assertion_failed()
 
 /* This can be used in the context of an expression of type 'type'. */
diff --git a/src/include/cpu/intel/l2_cache.h b/src/include/cpu/intel/l2_cache.h
index ceddf1d150..a859dfaf1e 100644
--- a/src/include/cpu/intel/l2_cache.h
+++ b/src/include/cpu/intel/l2_cache.h
@@ -69,17 +69,17 @@
 #define L2CMD_MESI_S 1
 #define L2CMD_MESI_I 0
 
-extern int calculate_l2_latency(void);
-extern int signal_l2(u32 address_low, u32 data_high, u32 data_low, int way,
+int calculate_l2_latency(void);
+int signal_l2(u32 address_low, u32 data_high, u32 data_low, int way,
 	u8 command);
-extern int read_l2(u32 address);
-extern int write_l2(u32 address, u32 data);
-extern int test_l2_address_alias(u32 address1, u32 address2, u32 data_high,
+int read_l2(u32 address);
+int write_l2(u32 address, u32 data);
+int test_l2_address_alias(u32 address1, u32 address2, u32 data_high,
 	u32 data_low);
-extern int calculate_l2_cache_size(void);
-extern int calculate_l2_physical_address_range(void);
-extern int set_l2_ecc(void);
+int calculate_l2_cache_size(void);
+int calculate_l2_physical_address_range(void);
+int set_l2_ecc(void);
 
-extern int p6_configure_l2_cache(void);
+int p6_configure_l2_cache(void);
 
 #endif /* __P6_L2_CACHE_H */
diff --git a/src/include/device/device.h b/src/include/device/device.h
index d044ae2b8f..f86a52d1b2 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -207,7 +207,7 @@ bool is_enabled_pci(const struct device *pci);
 bool is_pci_dev_on_bus(const struct device *pci, unsigned int bus);
 
 /* Returns whether there is a hotplug port on the path to the given device. */
-extern bool dev_path_hotplug(const struct device *);
+bool dev_path_hotplug(const struct device *);
 
 /* Option ROM helper functions */
 void run_bios(struct device *dev, unsigned long addr);
diff --git a/src/include/elog.h b/src/include/elog.h
index 29904cdb33..db59b76ac8 100644
--- a/src/include/elog.h
+++ b/src/include/elog.h
@@ -8,17 +8,17 @@
 
 #if CONFIG(ELOG)
 /* Eventlog backing storage must be initialized before calling elog_init(). */
-extern int elog_init(void);
-extern int elog_clear(void);
+int elog_init(void);
+int elog_clear(void);
 /* Event addition functions return < 0 on failure and 0 on success. */
-extern int elog_add_event_raw(u8 event_type, void *data, u8 data_size);
-extern int elog_add_event(u8 event_type);
-extern int elog_add_event_byte(u8 event_type, u8 data);
-extern int elog_add_event_word(u8 event_type, u16 data);
-extern int elog_add_event_dword(u8 event_type, u32 data);
-extern int elog_add_event_wake(u8 source, u32 instance);
-extern int elog_smbios_write_type15(unsigned long *current, int handle);
-extern int elog_add_extended_event(u8 type, u32 complement);
+int elog_add_event_raw(u8 event_type, void *data, u8 data_size);
+int elog_add_event(u8 event_type);
+int elog_add_event_byte(u8 event_type, u8 data);
+int elog_add_event_word(u8 event_type, u16 data);
+int elog_add_event_dword(u8 event_type, u32 data);
+int elog_add_event_wake(u8 source, u32 instance);
+int elog_smbios_write_type15(unsigned long *current, int handle);
+int elog_add_extended_event(u8 type, u32 complement);
 #else
 /* Stubs to help avoid littering sources with #if CONFIG_ELOG */
 static inline int elog_init(void) { return -1; }
@@ -47,7 +47,7 @@ static inline int elog_gsmi_add_event_byte(u8 event_type, u8 data) { return 0; }
 static inline int elog_gsmi_add_event_word(u8 event_type, u16 data) { return 0; }
 #endif
 
-extern u32 gsmi_exec(u8 command, u32 *param);
+u32 gsmi_exec(u8 command, u32 *param);
 
 #if CONFIG(ELOG_BOOT_COUNT)
 u32 boot_count_read(void);