fixed build errors caused by new include structure