reworked includes structure