Fixing missing includes.
Class modification support.