The separate header file is not needed since none of the driver wrappers include it anymore. Move the WLAN_STA_* definitions back to be together with struct sta_info definition.