Fixed missing headers

Some headers were missing, with resources haphazardly getting included
implicitly. This has been resolved.