diff --git a/include/villas/fpga/dft.h b/include/villas/fpga/dft.h
index 017117c99..52edfb37b 100644
--- a/include/villas/fpga/dft.h
+++ b/include/villas/fpga/dft.h
@@ -7,8 +7,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  **********************************************************************************/
  
-#ifndef _DFT_H_
-#define _DFT_H_
+#ifndef _FPGA_DFT_H_
+#define _FPGA_DFT_H_
 
 #include <xilinx/xhls_dft.h>
 
@@ -31,4 +31,4 @@ int dft_init(struct ip *c);
 void dft_destroy(struct ip *c);
 
 
-#endif /* _DFT_H_ */
\ No newline at end of file
+#endif /* _FPGA_DFT_H_ */
\ No newline at end of file
diff --git a/include/villas/fpga/dma.h b/include/villas/fpga/dma.h
index 1d3a215e1..172d80dba 100644
--- a/include/villas/fpga/dma.h
+++ b/include/villas/fpga/dma.h
@@ -9,8 +9,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  **********************************************************************************/
 
-#ifndef _DMA_H_
-#define _DMA_H_
+#ifndef _FPGA_DMA_H_
+#define _FPGA_DMA_H_
  
 #include <stdlib.h>
 #include <stdint.h>
@@ -65,4 +65,4 @@ int dma_ping_pong(struct ip *c, char *src, char *dst, size_t len);
 
 int dma_init(struct ip *c);
 
-#endif /* _DMA_H_ */
\ No newline at end of file
+#endif /* _FPGA_DMA_H_ */
\ No newline at end of file
diff --git a/include/villas/fpga/fifo.h b/include/villas/fpga/fifo.h
index 597cd9a04..1872fa488 100644
--- a/include/villas/fpga/fifo.h
+++ b/include/villas/fpga/fifo.h
@@ -9,8 +9,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  **********************************************************************************/
 
-#ifndef _FIFO_H_
-#define _FIFO_H_
+#ifndef _FPGA_FIFO_H_
+#define _FPGA_FIFO_H_
 
 #include <sys/types.h>
 
@@ -32,4 +32,4 @@ ssize_t fifo_write(struct ip *c, char *buf, size_t len);
 
 ssize_t fifo_read(struct ip *c, char *buf, size_t len);
 
-#endif /* _FIFO_H_ */
\ No newline at end of file
+#endif /* _FPGA_FIFO_H_ */
\ No newline at end of file
diff --git a/include/villas/fpga/intc.h b/include/villas/fpga/intc.h
index da08afcd7..626fe07d6 100644
--- a/include/villas/fpga/intc.h
+++ b/include/villas/fpga/intc.h
@@ -6,8 +6,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  **********************************************************************************/
 
-#ifndef _INTC_H_
-#define _INTC_H_
+#ifndef _FPGA_INTC_H_
+#define _FPGA_INTC_H_
 
 #include <xilinx/xintc.h>
 
@@ -35,4 +35,4 @@ int intc_disable(struct ip *c, uint32_t mask);
 
 uint64_t intc_wait(struct ip *c, int irq);
 
-#endif /* _INTC_H_ */
\ No newline at end of file
+#endif /* _FPGA_INTC_H_ */
\ No newline at end of file
diff --git a/include/villas/fpga/ip.h b/include/villas/fpga/ip.h
index a573709c1..c3d2570aa 100644
--- a/include/villas/fpga/ip.h
+++ b/include/villas/fpga/ip.h
@@ -1,5 +1,5 @@
-#ifndef _IP_H_
-#define _IP_H_
+#ifndef _FPGA_IP_H_
+#define _FPGA_IP_H_
 
 #include <stdint.h>
 
@@ -98,4 +98,4 @@ int ip_reset(struct ip *c);
 
 int ip_parse(struct ip *c, config_setting_t *cfg);
 
-#endif
\ No newline at end of file
+#endif /* _FPGA_IP_H_ */
\ No newline at end of file
diff --git a/include/villas/fpga/model.h b/include/villas/fpga/model.h
index f4269046c..5270d626a 100644
--- a/include/villas/fpga/model.h
+++ b/include/villas/fpga/model.h
@@ -7,8 +7,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  *********************************************************************************/
  
-#ifndef _MODEL_H_
-#define _MODEL_H_
+#ifndef _FPGA_MODEL_H_
+#define _FPGA_MODEL_H_
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -123,4 +123,4 @@ int model_param_write(struct model_param *p, double v);
 
 int model_param_update(struct model_param *p, struct model_param *u);
 
