Simplified include dependencies to avoid too many preprocessed source.
Too many instantiations to test features. Removed some redundant ones.