Fix for a build fail after llvm commit 214781

Several functions were put in a separate class, needed to rename and add a new header