Fixed headers, now works with SDK 10+