Separating type definitions from the miserable remains of global.*