Revert "xosd cleanup"

This reverts commit 222ba1b234c6bf72485feb23a5e39c38af935bd5.

Conflicts:
	autofire.c