Rejigging the default install
Removed dysfunctional includes