fixed imports

fixed missing import statements at head of file
merging upstream