Do some cleanups here:
 * remove an unused prototype
 * remove some unused constants
 * clean up includes
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>