Remove some useless casts and includes.  OK deraadt@ tedu@