Random header cleanup
Fix compositor keyboard after I broke it