Moved includes to the legacy folder