1. Break out the definition of the soft state structure into an include file. 2. un-static the soft state and apm_display(), and group them under a comment that notes the dependency.