diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index 1696bd4a64..deb66322b9 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -27,7 +27,6 @@
 #include <wx/string.h>
 #include <wx/display.h>
 #include <dialog_shim.h>
-#include <eda_doc.h>
 #include <id.h>
 #include <kiface_i.h>
 #include <pgm_base.h>
@@ -82,7 +81,12 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
                                 const wxString& aTitle, const wxPoint& aPos, const wxSize& aSize,
                                 long aStyle, const wxString& aFrameName, KIWAY* aKiway ) :
         wxFrame( aParent, wxID_ANY, aTitle, aPos, aSize, aStyle, aFrameName ),
-        KIWAY_HOLDER( aKiway, KIWAY_HOLDER::FRAME )
+        KIWAY_HOLDER( aKiway, KIWAY_HOLDER::FRAME ),
+        m_actions( nullptr ),
+        m_immediateActions( true ),
+        m_dragSelects( true ),
+        m_moveWarpsCursor( true ),
+        m_userUnits( EDA_UNITS::MILLIMETRES )
 {
     m_Ident = aFrameType;
     m_hasAutoSave = false;
diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index 19b2653d03..e4c8fec772 100644
--- a/common/eda_draw_frame.cpp
+++ b/common/eda_draw_frame.cpp
@@ -111,7 +111,7 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
                                                 // BLACK for Pcbnew, BLACK or WHITE for eeschema
     m_MsgFrameHeight      = EDA_MSG_PANEL::GetRequiredHeight();
     m_zoomLevelCoeff      = 1.0;
-    m_userUnits = EDA_UNITS::MILLIMETRES;
+    m_userUnits           = EDA_UNITS::MILLIMETRES;
     m_PolarCoords         = false;
     m_findReplaceData     = new wxFindReplaceData( wxFR_DOWN );
 
diff --git a/pcbnew/tools/drc.cpp b/pcbnew/tools/drc.cpp
index e7abb4f9aa..09b536bdae 100644
--- a/pcbnew/tools/drc.cpp
+++ b/pcbnew/tools/drc.cpp
@@ -61,10 +61,12 @@
 #include "zone_filler_tool.h"
 
 DRC::DRC() :
-        PCB_TOOL_BASE( "pcbnew.DRCTool" )
+        PCB_TOOL_BASE( "pcbnew.DRCTool" ),
+        m_currentMarker( nullptr ),
+        m_pcbEditorFrame( nullptr ),
+        m_pcb( nullptr ),
+        m_drcDialog( nullptr )
 {
-    m_drcDialog  = NULL;
-
     // establish initial values for everything:
     m_doPad2PadTest     = true;         // enable pad to pad clearance tests
     m_doUnconnectedTest = true;         // enable unconnected tests
@@ -80,8 +82,6 @@ DRC::DRC() :
     m_doCreateRptFile = false;
     // m_rptFilename set to empty by its constructor
 
-    m_currentMarker = NULL;
-
     m_segmAngle  = 0;
     m_segmLength = 0;