Cleans up imports for several files.

Co-contributors: Samm Conley <swconley> and Long Nguyen Duc Hoang <lhnguyenduc@wpi.edu>