removed superflous typedef which caused too many dependencies