diff --git a/configure b/configure
index 5b29d543c..655e70cc9 100755
--- a/configure
+++ b/configure
@@ -1764,6 +1764,14 @@ $as_echo "#define MAX_ISLE 8" >>confdefs.h
 $as_echo "#define MAX_FNAME 128" >>confdefs.h
 
 
+$as_echo "#define VIDEO_MEM_ADDR 0xB8000" >>confdefs.h
+
+#AC_DEFINE(CONFIG_VGA, 1, Use the VGA interface as output device)
+
+$as_echo "#define DYNAMIC_TICKS 1" >>confdefs.h
+
+#AC_DEFINE(SAVE_FPU, 1, Set task switched flag during a context switch);
+
 CROSSDIR=`pwd`/usr/x86/bin
 
 
diff --git a/configure.ac b/configure.ac
index f54921fee..775439028 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,10 @@ AC_DEFINE(HAVE_ARCH_STRCPY, 1, Define to use machine specific version of strcpy)
 AC_DEFINE(HAVE_ARCH_STRNCPY, 1, Define to use machine specific version of strncpy)
 AC_DEFINE(MAX_ISLE, 8, Define the maximum number of isles / numa nodes)
 AC_DEFINE(MAX_FNAME, 128, Define the maximum length of a file name)
+AC_DEFINE(VIDEO_MEM_ADDR, 0xB8000, Definition of the VGA address)
+#AC_DEFINE(CONFIG_VGA, 1, Use the VGA interface as output device)
+AC_DEFINE(DYNAMIC_TICKS, 1, Use a dynamic tick instead of a static)
+#AC_DEFINE(SAVE_FPU, 1, Set task switched flag during a context switch);
 
 CROSSDIR=`pwd`/usr/x86/bin
 AC_SUBST(CROSSDIR)
diff --git a/include/hermit/config.h.in b/include/hermit/config.h.in
index a4777f620..56a39a7bb 100755
--- a/include/hermit/config.h.in
+++ b/include/hermit/config.h.in
@@ -4,6 +4,9 @@
 #undef MAX_TASKS
 #undef MAX_ISLE
 #undef MAX_FNAME
+#undef SAVE_FPU
+#undef CONFIG_VGA
+#undef VIDEO_MEM_ADDR
 
 /* Define to use machine specific version of memcpy */
 #undef HAVE_ARCH_MEMCPY
diff --git a/include/hermit/stddef.h b/include/hermit/stddef.h
index c227cd72d..03899cde7 100644
--- a/include/hermit/stddef.h
+++ b/include/hermit/stddef.h
@@ -44,7 +44,6 @@ extern "C" {
 
 #define TIMER_FREQ	100 /* in HZ */
 #define CLOCK_TICK_RATE	1193182 /* 8254 chip's internal oscillator frequency */
-#define VIDEO_MEM_ADDR	0xB8000 /* the video memory address */
 #define CACHE_LINE	64
 #define HEAP_START	(PAGE_2M_FLOOR((size_t)&kernel_end) + 4*PAGE_SIZE)
 #define HEAP_SIZE	(1ULL << 32)
@@ -52,8 +51,6 @@ extern "C" {
 #define INT_SYSCALL	0x80
 #define MAILBOX_SIZE	128
 //#define WITH_PCI_IDS
-//#define SAVE_FPU
-//#define CONFIG_VGA
 
 #define BYTE_ORDER             LITTLE_ENDIAN