Code cleanup (mostly includes)