diff --git a/tools/dev/bin/onos-gen-p4-constants b/tools/dev/bin/onos-gen-p4-constants
index 566ba4f..80f8f63 100755
--- a/tools/dev/bin/onos-gen-p4-constants
+++ b/tools/dev/bin/onos-gen-p4-constants
@@ -1,11 +1,10 @@
 #!/usr/bin/env python2.7
 # -*- utf-8 -*-
 import argparse
-import re
 import google.protobuf.text_format as tf
+import re
 from p4.config.v1 import p4info_pb2
 
-
 copyright = '''/*
  * Copyright 2017-present Open Networking Foundation
  *
@@ -74,6 +73,9 @@
 PI_PKT_META_ID = 'PiControlMetadataId'
 PI_PKT_META_ID_CST = 'PiControlMetadataId.of("%s")'
 
+HF_VAR_PREFIX = 'HDR_'
+
+
 class ConstantClassGenerator(object):
     headers = set()
     header_fields = set()
@@ -125,6 +127,8 @@
 
     def const_line(self, name, type, constructor):
         var_name = self.convert_camel_to_all_caps(name)
+        if type == PI_HF_FIELD_ID:
+            var_name = HF_VAR_PREFIX + var_name
         val = constructor % (name, )
 
         line = CONST_FMT % (type, var_name, val)
diff --git a/tools/dev/p4vm/install-p4-tools.sh b/tools/dev/p4vm/install-p4-tools.sh
index e2ca928..8efc4a3 100755
--- a/tools/dev/p4vm/install-p4-tools.sh
+++ b/tools/dev/p4vm/install-p4-tools.sh
@@ -50,8 +50,10 @@
         curl \
         flex \
         git \
+        graphviz \
         libavl-dev \
         libboost-dev \
+        libboost-graph-dev \
         libboost-program-options-dev \
         libboost-system-dev \
         libboost-filesystem-dev \