Made a couple fixes to the clibrary detection.  Added the ability to provide an include directory list for overrides.