Some more header cleanup

Now it only takes 38s to build after touching irr_driver.hpp, vs prev 1m 10s.
Mark the irr changes that are upstream
Rename Time to StkTime, X11 has a type called Time
time: include stdio, needed on newer GCC