diff --git a/headers/build/config/types.h b/headers/build/config/types.h
index 7a05c18d87..260fbbc289 100644
--- a/headers/build/config/types.h
+++ b/headers/build/config/types.h
@@ -2,7 +2,9 @@
  * Copyright 2009-2011, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _CONFIG_BUILD_TYPES_H
+#ifdef HAIKU_HOST_PLATFORM_HAIKU
+#include_next <config/types.h>
+#elif !defined(_CONFIG_BUILD_TYPES_H)
 #define _CONFIG_BUILD_TYPES_H
 
 
diff --git a/headers/build/host/haiku_host/Errors.h b/headers/build/host/haiku_host/Errors.h
deleted file mode 100644
index a84a3087e5..0000000000
--- a/headers/build/host/haiku_host/Errors.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../os/support/Errors.h"
diff --git a/headers/build/host/haiku_host/config_build/HaikuConfig.h b/headers/build/host/haiku_host/config_build/HaikuConfig.h
deleted file mode 100644
index 723c2bb194..0000000000
--- a/headers/build/host/haiku_host/config_build/HaikuConfig.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "/boot/system/develop/headers/config/HaikuConfig.h"
diff --git a/headers/build/host/haiku_host/config_build/types.h b/headers/build/host/haiku_host/config_build/types.h
deleted file mode 100644
index 423a4d9330..0000000000
--- a/headers/build/host/haiku_host/config_build/types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "/boot/system/develop/headers/config/types.h"