diff --git a/.clang-format b/.clang-format
index 6da79a0..0683c55 100644
--- a/.clang-format
+++ b/.clang-format
@@ -67,6 +67,7 @@
     Priority: 1
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
+IndentExternBlock: NoIndent
 #IndentPPDirectives: None # Unknown to clang-format-5.0
 IndentWidth: 8
 IndentWrappedFunctionNames: false
diff --git a/include/libpldm/base.h b/include/libpldm/base.h
index 9264d29..8ec821f 100644
--- a/include/libpldm/base.h
+++ b/include/libpldm/base.h
@@ -132,8 +132,8 @@
 	uint8_t type : 6;	//!< PLDM type
 	uint8_t header_ver : 2; //!< Header version
 #elif defined(__BIG_ENDIAN_BITFIELD)
-	uint8_t header_ver : 2;	 //!< Header version
-	uint8_t type : 6;	 //!< PLDM type
+	uint8_t header_ver : 2; //!< Header version
+	uint8_t type : 6;	//!< PLDM type
 #endif
 	uint8_t command; //!< PLDM command code
 } __attribute__((packed));
diff --git a/src/utils.c b/src/utils.c
index 2f46b75..f6a2b7b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -106,7 +106,7 @@
 }
 
 #define BCD_H(v)       (((v) >> 4) & 0xf)
-#define BCD_L(v)       ((v)&0xf)
+#define BCD_L(v)       ((v) & 0xf)
 #define AS_CHAR(digit) ((digit) + '0')
 #define INSERT_CHAR(c, b, n)                                                   \
 	{                                                                      \