Features/include cleanup