Moved includes to m files, removed extraneous @class statements.