the includes and broke cross builds from non-NetBSD arches. In this I revert the problem section. (pointed out by uwe.)