More headers

In the middle of fixing critical "typedef" to "using" bugs...