Proper include, and layout fix.