diff --git a/common/include/villas/advio.h b/common/include/villas/advio.h
index aa82f3036..46077fd40 100644
--- a/common/include/villas/advio.h
+++ b/common/include/villas/advio.h
@@ -28,10 +28,6 @@
 
 #include <villas/crypt.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct advio {
 	CURL *curl;
 	FILE *file;
@@ -85,7 +81,3 @@ void arewind(AFILE *file);
 int adownload(AFILE *af, int resume);
 
 int aupload(AFILE *af, int resume);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/common/include/villas/buffer.h b/common/include/villas/buffer.h
index 767a8d3cc..4709c6151 100644
--- a/common/include/villas/buffer.h
+++ b/common/include/villas/buffer.h
@@ -29,10 +29,6 @@
 
 #include <villas/common.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct buffer {
 	enum state state;
 
@@ -52,7 +48,3 @@ int buffer_append(struct buffer *b, const char *data, size_t len);
 int buffer_parse_json(struct buffer *b, json_t **j);
 
 int buffer_append_json(struct buffer *b, json_t *j);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/common/include/villas/common.h b/common/include/villas/common.h
index eebc7a901..66a51ec17 100644
--- a/common/include/villas/common.h
+++ b/common/include/villas/common.h
@@ -23,10 +23,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Common states for most objects in VILLAScommon (paths, nodes, hooks, plugins) */
 enum state {
 	STATE_DESTROYED		= 0,
@@ -57,7 +53,3 @@ typedef int (*dtor_cb_t)(void *);
 
 /** Convert state enum to human readable string. */
 const char * state_print(enum state s);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/common/include/villas/compat.h b/common/include/villas/compat.h
index 65cef210a..b9b024fa2 100644
--- a/common/include/villas/compat.h
+++ b/common/include/villas/compat.h
@@ -26,10 +26,6 @@
 
 #include <villas/config.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #if JANSSON_VERSION_HEX < 0x020A00
 size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags);
 
@@ -60,7 +56,3 @@ json_t *json_loadfd(int input, size_t flags, json_error_t *error);
   #define htobe32(x) OSSwapHostToBigInt32(x)
   #define htobe64(x) OSSwapHostToBigInt64(x)
 #endif /* __MACH__ */
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/common/include/villas/crypt.h b/common/include/villas/crypt.h
index 3199ac638..94cf5be26 100644
--- a/common/include/villas/crypt.h
+++ b/common/include/villas/crypt.h
@@ -25,17 +25,9 @@
 #include <stdio.h>
 #include <openssl/sha.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** Calculate SHA1 hash of complete file \p f and place it into \p sha1.
  *
  * @param sha1[out] Must be SHA_DIGEST_LENGTH (20) in size.
  * @retval 0 Everything was okay.
  */
 int sha1sum(FILE *f, unsigned char *sha1);
-
-#ifdef __cplusplus
-}
-#endif
\ No newline at end of file
diff --git a/common/include/villas/hist.hpp b/common/include/villas/hist.hpp
index a274b5fd8..b4a2b68b5 100644
--- a/common/include/villas/hist.hpp
+++ b/common/include/villas/hist.hpp
@@ -28,10 +28,6 @@
 
 #include <jansson.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define HIST_HEIGHT	(LOG_WIDTH - 55)
 #define HIST_SEQ	17
 
@@ -107,7 +103,3 @@ int hist_dump_json(const struct hist *h, FILE *f);
 
 /** Build a libjansson / JSON object of the histogram. */
 json_t * hist_json(const struct hist *h);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/common/include/villas/kernel/kernel.h b/common/include/villas/kernel/kernel.h
index 92e1d9181..6ab4f092c 100644
--- a/common/include/villas/kernel/kernel.h
+++ b/common/include/villas/kernel/kernel.h
@@ -30,10 +30,6 @@
 #include <string.h>
 #include <stdint.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #if WITH_CAP
 #include <sys/capability.h>
 
