Cleaned up old includes left from when FFClass was FFClassNew