Updated to match new include path in Common.