Restore 'type' parameter for getIncludePaths()

Previous commit erroneously removed the parameter above, restore it.
Coding style corrections

Fix coding style inconsistencies introduced by two previous commits