Moved typedefs to common.h