diff --git a/server/include/log.h b/server/include/log.h
index bde122b48..55b524563 100644
--- a/server/include/log.h
+++ b/server/include/log.h
@@ -14,9 +14,9 @@
 #include <libconfig.h>
 
 #ifdef __GNUC__
- #define INDENT		int __attribute__ ((__cleanup__(log_outdent), unused)) _old_indent = log_indent(1);
+  #define INDENT		int __attribute__ ((__cleanup__(log_outdent), unused)) _old_indent = log_indent(1);
 #else
- #define INDENT		;
+  #define INDENT		;
 #endif
 
 /* The log level which is passed as first argument to print() */
diff --git a/server/include/msg_format.h b/server/include/msg_format.h
index d7b41d6cc..86f68d68a 100644
--- a/server/include/msg_format.h
+++ b/server/include/msg_format.h
@@ -13,10 +13,10 @@
 #include <stdint.h>
 
 #ifdef __linux__
- #define _BSD_SOURCE    	1
- #include <endian.h>
+  #define _BSD_SOURCE    	1
+  #include <endian.h>
 #elif defined(__PPC__) /* Xilinx toolchain */
- #include <lwip/arch.h>
+  #include <lwip/arch.h>
 #endif
 
 #include "config.h"
diff --git a/server/include/utils.h b/server/include/utils.h
index 142148022..c0bff7f4c 100644
--- a/server/include/utils.h
+++ b/server/include/utils.h
@@ -16,9 +16,9 @@
 #include "log.h"
 
 #ifdef __GNUC__
- #define EXPECT(x, v)	__builtin_expect(x, v)
+  #define EXPECT(x, v)	__builtin_expect(x, v)
 #else
- #define EXPECT(x, v)	(x)
+  #define EXPECT(x, v)	(x)
 #endif
 
 /* Some color escape codes for pretty log messages */
diff --git a/server/src/cfg.c b/server/src/cfg.c
index 80a419a45..aed896637 100644
--- a/server/src/cfg.c
+++ b/server/src/cfg.c
@@ -21,10 +21,10 @@
 #include "socket.h"
 #include "file.h"
 #ifdef ENABLE_GTFPGA
- #include "gtfpga.h"
+  #include "gtfpga.h"
 #endif
 #ifdef ENABLE_OPAL_ASYNC
- #include "opal.h"
+  #include "opal.h"
 #endif
 
 int config_parse(const char *filename, config_t *cfg, struct settings *set,
diff --git a/server/src/log.c b/server/src/log.c
index 068830838..4a7b96073 100644
--- a/server/src/log.c
+++ b/server/src/log.c
@@ -19,8 +19,8 @@
 #ifdef ENABLE_OPAL_ASYNC
 /* Define RTLAB before including OpalPrint.h for messages to be sent
  * to the OpalDisplay. Otherwise stdout will be used. */
- #define RTLAB
- #include "OpalPrint.h"
+  #define RTLAB
+  #include "OpalPrint.h"
 #endif
 
 /** Debug level used by the debug() macro.
diff --git a/server/src/msg.c b/server/src/msg.c
index e737175ac..7df3df117 100644
--- a/server/src/msg.c
+++ b/server/src/msg.c
@@ -11,10 +11,10 @@
 #include <ctype.h>
 
 #ifdef __linux__
- #include <byteswap.h>
+  #include <byteswap.h>
 #elif defined(__PPC__) /* Xilinx toolchain */
- #include <xil_io.h>
- #define bswap_32(x)	Xil_EndianSwap32(x)
+  #include <xil_io.h>
+  #define bswap_32(x)	Xil_EndianSwap32(x)
 #endif
 
 #include "msg.h"
diff --git a/server/src/node.c b/server/src/node.c
index 94d3e9281..491fb444b 100644
--- a/server/src/node.c
+++ b/server/src/node.c
@@ -15,11 +15,12 @@
 /* Node types */
 #include "file.h"
 #include "socket.h"
+
 #ifdef ENABLE_GTFPGA
-#include "gtfpga.h"
+  #include "gtfpga.h"
 #endif
 #ifdef ENABLE_OPAL_ASYNC
-#include "opal.h"
+  #include "opal.h"
 #endif
 
 #define VTABLE(type, name, fnc) { type, name, \
diff --git a/server/src/server.c b/server/src/server.c
index 3f4ac8a1a..647695f61 100644
--- a/server/src/server.c
+++ b/server/src/server.c
@@ -21,7 +21,7 @@
 #include "license.h"
 
 #ifdef ENABLE_OPAL_ASYNC
-#include "opal.h"
+  #include "opal.h"
 #endif
 
 /** Linked list of nodes */