Updated headers to compile and correct name DeviceID for Environment variable