Cosmetic Changes; Fix header includes