* Cleanup headers

* Fix more headers

* Fix compile error

* Fix plaid build error
Co-authored-by: Scott Cyphers <diyessi@users.noreply.github.com>