Fixed #2732 (Make it easier for users to tell 'How to supply header files')