Formatting; include cleanup.

eeschema/sch_bus_entry.cpp

@@ -31,14 +31,12 @@
 #include <sch_edit_frame.h>
 #include <sch_junction.h>
 #include <sch_line.h>
-#include <sch_label.h>
 #include <project/net_settings.h>
 #include <project/project_file.h>
 #include <settings/color_settings.h>
 #include <netclass.h>
 #include <trigo.h>
 #include <board_item.h>
-#include <advanced_config.h>
 #include <connection_graph.h>
 #include "sch_painter.h"
 #include "plotters/plotter.h"
@@ -269,8 +267,9 @@ void SCH_BUS_ENTRY_BASE::Print( const SCH_RENDER_SETTINGS* aSettings, int aUnit,
                                 const VECTOR2I& aOffset, bool aForceNoFill, bool aDimmed )
 {
     wxDC*   DC = aSettings->GetPrintDC();
-    COLOR4D color = ( GetBusEntryColor() == COLOR4D::UNSPECIFIED ) ?
-                    aSettings->GetLayerColor( m_layer ) : GetBusEntryColor();
+    COLOR4D color = ( GetBusEntryColor() == COLOR4D::UNSPECIFIED )
+                                                            ? aSettings->GetLayerColor( m_layer )
+                                                            : GetBusEntryColor();
     VECTOR2I start = m_pos + aOffset;
     VECTOR2I end = GetEnd() + aOffset;
     int      penWidth = ( GetPenWidth() == 0 ) ? aSettings->GetDefaultPenWidth() : GetPenWidth();

eeschema/sch_symbol.cpp

@@ -26,12 +26,8 @@
 #include <widgets/msgpanel.h>
 #include <bitmaps.h>
 #include <core/mirror.h>
-#include <sch_pin.h>
 #include <sch_shape.h>
 #include <pgm_base.h>
-#include <sch_symbol.h>
-#include <sch_sheet_path.h>
-#include <schematic.h>
 #include <sim/sim_model.h>
 #include <sim/spice_generator.h>
 #include <sim/sim_lib_mgr.h>
@@ -430,7 +426,7 @@ void SCH_SYMBOL::SetBodyStyle( int aBodyStyle )
     {
         m_bodyStyle = aBodyStyle;
 
-        // The convert may have a different pin layout so the update the pin map.
+        // The body style may have a different pin layout so the update the pin map.
         UpdatePins();
     }
 }