@@ -92,8 +88,4 @@ int kernel_get_cpu_frequency(uint64_t *freq);
 /** Set SMP affinity of IRQ */
 int kernel_irq_setaffinity(unsigned irq, uintmax_t aff , uintmax_t *old);
 
-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
diff --git a/common/include/villas/kernel/pci.h b/common/include/villas/kernel/pci.h
index 47711968f..4ec8aa27e 100644
--- a/common/include/villas/kernel/pci.h
+++ b/common/include/villas/kernel/pci.h
@@ -32,10 +32,6 @@
 #define PCI_SLOT(devfn)		(((devfn) >> 3) & 0x1f)
 #define PCI_FUNC(devfn)		((devfn) & 0x07)
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct pci_device {
 	struct {
 		int vendor;
@@ -93,8 +89,4 @@ int pci_get_iommu_group(const struct pci_device *d);
 
 size_t pci_get_regions(const struct pci_device *d, struct pci_region** regions);
 
-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
diff --git a/common/include/villas/list.h b/common/include/villas/list.h
index 0685d312f..45b7a234f 100644
--- a/common/include/villas/list.h
+++ b/common/include/villas/list.h
@@ -34,10 +34,6 @@
 
 #include <villas/common.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define LIST_CHUNKSIZE		16
 
 /** Static list initialization */
@@ -135,7 +131,3 @@ void vlist_extend(struct vlist *l, size_t len, void *val);
 
 /** Remove all elements for which the callback returns a non-zero return code. */
 void vlist_filter(struct vlist *l, dtor_cb_t cb);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/common/include/villas/log.h b/common/include/villas/log.h
index 5fc4fd9f2..df0e841b6 100644
--- a/common/include/villas/log.h
+++ b/common/include/villas/log.h
@@ -27,10 +27,6 @@
 
 #include <jansson.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* The log level which is passed as first argument to print() */
 enum log_level {
 	LOG_LVL_DEBUG,
@@ -103,7 +99,3 @@ void serror(const char *fmt, ...)
 /** Print configuration error and exit. */
 void jerror(json_error_t *err, const char *fmt, ...)
 	__attribute__ ((format(printf, 2, 3)));
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/common/include/villas/task.h b/common/include/villas/task.h
index 77fd1bd93..e6a674b3d 100644
--- a/common/include/villas/task.h
+++ b/common/include/villas/task.h
@@ -28,10 +28,6 @@
 
 #include <time.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** We can choose between two periodic task implementations */
 //#define PERIODIC_TASK_IMPL NANOSLEEP
 #define TIMERFD		1
@@ -90,7 +86,3 @@ int task_set_rate(struct task *t, double rate);
  * Note: currently not supported on all platforms.
  */
 int task_fd(struct task *t);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/common/include/villas/timing.h b/common/include/villas/timing.h
index e34a21a51..f3b1d68ba 100644
--- a/common/include/villas/timing.h
+++ b/common/include/villas/timing.h
@@ -28,10 +28,6 @@
 
 #include <time.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** Compare two timestamps. Return zero if they are equal */
 ssize_t time_cmp(const struct timespec *a, const struct timespec *b);
 
@@ -52,7 +48,3 @@ double time_to_double(const struct timespec *ts);
 
 /** Convert double containing seconds after 1970 to timespec. */
 struct timespec time_from_double(double secs);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/common/include/villas/tsc.h b/common/include/villas/tsc.h
index 86254700c..5429d7ffe 100644
--- a/common/include/villas/tsc.h
+++ b/common/include/villas/tsc.h
@@ -34,10 +34,6 @@
 
 #include <villas/kernel/kernel.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef bit_TSC
   #define bit_TSC (1 << 4)
 #endif
@@ -103,7 +99,3 @@ static uint64_t tsc_now(struct tsc *t)
 int tsc_init(struct tsc *t);
 
 uint64_t tsc_rate_to_cycles(struct tsc *t, double rate);
-
-#ifdef __cplusplus
-}
-#endif