Reduce a bunch of includes, fix a couple warnings

Reduces the number of templates and other things that end up getting included in GPU/ and etc.

-[Unknown]