cleanup: fix all the header guards

This unifies all the EC header files to use __CROS_EC_FILENAME_H
as the include guard. Well, except for test/ util/ and extra/
which use __TEST_ __UTIL_ and __EXTRA_ prefixes respectively.

BUG=chromium:496895
BRANCH=none
TEST=make buildall -j

Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Change-Id: Iea71b3a08bdec94a11239de810a2b2e152b15029
Reviewed-on: https://chromium-review.googlesource.com/278121
Reviewed-by: Randall Spangler <rspangler@chromium.org>

49 files changed, 147 insertions, 147 deletions

diff --git a/board/auron/board.h b/board/auron/board.h
index af1837dac0..99607cd827 100644
--- a/board/auron/board.h
+++ b/board/auron/board.h
@@ -5,8 +5,8 @@
 
 /* Configuration for Auron mainboard */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_BACKLIGHT_LID
@@ -113,4 +113,4 @@ int board_discharge_on_ac(int enable);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/bds/board.h b/board/bds/board.h
index 96171e0f57..c4af34d253 100644
--- a/board/bds/board.h
+++ b/board/bds/board.h
@@ -5,8 +5,8 @@
 
 /* Stellaris EKB-LM4F-EAC board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_SYSTEM_UNLOCKED  /* Allow dangerous commands */
