802.1d: include fixes