This will require a little rejiggering of headers and #include's, so I'm creating this issue to remind me to do it soon.
This will require a little rejiggering of headers and #include's, so I'm creating this issue to remind me to do it soon.