@@ -52,4 +52,4 @@ enum pwm_channel {
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/big/board.h b/board/big/board.h
index 2b72dffb48..4beb88baba 100644
--- a/board/big/board.h
+++ b/board/big/board.h
@@ -5,8 +5,8 @@
 
 /* Big board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_AP_HANG_DETECT
@@ -75,4 +75,4 @@ int board_discharge_on_ac(int enable);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/cr50/board.h b/board/cr50/board.h
index 2263f7fa9c..de598b5e7f 100644
--- a/board/cr50/board.h
+++ b/board/cr50/board.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Features that we don't want just yet */
 #undef CONFIG_CMD_LID_ANGLE
@@ -79,4 +79,4 @@ enum usb_strings {
 #undef CONFIG_UART_TX_BUF_SIZE
 #define CONFIG_UART_TX_BUF_SIZE 4096
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/cyan/board.h b/board/cyan/board.h
index 9589a1158d..833c393209 100644
--- a/board/cyan/board.h
+++ b/board/cyan/board.h
@@ -5,8 +5,8 @@
 
 /* Cyan board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_SYSTEM_UNLOCKED  /* Allow dangerous commands */
@@ -110,4 +110,4 @@ enum temp_sensor_id {
 int board_discharge_on_ac(int enable);
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/dingdong/board.h b/board/dingdong/board.h
index 85f4374e68..ab55e0aa2e 100644
--- a/board/dingdong/board.h
+++ b/board/dingdong/board.h
@@ -5,8 +5,8 @@
 
 /* Dingdong dongle configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -103,4 +103,4 @@ enum usb_strings {
 #define USB_EP_CONTROL   0
 #define USB_EP_COUNT     1
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/dingdong/usb_pd_config.h b/board/dingdong/usb_pd_config.h
index 894a63867b..33e7225131 100644
--- a/board/dingdong/usb_pd_config.h
+++ b/board/dingdong/usb_pd_config.h
@@ -5,8 +5,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 /* Timer selection for baseband PD communication */
 #define TIM_CLOCK_PD_TX_C0 17
@@ -125,4 +125,4 @@ static inline int pd_adc_read(int port, int cc)
 	return (cc == 0) ? adc_read_channel(ADC_CH_CC1_PD) : 0;
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
diff --git a/board/discovery-stm32f072/board.h b/board/discovery-stm32f072/board.h
index e8a83a47e7..e1eb11130e 100644
--- a/board/discovery-stm32f072/board.h
+++ b/board/discovery-stm32f072/board.h
@@ -5,8 +5,8 @@
 
 /* STM32F072-discovery board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -84,4 +84,4 @@ enum usb_strings {
 };
 
 #endif /* !__ASSEMBLER__ */
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/discovery/board.h b/board/discovery/board.h
index a4716ebe6e..2fb8a84edf 100644
--- a/board/discovery/board.h
+++ b/board/discovery/board.h
@@ -5,8 +5,8 @@
 
 /* STM32L-discovery board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #undef  CONFIG_WATCHDOG_HELP
@@ -28,4 +28,4 @@
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/glados/board.h b/board/glados/board.h
index c16e9f8295..ad1de2b883 100644
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -5,8 +5,8 @@
 
 /* Glados board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_ADC
@@ -131,4 +131,4 @@ void board_reset_pd_mcu(void);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/glados_pd/board.h b/board/glados_pd/board.h
index 999cf5802d..ce265028c4 100644
--- a/board/glados_pd/board.h
+++ b/board/glados_pd/board.h
@@ -5,8 +5,8 @@
 
 /* gladoes_pd board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /*
  * The flash size is only 32kB.
@@ -93,4 +93,4 @@ enum adc_channel {
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/glados_pd/usb_pd_config.h b/board/glados_pd/usb_pd_config.h
index 28f5cff6f9..8df3f84dc1 100644
--- a/board/glados_pd/usb_pd_config.h
+++ b/board/glados_pd/usb_pd_config.h
@@ -10,8 +10,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 /* Timer selection for baseband PD communication */
 #define TIM_CLOCK_PD_TX_C0 16
@@ -323,5 +323,5 @@ static inline void pd_set_vconn(int port, int polarity, int enable)
 	}
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
 
diff --git a/board/glower/board.h b/board/glower/board.h
index edd0c56ec9..a26edf0d40 100644
--- a/board/glower/board.h
+++ b/board/glower/board.h
@@ -5,8 +5,8 @@
 
 /* Glower board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 /* #define CONFIG_BACKLIGHT_LID */
@@ -112,4 +112,4 @@ int board_discharge_on_ac(int enable);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/hadoken/board.h b/board/hadoken/board.h
index eb496668a5..ac61bc67b8 100644
--- a/board/hadoken/board.h
+++ b/board/hadoken/board.h
@@ -5,8 +5,8 @@
 
 /* Hadoken board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 #ifndef __ASSEMBLER__
 
@@ -56,5 +56,5 @@
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
 
diff --git a/board/hoho/board.h b/board/hoho/board.h
index 7b91a669eb..90256ea7a7 100644
--- a/board/hoho/board.h
+++ b/board/hoho/board.h
@@ -5,8 +5,8 @@
 
 /* Hoho dongle configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -114,4 +114,4 @@ enum usb_strings {
 #define USB_EP_CONTROL   0
 #define USB_EP_COUNT     1
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/hoho/usb_pd_config.h b/board/hoho/usb_pd_config.h
index 894a63867b..33e7225131 100644
--- a/board/hoho/usb_pd_config.h
+++ b/board/hoho/usb_pd_config.h
@@ -5,8 +5,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 /* Timer selection for baseband PD communication */
 #define TIM_CLOCK_PD_TX_C0 17
@@ -125,4 +125,4 @@ static inline int pd_adc_read(int port, int cc)
 	return (cc == 0) ? adc_read_channel(ADC_CH_CC1_PD) : 0;
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
diff --git a/board/honeybuns/board.h b/board/honeybuns/board.h
index 324346662b..ec336bfd66 100644
--- a/board/honeybuns/board.h
+++ b/board/honeybuns/board.h
@@ -5,8 +5,8 @@
 
 /* Honeybuns board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -109,4 +109,4 @@ enum usb_strings {
 #define USB_EP_CONTROL		0
 #define USB_EP_COUNT		1
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/honeybuns/usb_pd_config.h b/board/honeybuns/usb_pd_config.h
index cbb5214546..be4e31cd70 100644
--- a/board/honeybuns/usb_pd_config.h
+++ b/board/honeybuns/usb_pd_config.h
@@ -5,8 +5,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 /* Timer selection for baseband PD communication */
 #define TIM_CLOCK_PD_TX_C0 17
@@ -138,4 +138,4 @@ static inline void pd_set_vconn(int port, int polarity, int enable)
 
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
diff --git a/board/host/board.h b/board/host/board.h
index 99a5798e02..592ecb620a 100644
--- a/board/host/board.h
+++ b/board/host/board.h
@@ -5,8 +5,8 @@
 
 /* Emulator board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_EXTPOWER_GPIO
@@ -72,4 +72,4 @@ extern const int supplier_priority[];
 #define PD_MAX_CURRENT_MA     3000
 #define PD_MAX_VOLTAGE_MV     20000
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/host/usb_pd_config.h b/board/host/usb_pd_config.h
index 8055591770..d72d4035b8 100644
--- a/board/host/usb_pd_config.h
+++ b/board/host/usb_pd_config.h
@@ -5,8 +5,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 /* Use software CRC */
 #define CONFIG_SW_CRC
@@ -21,4 +21,4 @@ void pd_config_init(int port, uint8_t power_role);
 
 int pd_adc_read(int port, int cc);
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
diff --git a/board/it8380dev/board.h b/board/it8380dev/board.h
index 405966d70a..5d90d87d24 100644
--- a/board/it8380dev/board.h
+++ b/board/it8380dev/board.h
@@ -5,8 +5,8 @@
 
 /* IT8380 development board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_POWER_BUTTON
@@ -84,4 +84,4 @@ enum ec2i_setting {
 };
 
 #endif /* !__ASSEMBLER__ */
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/kunimitsu/board.h b/board/kunimitsu/board.h
index cc03613cff..25c1d891fb 100644
--- a/board/kunimitsu/board.h
+++ b/board/kunimitsu/board.h
@@ -5,8 +5,8 @@
 
 /* Skylake Chrome Reference Design board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_SYSTEM_UNLOCKED  /* Allow dangerous commands */
@@ -122,4 +122,4 @@ int board_discharge_on_ac(int enable);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/llama/board.h b/board/llama/board.h
index a2091be9cc..be48c0cb7a 100644
--- a/board/llama/board.h
+++ b/board/llama/board.h
@@ -5,8 +5,8 @@
 
 /* llama board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 #define CONFIG_CHIPSET_MEDIATEK
 /* Add for AC adaptor, charger, battery */
@@ -98,4 +98,4 @@ int board_discharge_on_ac(int enable);
 
 #endif				/* !__ASSEMBLER__ */
 
-#endif				/* __BOARD_H */
+#endif				/* __CROS_EC_BOARD_H */
diff --git a/board/mec1322_evb/board.h b/board/mec1322_evb/board.h
index e75f53e62e..8fbc0dcf50 100644
--- a/board/mec1322_evb/board.h
+++ b/board/mec1322_evb/board.h
@@ -5,8 +5,8 @@
 
 /* MEC1322 eval board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_SYSTEM_UNLOCKED  /* Allow dangerous commands */
@@ -42,4 +42,4 @@ enum adc_channel {
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/npcx_evb/board.h b/board/npcx_evb/board.h
index 247333b5e2..6395947133 100644
--- a/board/npcx_evb/board.h
+++ b/board/npcx_evb/board.h
@@ -5,8 +5,8 @@
 
 /* Configuration for Nuvoton M4 EB */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Support Code RAM architecture (Run code in RAM) */
 #define CONFIG_CODERAM_ARCH
@@ -85,4 +85,4 @@ enum mft_channel {
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/oak/board.h b/board/oak/board.h
index aece828247..5cac3c7501 100644
--- a/board/oak/board.h
+++ b/board/oak/board.h
@@ -5,8 +5,8 @@
 
 /* oak board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Board revision */
 #undef  CONFIG_BOARD_OAK_REV_1
@@ -175,4 +175,4 @@ void board_typec_dp_set(int port, int level);
 
 #endif  /* !__ASSEMBLER__ */
 
-#endif  /* __BOARD_H */
+#endif  /* __CROS_EC_BOARD_H */
diff --git a/board/oak_pd/board.h b/board/oak_pd/board.h
index 013d555834..aebdec9ac3 100644
--- a/board/oak_pd/board.h
+++ b/board/oak_pd/board.h
@@ -5,8 +5,8 @@
 
 /* oak_pd board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 #undef CONFIG_BOARD_OAK_REV_1
 #define CONFIG_BOARD_OAK_REV_2
@@ -105,4 +105,4 @@ enum adc_channel {
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/oak_pd/usb_pd_config.h b/board/oak_pd/usb_pd_config.h
index 28f5cff6f9..8df3f84dc1 100644
--- a/board/oak_pd/usb_pd_config.h
+++ b/board/oak_pd/usb_pd_config.h
@@ -10,8 +10,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 /* Timer selection for baseband PD communication */
 #define TIM_CLOCK_PD_TX_C0 16
@@ -323,5 +323,5 @@ static inline void pd_set_vconn(int port, int polarity, int enable)
 	}
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
 
diff --git a/board/pinky/board.h b/board/pinky/board.h
index 5f66469d51..51ec71bebb 100644
--- a/board/pinky/board.h
+++ b/board/pinky/board.h
@@ -5,8 +5,8 @@
 
 /* Veyron board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_AP_HANG_DETECT
@@ -83,4 +83,4 @@ int board_discharge_on_ac(int enable);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/pit/board.h b/board/pit/board.h
index ac818cf883..b0846b5d03 100644
--- a/board/pit/board.h
+++ b/board/pit/board.h
@@ -5,8 +5,8 @@
 
 /* Pit board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_BATTERY_BQ20Z453
@@ -50,4 +50,4 @@
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/plankton/board.h b/board/plankton/board.h
index f367879a70..43ca20fc1e 100644
--- a/board/plankton/board.h
+++ b/board/plankton/board.h
@@ -5,8 +5,8 @@
 
 /* Plankton board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -116,4 +116,4 @@ int board_in_hub_mode(void);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/plankton/usb_pd_config.h b/board/plankton/usb_pd_config.h
index 4946695c09..07eda3a035 100644
--- a/board/plankton/usb_pd_config.h
+++ b/board/plankton/usb_pd_config.h
@@ -5,8 +5,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 #include "board.h"
 
@@ -161,4 +161,4 @@ static inline int pd_adc_read(int port, int cc)
 		return adc_read_channel(ADC_CH_CC2_PD);
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
diff --git a/board/rambi/board.h b/board/rambi/board.h
index bd295615bf..84d378d4df 100644
--- a/board/rambi/board.h
+++ b/board/rambi/board.h
@@ -5,8 +5,8 @@
 
 /* Configuration for Rambi mainboard */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_AP_HANG_DETECT
@@ -130,4 +130,4 @@ int board_discharge_on_ac(int enable);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/ryu/board.h b/board/ryu/board.h
index 655e97a8b3..84fa024fea 100644
--- a/board/ryu/board.h
+++ b/board/ryu/board.h
@@ -5,8 +5,8 @@
 
 /* ryu board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -223,4 +223,4 @@ void pp1800_on_off_evt(enum gpio_signal signal);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/ryu/usb_pd_config.h b/board/ryu/usb_pd_config.h
index eff6a6b95b..c28a5469f5 100644
--- a/board/ryu/usb_pd_config.h
+++ b/board/ryu/usb_pd_config.h
@@ -5,8 +5,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 #include "adc.h"
 #include "charge_state.h"
@@ -193,4 +193,4 @@ static inline void pd_set_vconn(int port, int polarity, int enable)
 				  GPIO_USBC_VCONN2_EN_L, !enable);
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
diff --git a/board/ryu_p4p5/board.h b/board/ryu_p4p5/board.h
index f57a248eba..c7c5a9193d 100644
--- a/board/ryu_p4p5/board.h
+++ b/board/ryu_p4p5/board.h
@@ -5,8 +5,8 @@
 
 /* ryu board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -219,4 +219,4 @@ void pp1800_on_off_evt(enum gpio_signal signal);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/ryu_p4p5/usb_pd_config.h b/board/ryu_p4p5/usb_pd_config.h
index 6cfa5511ba..31e675eb55 100644
--- a/board/ryu_p4p5/usb_pd_config.h
+++ b/board/ryu_p4p5/usb_pd_config.h
@@ -5,8 +5,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 #include "adc.h"
 #include "charge_state.h"
@@ -192,4 +192,4 @@ static inline void pd_set_vconn(int port, int polarity, int enable)
 				  GPIO_USBC_VCONN2_EN_L, !enable);
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
diff --git a/board/ryu_sh/board.h b/board/ryu_sh/board.h
index 7f17723174..67bafb3693 100644
--- a/board/ryu_sh/board.h
+++ b/board/ryu_sh/board.h
@@ -5,8 +5,8 @@
 
 /* ryu sensor board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -77,4 +77,4 @@ enum power_signal {
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/ryu_sh_loader/board.h b/board/ryu_sh_loader/board.h
index c90d399eb5..0453332da7 100644
--- a/board/ryu_sh_loader/board.h
+++ b/board/ryu_sh_loader/board.h
@@ -5,8 +5,8 @@
 
 /* ryu sensor board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -62,4 +62,4 @@
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/samus/board.h b/board/samus/board.h
index 3c81e403d8..c68ac4dcb4 100644
--- a/board/samus/board.h
+++ b/board/samus/board.h
@@ -5,8 +5,8 @@
 
 /* Configuration for Samus mainboard */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Debug features */
 #define CONFIG_CONSOLE_CMDHELP
@@ -209,4 +209,4 @@ void set_pp5000_in_g3(int mask, int enable);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h
index 8e72a259ac..84401ad9fa 100644
--- a/board/samus_pd/board.h
+++ b/board/samus_pd/board.h
@@ -5,8 +5,8 @@
 
 /* samus_pd board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -149,4 +149,4 @@ int board_get_battery_soc(void);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/samus_pd/usb_pd_config.h b/board/samus_pd/usb_pd_config.h
index 5ec5af9416..43272bfbaf 100644
--- a/board/samus_pd/usb_pd_config.h
+++ b/board/samus_pd/usb_pd_config.h
@@ -9,8 +9,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 /* Timer selection for baseband PD communication */
 #define TIM_CLOCK_PD_TX_C0 17
@@ -274,4 +274,4 @@ static inline void pd_set_vconn(int port, int polarity, int enable)
 					  GPIO_USB_C1_CC2_VCONN1_EN_L, !enable);
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
diff --git a/board/strago/board.h b/board/strago/board.h
index 36ef364d91..bbd63c8605 100644
--- a/board/strago/board.h
+++ b/board/strago/board.h
@@ -5,8 +5,8 @@
 
 /* Strago board configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* Optional features */
 #define CONFIG_SYSTEM_UNLOCKED  /* Allow dangerous commands */
@@ -131,4 +131,4 @@ int board_discharge_on_ac(int enable);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/twinkie/board.h b/board/twinkie/board.h
index 3181be1a2d..71aceecb1f 100644
--- a/board/twinkie/board.h
+++ b/board/twinkie/board.h
@@ -5,8 +5,8 @@
 
 /* Twinkie dongle configuration */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -139,4 +139,4 @@ enum usb_strings {
 #define USB_EP_COUNT     2
 #endif
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/twinkie/injector.h b/board/twinkie/injector.h
index 11c3c095f2..026a2c2859 100644
--- a/board/twinkie/injector.h
+++ b/board/twinkie/injector.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef __INJECTOR_H
-#define __INJECTOR_H
+#ifndef __CROS_EC_INJECTOR_H
+#define __CROS_EC_INJECTOR_H
 
 /*
  * Finite state machine definition for sending complex sequences
@@ -85,4 +85,4 @@ enum trace_mode {
 /* Number of words in the FSM command/data buffer  */
 #define INJ_CMD_COUNT 128
 
-#endif /* __INJECTOR_H */
+#endif /* __CROS_EC_INJECTOR_H */
diff --git a/board/twinkie/usb_pd_config.h b/board/twinkie/usb_pd_config.h
index 73cb7b578f..b125a2dfa9 100644
--- a/board/twinkie/usb_pd_config.h
+++ b/board/twinkie/usb_pd_config.h
@@ -5,8 +5,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 #include "ina2xx.h"
 
@@ -177,4 +177,4 @@ static inline int pd_adc_read(int port, int cc)
 		return adc_read_channel(ADC_CH_CC2_PD);
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */
diff --git a/board/zinger/board.h b/board/zinger/board.h
index 1b94b30064..a00731f16c 100644
--- a/board/zinger/board.h
+++ b/board/zinger/board.h
@@ -8,8 +8,8 @@
  * including zinger and minimuffin.
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
 
 /* 48 MHz SYSCLK clock frequency */
 #define CPU_CLOCK 48000000
@@ -133,4 +133,4 @@ void __enter_hibernate(uint32_t seconds, uint32_t microseconds);
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* __BOARD_H */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/zinger/debug.h b/board/zinger/debug.h
index fcc000a20d..38cea6fb28 100644
--- a/board/zinger/debug.h
+++ b/board/zinger/debug.h
@@ -4,8 +4,8 @@
  */
 /* Synchronous UART debug printf */
 
-#ifndef __BOARD_ZINGER_DEBUG_H
-#define __BOARD_ZINGER_DEBUG_H
+#ifndef __CROS_EC_DEBUG_H
+#define __CROS_EC_DEBUG_H
 
 #ifdef CONFIG_DEBUG_PRINTF
 void debug_printf(const char *format, ...);
@@ -13,4 +13,4 @@ void debug_printf(const char *format, ...);
 #define debug_printf(...)
 #endif
 
-#endif /* __BOARD_ZINGER_DEBUG_H */
+#endif /* __CROS_EC_DEBUG_H */
diff --git a/board/zinger/usb_pd_config.h b/board/zinger/usb_pd_config.h
index 7541285429..fbe24e0003 100644
--- a/board/zinger/usb_pd_config.h
+++ b/board/zinger/usb_pd_config.h
@@ -5,8 +5,8 @@
 
 /* USB Power delivery board configuration */
 
-#ifndef __USB_PD_CONFIG_H
-#define __USB_PD_CONFIG_H
+#ifndef __CROS_EC_USB_PD_CONFIG_H
+#define __CROS_EC_USB_PD_CONFIG_H
 
 /* Timer selection for baseband PD communication */
 #define TIM_CLOCK_PD_TX_C0 14
@@ -106,4 +106,4 @@ static inline int pd_adc_read(int port, int cc)
 	return (cc == 0) ? adc_read_channel(ADC_CH_CC1_PD) : 4096;
 }
 
-#endif /* __USB_PD_CONFIG_H */
+#endif /* __CROS_EC_USB_PD_CONFIG_H */