Changing header files to cause bluetooth address types to finally compile. Pending tests for bluetooth functionality.