Disabled new 9.5 files and added forward declarations to handle moved functions.  Passes unit tests.