Minor include file unwinding

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Remove even more code and declarations

There's lots more stuff that can go.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>