Altered device type macros.
Updating sources on MacOSX