diff --git a/common/eda_doc.cpp b/common/eda_doc.cpp
index 8e63ff66ee..6d30e651e2 100644
--- a/common/eda_doc.cpp
+++ b/common/eda_doc.cpp
@@ -54,14 +54,14 @@ static const wxFileTypeInfo EDAfallbacks[] =
                     wxT( "wxhtml %s" ),
                     wxT( "html document (from Kicad)" ),
                     wxT( "htm" ),
-                    wxT( "html" ),NULL ),
+                    wxT( "html" ),wxNullPtr ),
 
     wxFileTypeInfo( wxT( "application/sch" ),
                     wxT( "eeschema %s" ),
                     wxT( "eeschema -p %s" ),
                     wxT( "sch document (from Kicad)" ),
                     wxT( "sch" ),
-                    wxT( "SCH" ), NULL ),
+                    wxT( "SCH" ), wxNullPtr ),
 
     // must terminate the table with this!
     wxFileTypeInfo()
diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp
index 784fbb226f..ea88aa2fad 100644
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/class_libentry.cpp
@@ -318,12 +318,12 @@ void LIB_COMPONENT::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDc, const wxPoint& aO
 
             if( drawItem.Type() == COMPONENT_FIELD_DRAW_TYPE )
             {
-                drawItem.Draw( aPanel, aDc, aOffset, aColor, aDrawMode, NULL, aTransform );
+                drawItem.Draw( aPanel, aDc, aOffset, aColor, aDrawMode, (void*) NULL, aTransform );
             }
 
             // Now, draw only the background for items with
             // m_Fill == FILLED_WITH_BG_BODYCOLOR:
-            drawItem.Draw( aPanel, aDc, aOffset, aColor, aDrawMode, false, aTransform );
+            drawItem.Draw( aPanel, aDc, aOffset, aColor, aDrawMode, (void*) false, aTransform );
         }
     }
 
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index ec1c64368f..c42d50fb15 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -151,8 +151,7 @@ void SCH_FIELD::Draw( WinEDA_DrawPanel* panel, wxDC* DC,
         DrawGraphicText( panel, DC, textpos, color, fulltext,
                          orient,
                          m_Size, hjustify, vjustify,
-                         LineWidth, m_Italic,
-                         m_Bold, false );
+                         LineWidth, m_Italic, m_Bold );
     }
 
     /* Enable this to draw the bounding box around the text field to validate
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index ca6b0a4bef..bf28709725 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -584,7 +584,7 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
                      (EDA_Colors) txtcolor, Text, name_orientation,
                      wxSize( m_SheetNameSize, m_SheetNameSize ),
                      GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_BOTTOM, LineWidth,
-                     false, false, false );
+                     false, false );
 
     /* Draw text : FileName */
     if( aColor >= 0 )
@@ -596,7 +596,7 @@ void SCH_SHEET::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
                      (EDA_Colors) txtcolor, Text, name_orientation,
                      wxSize( m_FileNameSize, m_FileNameSize ),
                      GR_TEXT_HJUSTIFY_LEFT, GR_TEXT_VJUSTIFY_TOP, LineWidth,
-                     false, false, false );
+                     false, false );
 
 
     /* Draw text : SheetLabel */
diff --git a/gerbview/draw_gerber_screen.cpp b/gerbview/draw_gerber_screen.cpp
index b060756064..2b205e1eb2 100644
--- a/gerbview/draw_gerber_screen.cpp
+++ b/gerbview/draw_gerber_screen.cpp
@@ -205,7 +205,7 @@ void Show_Items_DCode_Value( WinEDA_DrawPanel* aPanel, wxDC* aDC, BOARD* aPcb, i
                          pos, (EDA_Colors) color, Line,
                          orient, wxSize( width, width ),
                          GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER,
-                         0, false, false, false );
+                         0, false, false );
     }
 }
 
diff --git a/pcbnew/class_pad_draw_functions.cpp b/pcbnew/class_pad_draw_functions.cpp
index 321b09f6de..e281a9c528 100644
--- a/pcbnew/class_pad_draw_functions.cpp
+++ b/pcbnew/class_pad_draw_functions.cpp
@@ -590,8 +590,7 @@ void D_PAD::DrawShape( EDA_Rect* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
             tsize = (int) ( tsize * 0.8 );
             DrawGraphicText( aDrawInfo.m_DrawPanel, aDC, tpos, WHITE, buffer, t_angle,
                              wxSize( tsize, tsize ), GR_TEXT_HJUSTIFY_CENTER,
-                             GR_TEXT_VJUSTIFY_CENTER, tsize / 7, false, false,
-                             false );
+                             GR_TEXT_VJUSTIFY_CENTER, tsize / 7, false, false );
         }
     }