Tiny cleanup, starting include components