Reincluded legacy headers for temporary build