diff --git a/server/include/checks.h b/server/include/checks.h
index b4089554e..06c0181cd 100644
--- a/server/include/checks.h
+++ b/server/include/checks.h
@@ -63,4 +63,4 @@ int check_license_time();
 
 int check_license_trace();
 
-#endif
+#endif /* _CHECKS_H_ */
diff --git a/server/include/config.h b/server/include/config.h
index 5a54b960e..5dec0bcd8 100644
--- a/server/include/config.h
+++ b/server/include/config.h
@@ -14,7 +14,7 @@
 #define _CONFIG_H_
 
 #ifndef _GIT_REV
- #define _GIT_REV		"nogit"
+  #define _GIT_REV		"nogit"
 #endif
 
 /** The version number of the s2ss server */
diff --git a/server/include/if.h b/server/include/if.h
index a01ecafa7..f76daba68 100644
--- a/server/include/if.h
+++ b/server/include/if.h
@@ -21,7 +21,7 @@
 #define IF_IRQ_MAX	3	 /**< Maxmimal number of IRQs of an interface */
 
 #ifndef SO_MARK
- #define SO_MARK	36	/**< Workaround: add missing constant for OPAL-RT Redhawk target */
+  #define SO_MARK	36	/**< Workaround: add missing constant for OPAL-RT Redhawk target */
 #endif
 
 struct socket;
diff --git a/server/include/msg_format.h b/server/include/msg_format.h
index efbdc7af9..e0cc9dbeb 100644
--- a/server/include/msg_format.h
+++ b/server/include/msg_format.h
@@ -37,11 +37,11 @@
 #define MSG_ENDIAN_BIG		1 /**< Message values are in bit endian format */
 
 #if BYTE_ORDER == LITTLE_ENDIAN
- #define MSG_ENDIAN_HOST	MSG_ENDIAN_LITTLE
+  #define MSG_ENDIAN_HOST	MSG_ENDIAN_LITTLE
 #elif BYTE_ORDER == BIG_ENDIAN
- #define MSG_ENDIAN_HOST	MSG_ENDIAN_BIG
+  #define MSG_ENDIAN_HOST	MSG_ENDIAN_BIG
 #else
- #error "Unknown byte order!"
+  #error "Unknown byte order!"
 #endif
 
 /** The total length of a message */
diff --git a/server/include/nl.h b/server/include/nl.h
index 599d08147..cc4348e2b 100644
--- a/server/include/nl.h
+++ b/server/include/nl.h
@@ -27,4 +27,4 @@ struct nl_sock * nl_init();
 /** Close and free global netlink socket. */
 void nl_shutdown();
 
-#endif
\ No newline at end of file
+#endif /* _NL_H_ */
\ No newline at end of file
diff --git a/server/include/stats.h b/server/include/stats.h
index 992a45a2e..c0476c4f1 100644
--- a/server/include/stats.h
+++ b/server/include/stats.h
@@ -33,4 +33,4 @@ int stats_stop(struct path *p);
 /** Reset all statistic counters to zero */
 int stats_reset(struct path *p);
 
-#endif
\ No newline at end of file
+#endif /* _STATS_H_ */
\ No newline at end of file
diff --git a/server/include/timing.h b/server/include/timing.h
index ce52e09a7..f8061182b 100644
--- a/server/include/timing.h
+++ b/server/include/timing.h
@@ -54,4 +54,4 @@ int time_fscan(FILE *f, struct timespec *ts);
 /** Write a timestamp to a file with the format: "secs.nanosecs\t" */
 int time_fprint(FILE *f, struct timespec *ts);
 
-#endif
\ No newline at end of file
+#endif /* _TIMING_H_ */
\ No newline at end of file
diff --git a/server/src/hooks.c b/server/src/hooks.c
index 9b2e6b423..8587fb8f8 100644
--- a/server/src/hooks.c
+++ b/server/src/hooks.c
@@ -64,7 +64,7 @@ int hook_tofixed(struct path *p)
 {
 	struct msg *m = p->current;
 
-	for (int i=0; i<m->length; i++)
+	for (int i = 0; i < m->length; i++)
 		m->data[i].i = m->data[i].f * 1e3;
 
 	return 0;
@@ -97,7 +97,7 @@ int hook_fir(struct path *p)
 	/** Trim FIR length to length of history buffer */
 	int len = MIN(ARRAY_LEN(coeffs), p->poolsize);
 
-	for (int i=0; i<len; i++) {
+	for (int i = 0; i < len; i++) {
 		struct msg *old = &p->pool[(p->poolsize+p->received-i) % p->poolsize];
 
 		sum += coeffs[i] * old->data[HOOK_FIR_INDEX].f;
@@ -114,10 +114,9 @@ int hook_decimate(struct path *p)
 	return p->received % HOOK_DECIMATE_RATIO;
 }
 
-/** @todo Implement */
 int hook_dft(struct path *p)
 {
-	return 0;
+	return 0; /** @todo Implement */
 }
 
 /** System hooks */
diff --git a/server/src/path.c b/server/src/path.c
index 37a20cc13..0d764bca5 100644
--- a/server/src/path.c
+++ b/server/src/path.c
@@ -16,7 +16,7 @@
 #include "stats.h"
 
 #ifndef sigev_notify_thread_id
- #define sigev_notify_thread_id   _sigev_un._tid
+  #define sigev_notify_thread_id   _sigev_un._tid
 #endif
 
 extern struct settings settings;