-#endif /* _MODEL_H_ */
\ No newline at end of file
+#endif /* _FPGA_MODEL_H_ */
\ No newline at end of file
diff --git a/include/villas/fpga/rtds_axis.h b/include/villas/fpga/rtds_axis.h
index 85bf10f32..ecd6072fc 100644
--- a/include/villas/fpga/rtds_axis.h
+++ b/include/villas/fpga/rtds_axis.h
@@ -7,8 +7,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  **********************************************************************************/
 
-#ifndef _RTDS_AXIS_H_
-#define _RTDS_AXIS_H_
+#ifndef _FPGA_RTDS_AXIS_H_
+#define _FPGA_RTDS_AXIS_H_
 
 /* Forward declaration */
 struct ip;
@@ -42,4 +42,4 @@ void rtds_axis_dump(struct ip *c);
 
 double rtds_axis_dt(struct ip *c);
 
-#endif /* _RTDS_AXIS_H_ */
\ No newline at end of file
+#endif /* _FPGA_RTDS_AXIS_H_ */
\ No newline at end of file
diff --git a/include/villas/fpga/switch.h b/include/villas/fpga/switch.h
index dd2a9b8ac..fe109ad83 100644
--- a/include/villas/fpga/switch.h
+++ b/include/villas/fpga/switch.h
@@ -9,8 +9,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  **********************************************************************************/
 
-#ifndef _SWITCH_H_
-#define _SWITCH_H_
+#ifndef _FPGA_SWITCH_H_
+#define _FPGA_SWITCH_H_
 
 #include <xilinx/xaxis_switch.h>
 
@@ -46,4 +46,4 @@ int switch_connect(struct ip *c, struct ip *mi, struct ip *si);
 
 int switch_disconnect(struct ip *c, struct ip *mi, struct ip *si);
 
-#endif /* _SWITCH_H_ */
\ No newline at end of file
+#endif /* _FPGA_SWITCH_H_ */
\ No newline at end of file
diff --git a/include/villas/fpga/timer.h b/include/villas/fpga/timer.h
index b818c0058..27cc37b98 100644
--- a/include/villas/fpga/timer.h
+++ b/include/villas/fpga/timer.h
@@ -9,11 +9,11 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  **********************************************************************************/
 
-#ifndef _TIMER_H_
-#define _TIMER_H_
+#ifndef _FPGA_TIMER_H_
+#define _FPGA_TIMER_H_
 
 struct timer {
 	XTmrCtr inst;
 };
 
-#endif
\ No newline at end of file
+#endif /* _FPGA_TIMER_H_ */
\ No newline at end of file
diff --git a/include/villas/kernel/if.h b/include/villas/kernel/if.h
index 3d676694b..6099b0280 100644
--- a/include/villas/kernel/if.h
+++ b/include/villas/kernel/if.h
@@ -10,8 +10,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
-#ifndef _IF_H_
-#define _IF_H_
+#ifndef _KERNEL_IF_H_
+#define _KERNEL_IF_H_
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -106,4 +106,4 @@ int if_get_irqs(struct interface *i);
  */
 int if_set_affinity(struct interface *i, int affinity);
 
-#endif /* _IF_H_ */
+#endif /* _KERNEL_IF_H_ */
diff --git a/include/villas/kernel/kernel.h b/include/villas/kernel/kernel.h
index 10e750468..86d99406d 100644
--- a/include/villas/kernel/kernel.h
+++ b/include/villas/kernel/kernel.h
@@ -7,8 +7,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  *********************************************************************************/
 
-#ifndef _LINUX_H_
-#define _LINUX_H_
+#ifndef _KERNEL_KERNEL_H_
+#define _KERNEL_KERNEL_H_
 
 #include <stdint.h>
 
@@ -69,4 +69,4 @@ int kernel_get_cacheline_size();
 /** Set SMP affinity of IRQ */
 int kernel_irq_setaffinity(unsigned irq, uintmax_t new, uintmax_t *old);
 
-#endif /* _LINUX_H_ */
+#endif /* _KERNEL_KERNEL_H_ */
diff --git a/include/villas/kernel/nl.h b/include/villas/kernel/nl.h
index 6e1fb055e..1e7593626 100644
--- a/include/villas/kernel/nl.h
+++ b/include/villas/kernel/nl.h
@@ -7,8 +7,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
-#ifndef _NL_H_
-#define _NL_H_
+#ifndef _KERNEL_NL_H_
+#define _KERNEL_NL_H_
 
 #include <netlink/netlink.h>
 #include <netlink/route/route.h>
@@ -27,4 +27,4 @@ struct nl_sock * nl_init();
 /** Close and free global netlink socket. */
 void nl_shutdown();
 
