diff --git a/headers/build/config/HaikuConfig.h b/headers/build/config_build/HaikuConfig.h
similarity index 100%
rename from headers/build/config/HaikuConfig.h
rename to headers/build/config_build/HaikuConfig.h
diff --git a/headers/build/config/types.h b/headers/build/config_build/types.h
similarity index 92%
rename from headers/build/config/types.h
rename to headers/build/config_build/types.h
index 0bf10d36ea..9a013849b8 100644
--- a/headers/build/config/types.h
+++ b/headers/build/config_build/types.h
@@ -2,11 +2,11 @@
  * Copyright 2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _CONFIG_TYPES_H
-#define _CONFIG_TYPES_H
+#ifndef _CONFIG_BUILD_TYPES_H
+#define _CONFIG_BUILD_TYPES_H
 
 
-#include <config/HaikuConfig.h>
+#include <config_build/HaikuConfig.h>
 
 #include <inttypes.h>
 
@@ -54,4 +54,4 @@ typedef __haiku_std_uint64	__haiku_uint64;
 #define __HAIKU_SADDR_MIN		(-__HAIKU_SADDR_MAX-1)
 
 
-#endif	/* _CONFIG_TYPES_H */
+#endif	/* _CONFIG_BUILD_TYPES_H */
diff --git a/headers/build/os/BeBuild.h b/headers/build/os/BeBuild.h
index 91d33b0284..d80e957979 100644
--- a/headers/build/os/BeBuild.h
+++ b/headers/build/os/BeBuild.h
@@ -6,7 +6,7 @@
 #define _BE_BUILD_H
 
 
-#include <config/HaikuConfig.h>
+#include <config_build/HaikuConfig.h>
 
 
 #define B_BEOS_VERSION_4				0x0400
diff --git a/headers/build/os/support/SupportDefs.h b/headers/build/os/support/SupportDefs.h
index d10b2af50a..95b3bd57df 100644
--- a/headers/build/os/support/SupportDefs.h
+++ b/headers/build/os/support/SupportDefs.h
@@ -9,7 +9,7 @@
 #define _SUPPORT_DEFS_H
 
 
-#include <config/types.h>
+#include <config_build/types.h>
 
 #include <BeBuild.h>
 #include <Errors.h>