Added missing configuration #if:s and #includes:s.

8 files changed