The code will locks clear to put those definitions into tree.h header Change-Id: Ib1a34f19d9849acd7ea979eb0a6e153b0e8e39de Signed-off-by: Ziye Yang <ziye.yang@intel.com>