Moved headers that are not common to both client and firmware.