--- a/usr/src/Makefile.env	Wed Jun 01 18:34:26 2011 -0700
+++ b/usr/src/Makefile.env	Wed Jun 01 19:14:07 2011 -0700
@@ -64,8 +64,10 @@
 PROTO_JAVA_POLICY = $(ROOT)/$(JAVA_POLICY)
 PROTO_VP_BIN      = $(PROTO_BIN)/vp
 PROTO_VP_DIR      = $(ROOT)$(VP_DIR)
+PROTO_INCLUDE     = $(ROOT)/usr/include
 
-ROOTHDRDIR        = $(ROOT)/usr/include
+ROOTHDRDIR        = $(PROTO_INCLUDE)
+ROOTHDRS          = $(HDRS:%=$(ROOTHDRDIR)/%)
 
 TOOLS_DIR = $(SRC)/tools