Take out some header includes in state_tracker.c