Removed needless typedefs and fixed merge-induced compilation failures.