[Modules] Make header standalone. NFC.
[Modules] Add some missing includes to make files compile stand-alone.