diff --git a/src/include/bootstate.h b/src/include/bootstate.h
index 679633cfa3..66f3dcc70d 100644
--- a/src/include/bootstate.h
+++ b/src/include/bootstate.h
@@ -183,7 +183,7 @@ struct boot_state_init_entry {
 };
 
 #if ENV_RAMSTAGE
-#define BOOT_STATE_INIT_ATTR  __attribute__ ((used,section (".bs_init")))
+#define BOOT_STATE_INIT_ATTR  __attribute__ ((used, section (".bs_init")))
 #else
 #define BOOT_STATE_INIT_ATTR  __attribute__ ((unused))
 #endif
diff --git a/src/include/console/vtxprintf.h b/src/include/console/vtxprintf.h
index 33361985ef..ebef43784c 100644
--- a/src/include/console/vtxprintf.h
+++ b/src/include/console/vtxprintf.h
@@ -22,9 +22,9 @@
  * On LLVM we can still just include stdarg.h.
  */
 #ifdef __GNUC__
-#define va_start(v,l)		__builtin_va_start(v,l)
+#define va_start(v, l)		__builtin_va_start(v, l)
 #define va_end(v)		__builtin_va_end(v)
-#define va_arg(v,l)		__builtin_va_arg(v,l)
+#define va_arg(v, l)		__builtin_va_arg(v, l)
 typedef __builtin_va_list	va_list;
 #else
 #include <stdarg.h>
diff --git a/src/include/cpu/amd/model_fxx_rev.h b/src/include/cpu/amd/model_fxx_rev.h
index 6bb8b43c1c..e34b4ed649 100644
--- a/src/include/cpu/amd/model_fxx_rev.h
+++ b/src/include/cpu/amd/model_fxx_rev.h
@@ -80,7 +80,7 @@ static inline int is_e0_later_in_bsp(int nodeid)
 
 	// d0 will be treated as e0 with this methods, but the d0 nb_cfg_54 always 0
 	pci_devfn_t dev;
-	dev = PCI_DEV(0, 0x18+nodeid,2);
+	dev = PCI_DEV(0, 0x18+nodeid, 2);
 	val_old = pci_read_config32(dev, 0x80);
 	val = val_old;
 	val |= (1<<3);
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index dd89a8cc88..d5468549d7 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -10,7 +10,7 @@ void initialize_cpus(struct bus *cpu_bus);
 void asmlinkage secondary_cpu_init(unsigned int cpu_index);
 int cpu_phys_address_size(void);
 
-#define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver")))
+#define __cpu_driver __attribute__ ((used, __section__(".rodata.cpu_driver")))
 #ifndef __SIMPLE_DEVICE__
 /** start of compile time generated pci driver array */
 extern struct cpu_driver _cpu_drivers[];
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index dfcb4da032..69a6738c8c 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -67,7 +67,7 @@ void stop_this_cpu(void);
 
 #if !defined(__PRE_RAM__)
 
-#define xchg(ptr,v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v),(ptr),sizeof(*(ptr))))
+#define xchg(ptr, v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v), (ptr), sizeof(*(ptr))))
 
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((struct __xchg_dummy *)(x))
@@ -111,11 +111,11 @@ static inline void lapic_write_atomic(unsigned long reg, unsigned long v)
 #ifdef X86_GOOD_APIC
 # define FORCE_READ_AROUND_WRITE 0
 # define lapic_read_around(x) lapic_read(x)
-# define lapic_write_around(x,y) lapic_write((x),(y))
+# define lapic_write_around(x, y) lapic_write((x), (y))
 #else
 # define FORCE_READ_AROUND_WRITE 1
 # define lapic_read_around(x) lapic_read(x)
-# define lapic_write_around(x,y) lapic_write_atomic((x),(y))
+# define lapic_write_around(x, y) lapic_write_atomic((x), (y))
 #endif
 
 static inline int lapic_remote_read(int apicid, int reg, unsigned long *pvalue)
diff --git a/src/include/cpu/x86/lapic_def.h b/src/include/cpu/x86/lapic_def.h
index 2b1ca5a13f..ec1ca6e359 100644
--- a/src/include/cpu/x86/lapic_def.h
+++ b/src/include/cpu/x86/lapic_def.h
@@ -75,7 +75,7 @@
 #define		LAPIC_DELIVERY_MODE_NMI		(4<<8)
 #define		LAPIC_DELIVERY_MODE_EXTINT	(7<<8)
 #define		GET_LAPIC_DELIVERY_MODE(x)	(((x)>>8)&0x7)
-#define		SET_LAPIC_DELIVERY_MODE(x,y)	(((x)&~0x700)|((y)<<8))
+#define		SET_LAPIC_DELIVERY_MODE(x, y)	(((x)&~0x700)|((y)<<8))
 #define			LAPIC_MODE_FIXED		0x0
 #define			LAPIC_MODE_NMI		0x4
 #define			LAPIC_MODE_EXINT		0x7
