- Added missing configuration #if:s and #includes:s.
- Minor configuration related changes.

35 files changed