1 files changed, 3 insertions, 11 deletions
diff --git a/lib/measure.h b/lib/measure.h
index 0b86309..8082dd2 100644
--- a/lib/measure.h
+++ b/lib/measure.h
@@ -1,7 +1,9 @@
 
 #pragma once
 
-#include "measurement.h"
+#include "state.h"
+#include "correlation.h"
+#include <functional>
 
 #define POSSIBLE_MEASUREMENTS 4
 const unsigned char measurement_energy        = 1 << 0;
@@ -11,14 +13,6 @@ const unsigned char measurement_fourierZero    = 1 << 3;
 
 char const *measurement_labels[] = {"E", "S", "M", "F"};
 
-#ifdef __cplusplus
-
-#include "state.h"
-#include "correlation.h"
-#include <functional>
-
-
-
 FILE **measure_setup_files(unsigned char flags, unsigned long timestamp) {
   FILE **files = (FILE **)calloc(POSSIBLE_MEASUREMENTS, sizeof(FILE *));
 
@@ -66,6 +60,4 @@ void measure_free_files(unsigned char flags, FILE **files) {
   free(files);
 }
 
-#endif
-