restructure include tree for install consistency