BTrig: Cleanup includes and minor code optimizations

This packages takes a lot of memory to compile, I try to improve this by cleaning up old includes.

Also minor optimizations.