fixed import statements and other minor code changes to fix most of the compilation problems.
Authored by: mrieser 2010-02-15
Parent: [r10422]
Child: [r10424]