-#endif /* _NL_H_ */
\ No newline at end of file
+#endif /* _KERNEL_NL_H_ */
\ No newline at end of file
diff --git a/include/villas/kernel/pci.h b/include/villas/kernel/pci.h
index 747f5c488..acb0bab39 100644
--- a/include/villas/kernel/pci.h
+++ b/include/villas/kernel/pci.h
@@ -7,8 +7,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  **********************************************************************************/
 
-#ifndef _PCI_H_
-#define _PCI_H_
+#ifndef _KERNEL_PCI_H_
+#define _KERNEL_PCI_H_
 
 #include "list.h"
 
@@ -64,4 +64,4 @@ int pci_attach_driver(struct pci_dev *d, const char *driver);
 /** Return the IOMMU group of this PCI device or -1 if the device is not in a group. */
 int pci_get_iommu_group(struct pci_dev *d);
 
-#endif /* _PCI_H_ */
\ No newline at end of file
+#endif /* _KERNEL_PCI_H_ */
\ No newline at end of file
diff --git a/include/villas/kernel/rt.h b/include/villas/kernel/rt.h
index 0c0f833cd..dc6d0ae77 100644
--- a/include/villas/kernel/rt.h
+++ b/include/villas/kernel/rt.h
@@ -7,9 +7,9 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
-#ifndef _RT_H_
-#define _RT_H_
+#ifndef _KERNEL_RT_H_
+#define _KERNEL_RT_H_
 
 int rt_init(int affinity, int priority);
 
-#endif /* _RT_H_ */
\ No newline at end of file
+#endif /* _KERNEL_RT_H_ */
\ No newline at end of file
diff --git a/include/villas/kernel/tc.h b/include/villas/kernel/tc.h
index 973da527b..147e7dc80 100644
--- a/include/villas/kernel/tc.h
+++ b/include/villas/kernel/tc.h
@@ -12,8 +12,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  *********************************************************************************/
 
-#ifndef _TC_H_
-#define _TC_H_
+#ifndef _KERNEL_TC_H_
+#define _KERNEL_TC_H_
 
 #include <stdint.h>
 
diff --git a/include/villas/kernel/vfio.h b/include/villas/kernel/vfio.h
index 7f1a227aa..928f518cb 100644
--- a/include/villas/kernel/vfio.h
+++ b/include/villas/kernel/vfio.h
@@ -7,8 +7,8 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  *********************************************************************************/
 
-#ifndef _VFIO_H_
-#define _VFIO_H_
+#ifndef _KERNEL_VFIO_H_
+#define _KERNEL_VFIO_H_
 
 #include <stdbool.h>
 #include <sys/mman.h>
@@ -110,4 +110,4 @@ int vfio_unmap_dma(struct vfio_container *c, struct dma_mem *mem);
 /** munmap() a region which has been mapped by vfio_map_region() */
 int vfio_unmap_region(struct vfio_dev *d, int idx);
 
-#endif /* _VFIO_H_ */
+#endif /* _KERNEL_VFIO_H_ */
diff --git a/include/villas/nodes/cbuilder.h b/include/villas/nodes/cbuilder.h
index 8fdf3296c..57b36a268 100644
--- a/include/villas/nodes/cbuilder.h
+++ b/include/villas/nodes/cbuilder.h
@@ -5,10 +5,15 @@
  * @copyright 2015-2016, Steffen Vogel
  *   This file is part of VILLASnode. All Rights Reserved. Proprietary and confidential.
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
- **********************************************************************************/
+ */
+/**
+ * @addtogroup cbuilder RTDS CBuilder model node
+ * @ingroup node
+ * @{
+ *********************************************************************************/
  
-#ifndef _CBUILDER_H_
-#define _CBUILDER_H_
+#ifndef _NODES_CBUILDER_H_
+#define _NODES_CBUILDER_H_
 
 #include <pthread.h>
 
@@ -52,4 +57,4 @@ struct cbmodel {
 	int (*write)(float outputs[], int len);
 };
 
-#endif /* _CBUILDER_H_ */
\ No newline at end of file
+#endif /** _NODES_CBUILDER_H_ @} */
\ No newline at end of file
diff --git a/include/villas/nodes/file.h b/include/villas/nodes/file.h
index 3eba00fa6..70e0e5e7b 100644
--- a/include/villas/nodes/file.h
+++ b/include/villas/nodes/file.h
@@ -15,8 +15,8 @@
  *********************************************************************************/
 
 
-#ifndef _FILE_H_
-#define _FILE_H_
+#ifndef _NODES_FILE_H_
+#define _NODES_FILE_H_
 
 #include "node.h"
 
@@ -73,4 +73,4 @@ int file_read(struct node *n, struct sample *smps[], unsigned cnt);
 /** @see node_vtable::write */
 int file_write(struct node *n, struct sample *smps[], unsigned cnt);
 
