Reformat and #include? changes