diff --git a/include/villas/hist.h b/include/villas/hist.h
index f56476abc..3665d4e28 100644
--- a/include/villas/hist.h
+++ b/include/villas/hist.h
@@ -12,8 +12,6 @@
 
 #include <jansson.h>
 
-#include "config.h"
-
 #define HIST_HEIGHT	(LOG_WIDTH - 55)
 #define HIST_SEQ	17
 
diff --git a/src/fpga-bench-overruns.c b/src/fpga-bench-overruns.c
index 0f0a53ef5..0420ec2dd 100644
--- a/src/fpga-bench-overruns.c
+++ b/src/fpga-bench-overruns.c
@@ -9,7 +9,8 @@
 
 #include <villas/log.h>
 
-#include "config.h"
+/* Some hard-coded configuration for the FPGA benchmarks */
+#define BENCH_WARMUP		100
 
 /* Declared in fpga-bench.c */
 extern int intc_flags;
diff --git a/src/fpga-bench.c b/src/fpga-bench.c
index d244134f0..8b1b729fc 100644
--- a/src/fpga-bench.c
+++ b/src/fpga-bench.c
@@ -14,12 +14,22 @@
 
 #include <villas/fpga/ip.h>
 #include <villas/fpga/card.h>
-
 #include <villas/fpga/ips/intc.h>
 #include <villas/fpga/ips/timer.h>
 
 #include "config.h"
 
+/* Some hard-coded configuration for the FPGA benchmarks */
+#define BENCH_DM		3
+// 1 FIFO
+// 2 DMA SG
+// 3 DMA Simple
+
+#define BENCH_RUNS		3000000
+#define BENCH_WARMUP		100
+#define BENCH_DM_EXP_MIN	0
+#define BENCH_DM_EXP_MAX	20
+
 int fpga_benchmark_datamover(struct fpga_card *c);
 int fpga_benchmark_jitter(struct fpga_card *c);
 int fpga_benchmark_memcpy(struct fpga_card *c);
diff --git a/src/fpga.c b/src/fpga.c
index 98e8fca9c..6850d08ec 100644
--- a/src/fpga.c
+++ b/src/fpga.c
@@ -21,8 +21,6 @@
 
 #include <villas/fpga/card.h>
 
-#include "config.h"
-
 /* Declarations */
 int fpga_benchmarks(int argc, char *argv[], struct fpga_card *c);
 
diff --git a/src/signal.c b/src/signal.c
index aa36ff739..e470530e6 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -17,8 +17,6 @@
 #include <villas/sample_io.h>
 #include <villas/timing.h>
 
-#include "config.h"
-
 #define CLOCKID	CLOCK_REALTIME
 
 enum SIGNAL_TYPE {
diff --git a/src/test-rtt.c b/src/test-rtt.c
index af523335f..5a2a65414 100644
--- a/src/test-rtt.c
+++ b/src/test-rtt.c
@@ -19,8 +19,6 @@
 #include <villas/pool.h>
 #include <villas/kernel/rt.h>
 
-#include "config.h"
-
 struct super_node sn; /** <The global configuration */
 
 static struct node *node;