diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h
index dcde9471897d5c5119145fd01dddd8e7f118f13c..cc8fa109cfa3e4ad00d2228de76864095652c94b 100644
--- a/include/linux/kconfig.h
+++ b/include/linux/kconfig.h
@@ -70,7 +70,4 @@
  */
 #define IS_ENABLED(option) __or(IS_BUILTIN(option), IS_MODULE(option))
 
-/* Make sure we always have all types and struct attributes defined. */
-#include <linux/compiler_types.h>
-
 #endif /* __LINUX_KCONFIG_H */
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 194ae707167dbea4a2ef869ce5dfba3ca1236866..e3215b7652ee8721313a1816ba5e2b23712f7302 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -152,6 +152,7 @@ __cpp_flags     = $(call flags,_cpp_flags)
 endif
 
 c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
+		 -include $(srctree)/include/linux/compiler_types.h       \
 		 $(__c_flags) $(modkern_cflags)                           \
 		 $(basename_flags) $(modname_flags)