Moved public headers to project headers