Minor include fixes

Some tiny include and prototype additions