Modified and trimmed down include statements