#93796: Added many requires to classes.
#93796: Improvements to requires.