Defines changed to typedefs.