Clean up imports, forward declarations