-#endif /** _FILE_H_ @} */
+#endif /** _NODES_FILE_H_ @} */
diff --git a/include/villas/nodes/fpga.h b/include/villas/nodes/fpga.h
index 0dadcfd94..752d0b57c 100644
--- a/include/villas/nodes/fpga.h
+++ b/include/villas/nodes/fpga.h
@@ -9,13 +9,13 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited. 
  */
 /**
- * @addtogroup fpga VILLASnode
+ * @addtogroup fpga VILLASfpga
  * @ingroup node
  * @{
  *********************************************************************************/
 
-#ifndef _FPGA_H_
-#define _FPGA_H_
+#ifndef _NODES_FPGA_H_
+#define _NODES_FPGA_H_
 
 #include "kernel/vfio.h"
 #include "kernel/pci.h"
@@ -101,4 +101,4 @@ int fpga_reset(struct fpga *f);
 /** Dump some details about the fpga card */
 void fpga_dump(struct fpga *f);
 
-#endif /** _FPGA_H_ @} */
+#endif /** _NODES_FPGA_H_ @} */
diff --git a/include/villas/nodes/ngsi.h b/include/villas/nodes/ngsi.h
index 807904a87..f40b5a257 100644
--- a/include/villas/nodes/ngsi.h
+++ b/include/villas/nodes/ngsi.h
@@ -18,8 +18,8 @@
  * @{
  **********************************************************************************/
 
-#ifndef _NGSI_H_
-#define _NGSI_H_
+#ifndef _NODES_NGSI_H_
+#define _NODES_NGSI_H_
 
 #include <curl/curl.h>
 #include <jansson.h>
@@ -81,4 +81,4 @@ int ngsi_read(struct node *n, struct sample *smps[], unsigned cnt);
 /** @see node_vtable::write */
 int ngsi_write(struct node *n, struct sample *smps[], unsigned cnt);
 
-#endif /** _NGSI_H_ @} */
\ No newline at end of file
+#endif /** _NODES_NGSI_H_ @} */
\ No newline at end of file
diff --git a/include/villas/nodes/opal.h b/include/villas/nodes/opal.h
index 9ae48de9d..dd3a5b704 100644
--- a/include/villas/nodes/opal.h
+++ b/include/villas/nodes/opal.h
@@ -14,8 +14,8 @@
  * @{
  **********************************************************************************/
 
-#ifndef _OPAL_H_
-#define _OPAL_H_
+#ifndef _NODES_OPAL_H_
+#define _NODES_OPAL_H_
 
 #include <pthread.h>
 
@@ -73,4 +73,4 @@ int opal_read(struct node *n, struct sample *smps[], unsigned cnt);
 /** @see node_vtable::write */
 int opal_write(struct node *n, struct sample *smps[], unsigned cnt);
 
-#endif /** _OPAL_H_ @} */
+#endif /** _NODES_OPAL_H_ @} */
diff --git a/include/villas/nodes/socket.h b/include/villas/nodes/socket.h
index 9f5cc7750..00a80d7b9 100644
--- a/include/villas/nodes/socket.h
+++ b/include/villas/nodes/socket.h
@@ -14,8 +14,8 @@
  * @{
  *********************************************************************************/
 
-#ifndef _SOCKET_H_
-#define _SOCKET_H_
+#ifndef _NODES_SOCKET_H_
+#define _NODES_SOCKET_H_
 
 #include <sys/socket.h>
 #include <linux/if_packet.h>
@@ -109,4 +109,4 @@ char * socket_print_addr(struct sockaddr *saddr);
  */
 int socket_parse_addr(const char *str, struct sockaddr *sa, enum socket_layer layer, int flags);
 
-#endif /** _SOCKET_H_ @} */
+#endif /** _NODES_SOCKET_H_ @} */
diff --git a/include/villas/nodes/websocket.h b/include/villas/nodes/websocket.h
index 4f3149534..a0bacdcc2 100644
--- a/include/villas/nodes/websocket.h
+++ b/include/villas/nodes/websocket.h
@@ -16,8 +16,8 @@
  *********************************************************************************/
 
 
-#ifndef _WEBSOCKET_H_
-#define _WEBSOCKET_H_
+#ifndef _NODES_WEBSOCKET_H_
+#define _NODES_WEBSOCKET_H_
 
 #include "node.h"
 #include "pool.h"
@@ -84,4 +84,4 @@ int websocket_read(struct node *n, struct sample *smps[], unsigned cnt);
 /** @see node_vtable::write */
 int websocket_write(struct node *n, struct sample *smps[], unsigned cnt);
 
-#endif /** _WEBSOCKET_H_ @} */
\ No newline at end of file
+#endif /** _NODES_WEBSOCKET_H_ @} */
\ No newline at end of file