diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bac2fdc1ee2..b197ef5c561 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-07  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* tradcpp.c (initialize_builtins): Honor NO_BUILTIN_SIZE_TYPE
+	and friends.
+
 2000-07-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* system.h (UNION_INIT_ZERO): New macro for initializing union
diff --git a/gcc/tradcpp.c b/gcc/tradcpp.c
index ec42b63db99..6dea86ea5b7 100644
--- a/gcc/tradcpp.c
+++ b/gcc/tradcpp.c
@@ -4673,9 +4673,15 @@ initialize_builtins ()
   install_spec ("__INCLUDE_LEVEL__", T_INCLUDE_LEVEL);
   install_spec ("__LINE__",          T_SPECLINE);
 
+#ifndef NO_BUILTIN_SIZE_TYPE
   install_value ("__SIZE_TYPE__",         SIZE_TYPE);
+#endif
+#ifndef NO_BUILTIN_PTRDIFF_TYPE
   install_value ("__PTRDIFF_TYPE__",      PTRDIFF_TYPE);
+#endif
+#ifndef NO_BUILTIN_WCHAR_TYPE
   install_value ("__WCHAR_TYPE__",        WCHAR_TYPE);
+#endif
   install_value ("__REGISTER_PREFIX__",   REGISTER_PREFIX);
   install_value ("__USER_LABEL_PREFIX__", user_label_prefix);
 }