diff --git a/common/painter.cpp b/common/painter.cpp
index 46c8a15d20..75986a04a3 100644
--- a/common/painter.cpp
+++ b/common/painter.cpp
@@ -24,8 +24,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <eda_text.h>
-#include <view/view.h>
 #include <painter.h>
 #include <gal/stroke_font.h>
 #include <newstroke_font.h>
@@ -44,6 +42,7 @@ RENDER_SETTINGS::RENDER_SETTINGS()
     m_highlightEnabled  = false;
     m_hiContrastEnabled = false;
     m_hiContrastFactor  = 0.2;
+    m_activeLayer       = 0;
 
     // Store the predefined colors used in KiCad in format used by GAL
     for( int i = 0; i < NBCOLOR; i++ )
diff --git a/common/view/view.cpp b/common/view/view.cpp
index 59ff028cef..79ea771df2 100644
--- a/common/view/view.cpp
+++ b/common/view/view.cpp
@@ -344,6 +344,7 @@ struct VIEW::drawItem
     VIEW*    view;
 };
 
+
 void VIEW::redrawRect( const BOX2I& aRect )
 {
     int          totalItems = 0, totalCached = 0;