diff --git a/bin/named/client.c b/bin/named/client.c
index 4026b13795..742dbf2ed9 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.133 2000/12/02 02:07:37 gson Exp $ */
+/* $Id: client.c,v 1.134 2000/12/02 04:30:08 gson Exp $ */
 
 #include <config.h>
 
@@ -30,7 +30,9 @@
 #include <dns/dispatch.h>
 #include <dns/events.h>
 #include <dns/message.h>
+#ifdef DNS_OPT_NEWCODES
 #include <dns/opt.h>
+#endif /* DNS_OPT_NEWCODES */
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
 #include <dns/rdatalist.h>
diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h
index 1c98f5cd7a..0f74b0dd45 100644
--- a/bin/named/include/named/client.h
+++ b/bin/named/include/named/client.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.h,v 1.47 2000/12/01 21:30:20 gson Exp $ */
+/* $Id: client.h,v 1.48 2000/12/02 04:29:24 gson Exp $ */
 
 #ifndef NAMED_CLIENT_H
 #define NAMED_CLIENT_H 1
@@ -71,8 +71,9 @@
 #include <dns/types.h>
 #include <dns/tcpmsg.h>
 #include <dns/fixedname.h>
+#ifdef DNS_OPT_NEWCODES
 #include <dns/opt.h>
-
+#endif /* DNS_OPT_NEWCODES */
 #include <named/types.h>
 #include <named/query.h>
 
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 45829b63cc..f2b2856876 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.160 2000/12/02 04:13:30 gson Exp $ */
+/* $Id: message.c,v 1.161 2000/12/02 04:24:26 gson Exp $ */
 
 /***
  *** Imports
@@ -32,7 +32,9 @@
 #include <dns/keyvalues.h>
 #include <dns/log.h>
 #include <dns/message.h>
+#ifdef DNS_OPT_NEWCODES
 #include <dns/opt.h>
+#endif /* DNS_OPT_NEWCODES */
 #include <dns/rdata.h>
 #include <dns/rdatalist.h>
 #include <dns/rdataset.h>