diff --git a/configure.in b/configure.in
index 875212e25..0157ed385 100644
--- a/configure.in
+++ b/configure.in
@@ -778,6 +778,10 @@ then
 fi
 
 AM_CONFIG_HEADER(config.h)
+AH_BOTTOM([
+#include "system.h"
+])
+
 AM_INIT_AUTOMAKE([-Wall -Wno-portability])
 AM_MAINTAINER_MODE
 
diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index 4aab65fef..34e5daa44 100644
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -27,7 +27,6 @@
 #define REPLACEMENTS_H
 
 #include "types.h"
-#include "system.h"
 
 /* MIN,MAX macros */
 #ifndef MIN