diff --git a/src/include/device/azalia.h b/src/include/device/azalia.h
index 2af4696cd0..0ac4fcd8a7 100644
--- a/src/include/device/azalia.h
+++ b/src/include/device/azalia.h
@@ -113,7 +113,7 @@ enum AzaliaPinCfgMisc {
 
 union AzaliaPinConfiguration {
 	unsigned int value;
-	struct __attribute__((aligned(4),packed)) {
+	struct __attribute__((aligned(4), packed)) {
 		enum AzaliaPinCfgPortConnectivity   port:2;
 		unsigned char                       location:6;
 		enum AzaliaPinCfgDefaultDevice      device:4;
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index 8dc7c46d35..13d63d4f6c 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -54,7 +54,7 @@ struct pci_driver {
 	const unsigned short *devices;
 };
 
-#define __pci_driver __attribute__ ((used,__section__(".rodata.pci_driver")))
+#define __pci_driver __attribute__ ((used, __section__(".rodata.pci_driver")))
 /** start of compile time generated pci driver array */
 extern struct pci_driver _pci_drivers[];
 /** end of compile time generated pci driver array */
diff --git a/src/include/device/pci_def.h b/src/include/device/pci_def.h
index ef3427b4e7..e11470c695 100644
--- a/src/include/device/pci_def.h
+++ b/src/include/device/pci_def.h
@@ -479,7 +479,7 @@
  *	7:3 = slot
  *	2:0 = function
  */
-#define PCI_DEVFN(slot,func)	((((slot) & 0x1f) << 3) | ((func) & 0x07))
+#define PCI_DEVFN(slot, func)	((((slot) & 0x1f) << 3) | ((func) & 0x07))
 #define PCI_SLOT(devfn)		(((devfn) >> 3) & 0x1f)
 #define PCI_FUNC(devfn)		((devfn) & 0x07)
 
diff --git a/src/include/device/resource.h b/src/include/device/resource.h
index 7160eec74a..1a8c451982 100644
--- a/src/include/device/resource.h
+++ b/src/include/device/resource.h
@@ -46,10 +46,10 @@ struct resource {
 };
 
 /* Macros to generate index values for resources */
-#define IOINDEX_SUBTRACTIVE(IDX,LINK) (0x10000000 + ((IDX) << 8) + LINK)
+#define IOINDEX_SUBTRACTIVE(IDX, LINK) (0x10000000 + ((IDX) << 8) + LINK)
 #define IOINDEX_SUBTRACTIVE_LINK(IDX) (IDX & 0xff)
 
-#define IOINDEX(IDX,LINK) (((LINK) << 16) + IDX)
+#define IOINDEX(IDX, LINK) (((LINK) << 16) + IDX)
 #define IOINDEX_LINK(IDX) (( IDX & 0xf0000) >> 16)
 #define IOINDEX_IDX(IDX) (IDX & 0xffff)
 
diff --git a/src/include/reg_script.h b/src/include/reg_script.h
index d7ed326af3..d1e0e1a2dc 100644
--- a/src/include/reg_script.h
+++ b/src/include/reg_script.h
@@ -107,7 +107,7 @@ struct reg_script_bus_entry {
 	void (*reg_script_write)(struct reg_script_context *ctx);
 };
 
-#define REG_SCRIPT_TABLE_ATTRIBUTE __attribute__ ((used,section (".rsbe_init")))
+#define REG_SCRIPT_TABLE_ATTRIBUTE __attribute__ ((used, section (".rsbe_init")))
 
 #define REG_SCRIPT_BUS_ENTRY(bus_entry_)				\
 	const struct reg_script_bus_entry *rsbe_ ## bus_entry_ 	\
diff --git a/src/include/smp/atomic.h b/src/include/smp/atomic.h
index bc50534442..56df9f59ac 100644
--- a/src/include/smp/atomic.h
+++ b/src/include/smp/atomic.h
@@ -29,7 +29,7 @@ typedef struct { int counter; } atomic_t;
  * Atomically sets the value of v to i.  Note that the guaranteed
  * useful range of an atomic_t is only 24 bits.
  */
-#define atomic_set(v,i)		(((v)->counter) = (i))
+#define atomic_set(v, i)	(((v)->counter) = (i))
 
 
 /**
diff --git a/src/include/stdlib.h b/src/include/stdlib.h
index d6e7fafb25..81b805f8c4 100644
--- a/src/include/stdlib.h
+++ b/src/include/stdlib.h
@@ -3,8 +3,8 @@
 
 #include <stddef.h>
 
-#define min(a,b) MIN((a),(b))
-#define max(a,b) MAX((a),(b))
+#define min(a, b) MIN((a), (b))
+#define max(a, b) MAX((a), (b))
 
 void *memalign(size_t boundary, size_t size);
 void *malloc(size_t size);