Add missing include guards and missing #include, found by modules build.