Merge "Use ::class to resolve class names in includes files"