diff --git a/common/dcsvg.cpp b/common/dcsvg.cpp
index 136fe3689a..489d02adb9 100644
--- a/common/dcsvg.cpp
+++ b/common/dcsvg.cpp
@@ -30,9 +30,9 @@
 #include "wx/image.h"
 #include "macros.h"
 
-#define wxSVG_DEBUG FALSE
+#define wxSVG_DEBUG false
 
-// or TRUE to see the calls being executed
+// or true to see the calls being executed
 #define newline    wxString( wxT( "\n" ) )
 #define space      wxString( wxT( " " ) )
 #define semicolon  wxString( wxT( ";" ) )
@@ -85,7 +85,7 @@ wxString wxBrushString( wxColour c, int style )
         break;
 
     default:
-        wxASSERT_MSG( FALSE, wxT( "wxSVGFileDC::Requested Brush Style not available" ) );
+        wxASSERT_MSG( false, wxT( "wxSVGFileDC::Requested Brush Style not available" ) );
     }
 
     s = s + newline;
@@ -103,8 +103,8 @@ void wxSVGFileDC::Init( wxString f, int Width, int Height, float dpi )
     m_width  = Width;
     m_height = Height;
 
-    m_clipping = FALSE;
-    m_OK = TRUE;
+    m_clipping = false;
+    m_OK = true;
 
     m_mm_to_pix_x = dpi / 25.4;
     m_mm_to_pix_y = dpi / 25.4;
@@ -132,7 +132,7 @@ void wxSVGFileDC::Init( wxString f, int Width, int Height, float dpi )
     m_font  = *wxNORMAL_FONT;
     m_brush = *wxWHITE_BRUSH;
 
-    m_graphics_changed = TRUE;
+    m_graphics_changed = true;
 
     ////////////////////code here
 
@@ -626,7 +626,7 @@ void wxSVGFileDC::SetBrush( const wxBrush& brush )
 {
     m_brush = brush;
 
-    m_graphics_changed = TRUE;
+    m_graphics_changed = true;
     wxASSERT_MSG( !wxSVG_DEBUG, wxT( "wxSVGFileDC::SetBrush Call executed" ) );
 }
 
@@ -637,7 +637,7 @@ void wxSVGFileDC::SetPen( const wxPen& pen )
     // dashes, stipple :  not implemented
     m_pen = pen;
 
-    m_graphics_changed = TRUE;
+    m_graphics_changed = true;
     wxASSERT_MSG( !wxSVG_DEBUG, wxT( "wxSVGFileDC::SetPen Call executed" ) );
 }
 
@@ -697,7 +697,7 @@ void wxSVGFileDC::NewGraphics()
         break;
 
     default:
-        wxASSERT_MSG( FALSE,
+        wxASSERT_MSG( false,
                       wxT( "wxSVGFileDC::SetPen Call called to set a Style which is not available" )
                       );
         sWarn = sWarn + wxT(
@@ -710,7 +710,7 @@ void wxSVGFileDC::NewGraphics()
 
     s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn;
     write( s );
-    m_graphics_changed = FALSE;
+    m_graphics_changed = false;
     wxASSERT_MSG( !wxSVG_DEBUG, wxT( "wxSVGFileDC::NewGraphics Call executed" ) );
 }
 
@@ -730,7 +730,7 @@ void wxSVGFileDC::ComputeScaleAndOrigin()
     m_scaleY  = m_logicalScaleY * m_userScaleY;
     m_OriginX = m_logicalOriginX * m_logicalScaleX + m_deviceOriginX;
     m_OriginY = m_logicalOriginY * m_logicalScaleY + m_deviceOriginY;
-    m_graphics_changed = TRUE;
+    m_graphics_changed = true;
 }
 
 
@@ -771,8 +771,8 @@ void wxSVGFileDC::SetMapMode( int mode )
     /*  we don't do this mega optimisation
      *  if (mode != wxMM_TEXT)
      *  {
-     *      m_needComputeScaleX = TRUE;
-     *      m_needComputeScaleY = TRUE;
+     *      m_needComputeScaleX = true;
+     *      m_needComputeScaleY = true;
      *  }
      */
 }
@@ -833,22 +833,22 @@ void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 // export a bitmap as a raster image in png
 bool wxSVGFileDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                           wxDC* source, wxCoord xsrc, wxCoord ysrc,
-                          int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/,
+                          int logicalFunc /*= wxCOPY*/, bool useMask /*= false*/,
                           wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/ )
 {
     if( logicalFunc != wxCOPY )
     {
-        wxASSERT_MSG( FALSE,
+        wxASSERT_MSG( false,
                       wxT( "wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible" )
                       );
-        return FALSE;
+        return false;
     }
-    if( useMask != FALSE )
+    if( useMask != false )
     {
-        wxASSERT_MSG( FALSE,
+        wxASSERT_MSG( false,
                       wxT( "wxSVGFileDC::DoBlit Call requested False mask ; this is not possible" )
                       );
-        return FALSE;
+        return false;
     }
     wxBitmap   myBitmap( width, height );
     wxMemoryDC memDC;
@@ -857,7 +857,7 @@ bool wxSVGFileDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord h
     memDC.SelectObject( wxNullBitmap );
     DoDrawBitmap( myBitmap, xdest, ydest );
     wxASSERT_MSG( !wxSVG_DEBUG, wxT( "wxSVGFileDC::DoBlit Call executed" ) );
-    return FALSE;
+    return false;
 }
 
 
diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp
index b554b5d969..447efe34ff 100644
--- a/common/dialogs/dialog_page_settings.cpp
+++ b/common/dialogs/dialog_page_settings.cpp
@@ -249,7 +249,7 @@ void DIALOG_PAGES_SETTINGS::SavePageSettings( wxCommandEvent& event )
         // here we assume translators will keep original paper size spellings
         if( !pageInfo.SetType( paperType ) )
         {
-            wxASSERT_MSG( FALSE, wxT( "the translation for paper size must preserve original spellings" ) );
+            wxASSERT_MSG( false, wxT( "the translation for paper size must preserve original spellings" ) );
         }
 
         // set portrait _after_ setting size/type above
diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp
index b1dc049155..dd550b401d 100644
--- a/cvpcb/cvpcb.cpp
+++ b/cvpcb/cvpcb.cpp
@@ -101,7 +101,7 @@ bool EDA_APP::OnInit()
     SetTopWindow( frame );
 
     frame->LoadProjectFile( filename.GetFullPath() );
-    frame->Show( TRUE );
+    frame->Show( true );
     frame->BuildFOOTPRINTS_LISTBOX();
 
     if( filename.IsOk() && filename.FileExists() )
diff --git a/cvpcb/cvstruct.h b/cvpcb/cvstruct.h
index c9996951bd..f50b807480 100644
--- a/cvpcb/cvstruct.h
+++ b/cvpcb/cvstruct.h
@@ -48,13 +48,13 @@ public:
     ~FOOTPRINTS_LISTBOX();
 
     int      GetCount();
-    void     SetSelection( unsigned index, bool State = TRUE );
+    void     SetSelection( unsigned index, bool State = true );
     void     SetString( unsigned linecount, const wxString& text );
     void     AppendLine( const wxString& text );
     void     SetFootprintFullList( FOOTPRINT_LIST& list );
     void     SetFootprintFilteredList( COMPONENT*      Component,
                                        FOOTPRINT_LIST& list );
-    void     SetActiveFootprintList( bool FullList, bool Redraw = FALSE );
+    void     SetActiveFootprintList( bool FullList, bool Redraw = false );
 
     wxString GetSelectedFootprint();
     wxString OnGetItemText( long item, long column ) const;
@@ -88,7 +88,7 @@ public:
     void     Clear();
     int      GetCount();
     wxString OnGetItemText( long item, long column ) const;
-    void     SetSelection( unsigned index, bool State = TRUE );
+    void     SetSelection( unsigned index, bool State = true );
     void     SetString( unsigned linecount, const wxString& text );
     void     AppendLine( const wxString& text );
 
diff --git a/cvpcb/dialogs/dialog_cvpcb_config.cpp b/cvpcb/dialogs/dialog_cvpcb_config.cpp
index fc4fb5e064..108e2d1e7c 100644
--- a/cvpcb/dialogs/dialog_cvpcb_config.cpp
+++ b/cvpcb/dialogs/dialog_cvpcb_config.cpp
@@ -186,7 +186,7 @@ void DIALOG_CVPCB_CONFIG::OnButtonUpClick( wxCommandEvent& event )
         list->SetSelection( jj-1 );
     }
 
-    m_LibListChanged = TRUE;
+    m_LibListChanged = true;
 }
 
 
@@ -229,7 +229,7 @@ void DIALOG_CVPCB_CONFIG::OnButtonDownClick( wxCommandEvent& event )
         list->SetSelection(jj+1);
     }
 
-    m_LibListChanged = TRUE;
+    m_LibListChanged = true;
 }
 
 
@@ -250,7 +250,7 @@ void DIALOG_CVPCB_CONFIG::OnRemoveLibClick( wxCommandEvent& event )
     for( int ii = selections.GetCount()-1; ii >= 0; ii-- )
     {
         list->Delete(selections[ii] );
-        m_LibListChanged = TRUE;
+        m_LibListChanged = true;
     }
 }
 
@@ -330,7 +330,7 @@ void DIALOG_CVPCB_CONFIG::OnAddOrInsertLibClick( wxCommandEvent& event )
         // Add or insert new library name, if not already in list
         if( list->FindString( libfilename, fn.IsCaseSensitive() ) == wxNOT_FOUND )
         {
-            m_LibListChanged = TRUE;
+            m_LibListChanged = true;
 
             if( ! insert )
                 list->Append( libfilename );
diff --git a/cvpcb/init.cpp b/cvpcb/init.cpp
index bb031c5694..ce1039e37d 100644
--- a/cvpcb/init.cpp
+++ b/cvpcb/init.cpp
@@ -53,13 +53,13 @@ void CVPCB_MAINFRAME::SetNewPkg( const wxString& package )
         m_undefinedComponentCnt -= 1;
 
     m_ListCmp->SetString( NumCmp, msg );
-    m_ListCmp->SetSelection( NumCmp, FALSE );
+    m_ListCmp->SetSelection( NumCmp, false );
 
     // We activate next component:
     if( NumCmp < (m_ListCmp->GetCount() - 1) )
         NumCmp++;
 
-    m_ListCmp->SetSelection( NumCmp, TRUE );
+    m_ListCmp->SetSelection( NumCmp, true );
 
     DisplayStatus();
 }
@@ -107,7 +107,7 @@ bool CVPCB_MAINFRAME::ReadNetList()
     }
 
     if( !m_components.empty() )
-        m_ListCmp->SetSelection( 0, TRUE );
+        m_ListCmp->SetSelection( 0, true );
 
     DisplayStatus();
 
diff --git a/cvpcb/listboxes.cpp b/cvpcb/listboxes.cpp
index 96d0116cd9..5df7dfa10e 100644
--- a/cvpcb/listboxes.cpp
+++ b/cvpcb/listboxes.cpp
@@ -97,7 +97,7 @@ void CVPCB_MAINFRAME::BuildCmpListBox()
     }
 
     m_ListCmp->SetItemCount( m_ListCmp->m_ComponentList.Count() );
-    m_ListCmp->SetSelection( 0, TRUE );
+    m_ListCmp->SetSelection( 0, true );
 }
 
 
diff --git a/cvpcb/writenetlistpcbnew.cpp b/cvpcb/writenetlistpcbnew.cpp
index 8259fb4549..5c019cc6aa 100644
--- a/cvpcb/writenetlistpcbnew.cpp
+++ b/cvpcb/writenetlistpcbnew.cpp
@@ -116,7 +116,7 @@ int CVPCB_MAINFRAME::GenNetlistPcbnew( FILE* file,bool isEESchemaNetlist )
  */
 void WriteFootprintFilterInfos( FILE* file, COMPONENT_LIST& list )
 {
-    bool       WriteHeader = FALSE;
+    bool       WriteHeader = false;
 
     BOOST_FOREACH( COMPONENT& component, list )
     {
@@ -127,7 +127,7 @@ void WriteFootprintFilterInfos( FILE* file, COMPONENT_LIST& list )
         if( !WriteHeader )
         {
             fprintf( file, "{ Allowed footprints by component:\n" );
-            WriteHeader = TRUE;
+            WriteHeader = true;
         }
         fprintf( file, "$component %s\n",
                  TO_UTF8( component.m_Reference ) );
diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp
index 2e2c0c3642..0d93bc78c5 100644
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/class_libentry.cpp
@@ -166,7 +166,7 @@ LIB_COMPONENT::LIB_COMPONENT( const wxString& aName, CMP_LIBRARY* aLibrary ) :
     m_unitCount           = 1;
     m_pinNameOffset       = 40;
     m_options             = ENTRY_NORMAL;
-    m_unitsLocked         = FALSE;
+    m_unitsLocked         = false;
     m_showPinNumbers      = true;
     m_showPinNames        = true;
 
@@ -763,7 +763,7 @@ bool LIB_COMPONENT::Load( LINE_READER& aLineReader, wxString& aErrorMsg )
 
         p = strtok( line, " \t\r\n" );
 
-        /* This is the error flag ( if an error occurs, Res = FALSE) */
+        /* This is the error flag ( if an error occurs, Res = false) */
         Res = true;
 
         if( *line == '#' )      // a comment
diff --git a/eeschema/database.cpp b/eeschema/database.cpp
index e1fde2277b..0144c3f6b5 100644
--- a/eeschema/database.cpp
+++ b/eeschema/database.cpp
@@ -26,7 +26,7 @@
  *
  * Returns
  * true if the selected component
- * FALSE canceled order
+ * false canceled order
  * Place the name of the component has loaded, select from a list in
  * BufName
  */
diff --git a/eeschema/dialogs/dialog_build_BOM.cpp b/eeschema/dialogs/dialog_build_BOM.cpp
index a66603da0f..f92ab506f9 100644
--- a/eeschema/dialogs/dialog_build_BOM.cpp
+++ b/eeschema/dialogs/dialog_build_BOM.cpp
@@ -56,8 +56,8 @@ extern int  PrintListeGLabel( FILE* f, std::vector <BOM_LABEL>& aList );
 
 
 /* Local variables */
-static bool     s_ListByRef    = TRUE;
-static bool     s_ListByValue  = TRUE;
+static bool     s_ListByRef    = true;
+static bool     s_ListByValue  = true;
 static bool     s_ListWithSubCmponents;
 static bool     s_ListHierarchicalPinByName;
 static bool     s_ListBySheet;
@@ -465,7 +465,7 @@ void DIALOG_BUILD_BOM::CreateExportList( const wxString& aFullFileName,
         cmplist.RemoveSubComponentsFromList();
 
     // create the file
-    PrintComponentsListByRef( f, cmplist, TRUE, aIncludeSubComponents );
+    PrintComponentsListByRef( f, cmplist, true, aIncludeSubComponents );
 
     fclose( f );
 }
diff --git a/eeschema/dialogs/dialog_build_BOM.h b/eeschema/dialogs/dialog_build_BOM.h
index abbc1d9619..a5c3dca780 100644
--- a/eeschema/dialogs/dialog_build_BOM.h
+++ b/eeschema/dialogs/dialog_build_BOM.h
@@ -56,9 +56,9 @@ private:
                                        bool aIncludeSubComponents );
 
 #if defined(KICAD_GOST)
-	wxString PrintFieldData( SCH_COMPONENT* DrawLibItem, bool CompactForm = FALSE );
+    wxString PrintFieldData( SCH_COMPONENT* DrawLibItem, bool CompactForm = false );
 #else
-    void    PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem, bool CompactForm = FALSE );
+    void    PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem, bool CompactForm = false );
 #endif
 
     bool    IsFieldChecked( int aFieldId );
diff --git a/eeschema/dialogs/dialog_eeschema_config.cpp b/eeschema/dialogs/dialog_eeschema_config.cpp
index f3749687bc..6546ccdbbb 100644
--- a/eeschema/dialogs/dialog_eeschema_config.cpp
+++ b/eeschema/dialogs/dialog_eeschema_config.cpp
@@ -128,7 +128,7 @@ void DIALOG_EESCHEMA_CONFIG::OnButtonUpClick( wxCommandEvent& event )
         m_ListLibr->SetSelection(jj-1);
     }
 
-    m_LibListChanged = TRUE;
+    m_LibListChanged = true;
 }
 
 
@@ -162,7 +162,7 @@ void DIALOG_EESCHEMA_CONFIG::OnButtonDownClick( wxCommandEvent& event )
         m_ListLibr->SetSelection(jj+1);
     }
 
-    m_LibListChanged = TRUE;
+    m_LibListChanged = true;
 }
 
 
@@ -243,7 +243,7 @@ void DIALOG_EESCHEMA_CONFIG::OnRemoveLibClick( wxCommandEvent& event )
     for( int ii = selections.GetCount()-1; ii >= 0; ii-- )
     {
         m_ListLibr->Delete( selections[ii] );
-        m_LibListChanged = TRUE;
+        m_LibListChanged = true;
     }
 
     // Select next item after deleted in m_ListLibr
@@ -321,7 +321,7 @@ void DIALOG_EESCHEMA_CONFIG::OnAddOrInsertLibClick( wxCommandEvent& event )
         //Add or insert new library name, if not already in list
         if( m_ListLibr->FindString( libfilename, fn.IsCaseSensitive() ) == wxNOT_FOUND )
         {
-            m_LibListChanged = TRUE;
+            m_LibListChanged = true;
 
             if( event.GetId() == ID_ADD_LIB )
                 m_ListLibr->Append( libfilename );
diff --git a/eeschema/dialogs/dialog_erc.h b/eeschema/dialogs/dialog_erc.h
index 2b678f959e..e4eb2dffe6 100644
--- a/eeschema/dialogs/dialog_erc.h
+++ b/eeschema/dialogs/dialog_erc.h
@@ -15,7 +15,7 @@
 
 /* Variable locales */
 extern int           DiagErc[PIN_NMAX][PIN_NMAX];
-extern bool          DiagErcTableInit; // go to TRUE after DiagErc init
+extern bool          DiagErcTableInit; // go to true after DiagErc init
 extern int           DefaultDiagErc[PIN_NMAX][PIN_NMAX];
 extern const wxChar* CommentERC_H[];
 extern const wxChar* CommentERC_V[];
@@ -57,7 +57,7 @@ public:
     void OnResetMatrixClick( wxCommandEvent& event );
 
     // Double click on a marker info:
-	void OnLeftDClickMarkersList( wxCommandEvent& event );
+    void OnLeftDClickMarkersList( wxCommandEvent& event );
 
     void TestErc( wxArrayString* aMessagesList );
     void DisplayERC_MarkersList();
diff --git a/eeschema/dialogs/dialog_lib_edit_text.cpp b/eeschema/dialogs/dialog_lib_edit_text.cpp
index 95a2fec0c9..14f74e1e40 100644
--- a/eeschema/dialogs/dialog_lib_edit_text.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_text.cpp
@@ -66,11 +66,11 @@ void DIALOG_LIB_EDIT_TEXT::initDlg( )
         m_TextValue->SetValue( m_GraphicText->m_Text );
 
         if ( m_GraphicText->GetUnit() == 0 )
-            m_CommonUnit->SetValue( TRUE );
+            m_CommonUnit->SetValue( true );
         if ( m_GraphicText->GetConvert() == 0 )
-            m_CommonConvert->SetValue( TRUE );
+            m_CommonConvert->SetValue( true );
         if ( m_GraphicText->m_Orient == TEXT_ORIENT_VERT )
-            m_Orient->SetValue( TRUE );
+            m_Orient->SetValue( true );
 
         int shape = 0;
         if ( m_GraphicText->m_Italic )
@@ -118,11 +118,11 @@ void DIALOG_LIB_EDIT_TEXT::initDlg( )
         m_TextSize->SetValue( msg );
 
         if ( ! m_Parent->m_drawSpecificUnit )
-            m_CommonUnit->SetValue( TRUE );
+            m_CommonUnit->SetValue( true );
         if ( ! m_Parent->m_drawSpecificConvert )
-            m_CommonConvert->SetValue( TRUE );
+            m_CommonConvert->SetValue( true );
         if ( m_Parent->m_textOrientation == TEXT_ORIENT_VERT )
-            m_Orient->SetValue( TRUE );
+            m_Orient->SetValue( true );
     }
 
     msg = m_TextSizeText->GetLabel() + ReturnUnitSymbol();
diff --git a/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp b/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp
index af5b676bfb..de275ab27c 100644
--- a/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic_HPGL.cpp
@@ -191,13 +191,13 @@ void DIALOG_PLOT_SCHEMATIC_HPGL::SetPageOffsetValue()
 
         m_PlotOrgPosition_Y->SetValue( msg );
 
-        m_PlotOrgPosition_X->Enable( TRUE );
-        m_PlotOrgPosition_Y->Enable( TRUE );
+        m_PlotOrgPosition_X->Enable( true );
+        m_PlotOrgPosition_Y->Enable( true );
     }
     else
     {
-        m_PlotOrgPosition_X->Enable( FALSE );
-        m_PlotOrgPosition_Y->Enable( FALSE );
+        m_PlotOrgPosition_X->Enable( false );
+        m_PlotOrgPosition_Y->Enable( false );
     }
 }
 
diff --git a/eeschema/dialogs/dialog_plot_schematic_PS.cpp b/eeschema/dialogs/dialog_plot_schematic_PS.cpp
index ec5ecec5fe..d17a8235a9 100644
--- a/eeschema/dialogs/dialog_plot_schematic_PS.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic_PS.cpp
@@ -140,7 +140,7 @@ void DIALOG_PLOT_SCHEMATIC_PS::OnPlotCurrent( wxCommandEvent& event )
 
 void DIALOG_PLOT_SCHEMATIC_PS::OnPlotAll( wxCommandEvent& event )
 {
-    m_select_PlotAll = TRUE;
+    m_select_PlotAll = true;
 
     initOptVars();
     createPSFile();
diff --git a/eeschema/eeredraw.cpp b/eeschema/eeredraw.cpp
index 597d42b1cb..4090ea268d 100644
--- a/eeschema/eeredraw.cpp
+++ b/eeschema/eeredraw.cpp
@@ -73,7 +73,7 @@ void SCH_EDIT_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg )
     TraceWorkSheet( DC, GetScreen(), g_DrawDefaultLineThickness );
 
     if( m_canvas->IsMouseCaptured() )
-        m_canvas->CallMouseCapture( DC, wxDefaultPosition, FALSE );
+        m_canvas->CallMouseCapture( DC, wxDefaultPosition, false );
 
     m_canvas->DrawCrossHair( DC );
 
diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp
index 9dd3169f54..15ebf4435b 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@@ -500,7 +500,7 @@ bool WriteDiagnosticERC( const wxString& aFullFileName )
     int             count = 0;
 
     if( ( file = wxFopen( aFullFileName, wxT( "wt" ) ) ) == NULL )
-        return FALSE;
+        return false;
 
     msg = _( "ERC report" );
 
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index c56a73255f..70c9a837f4 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -1120,7 +1120,7 @@ void LIB_PIN::DrawPinTexts( EDA_DRAW_PANEL* panel,
     }
 
     if( m_name.IsEmpty() )
-        DrawPinName = FALSE;
+        DrawPinName = false;
 
     if( TextInside )  /* Draw the text inside, but the pin numbers outside. */
     {
@@ -1415,7 +1415,7 @@ void LIB_PIN::PlotPinTexts( PLOTTER* plotter,
     }
 
     if( m_name.IsEmpty() )
-        DrawPinName = FALSE;
+        DrawPinName = false;
 
     /* Draw the text inside, but the pin numbers outside. */
     if( TextInside )
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index 93d9a2abf3..7e92362ae9 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -293,7 +293,7 @@ int SCH_COMPONENT::GetPartCount() const
 void SCH_COMPONENT::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset,
                           int DrawMode, int Color, bool DrawPinText )
 {
-    bool           dummy = FALSE;
+    bool           dummy = false;
 
     LIB_COMPONENT* Entry = CMP_LIBRARY::FindLibraryComponent( m_ChipName );
 
@@ -854,7 +854,7 @@ void SCH_COMPONENT::SetOrientation( int aOrientation )
         break;
 
     default:
-        transform = FALSE;
+        transform = false;
         wxMessageBox( wxT( "SetRotateMiroir() error: ill value" ) );
         break;
     }
diff --git a/eeschema/viewlibs.cpp b/eeschema/viewlibs.cpp
index db2e591f3e..f5f231221d 100644
--- a/eeschema/viewlibs.cpp
+++ b/eeschema/viewlibs.cpp
@@ -57,13 +57,13 @@ void LIB_VIEW_FRAME::Process_Special_Functions( wxCommandEvent& event )
 
     case ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT:
         m_mainToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, true );
-        m_mainToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, FALSE );
+        m_mainToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, false );
         m_convert = 1;
         m_canvas->Refresh();
         break;
 
     case ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT:
-        m_mainToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, FALSE );
+        m_mainToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, false );
         m_mainToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, true );
         m_convert = 2;
         m_canvas->Refresh();
diff --git a/gerbview/dcode.cpp b/gerbview/dcode.cpp
index 0d9c29fba2..fa7aabf38f 100644
--- a/gerbview/dcode.cpp
+++ b/gerbview/dcode.cpp
@@ -85,8 +85,8 @@ void D_CODE::Clear_D_CODE_Data()
     m_Shape      = APT_CIRCLE;
     m_Drill.x    = m_Drill.y = 0;
     m_DrillShape = APT_DEF_NO_HOLE;
-    m_InUse      = FALSE;
-    m_Defined    = FALSE;
+    m_InUse      = false;
+    m_Defined    = false;
     m_Macro      = NULL;
     m_Rotation   = 0.0;
     m_EdgesCount = 0;
diff --git a/gerbview/dcode.h b/gerbview/dcode.h
index 996d82b9fa..bebf665331 100644
--- a/gerbview/dcode.h
+++ b/gerbview/dcode.h
@@ -99,8 +99,8 @@ public:
     APERTURE_DEF_HOLETYPE m_DrillShape;     /* shape of the hole (0 = no hole, round = 1, rect = 2) */
     double                m_Rotation;       /* shape rotation in degrees */
     int                   m_EdgesCount;     /* in aperture definition Polygon only: number of edges for the polygon */
-    bool                  m_InUse;          /* FALSE if not used */
-    bool                  m_Defined;        /* FALSE if not defined */
+    bool                  m_InUse;          /* false if not used */
+    bool                  m_Defined;        /* false if not defined */
     wxString              m_SpecialDescr;
 
 public:
diff --git a/gerbview/dialogs/dialog_print_using_printer.cpp b/gerbview/dialogs/dialog_print_using_printer.cpp
index fecd700cb0..5a6cb6948c 100644
--- a/gerbview/dialogs/dialog_print_using_printer.cpp
+++ b/gerbview/dialogs/dialog_print_using_printer.cpp
@@ -158,7 +158,7 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
         m_BoxSelectLayer[ii] = new wxCheckBox( this, -1, msg );
 
         if( mask & s_SelectedLayers )
-            m_BoxSelectLayer[ii]->SetValue( TRUE );
+            m_BoxSelectLayer[ii]->SetValue( true );
         if( ii < 16 )
             m_leftLayersBoxSizer->Add( m_BoxSelectLayer[ii],
                                          wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE );
@@ -418,7 +418,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event )
     wxPreviewFrame* frame = new wxPreviewFrame( preview, this, title, WPos, WSize );
 
     frame->Initialize();
-    frame->Show( TRUE );
+    frame->Show( true );
 }
 
 
@@ -451,7 +451,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintButtonClick( wxCommandEvent& event )
     ( (wxPostScriptDC*) dc )->SetResolution( 600 );  // Postscript DC resolution is 600 ppi
 #endif
 
-    if( !printer.Print( this, &printout, TRUE ) )
+    if( !printer.Print( this, &printout, true ) )
     {
         if( wxPrinter::GetLastError() == wxPRINTER_ERROR )
             DisplayError( this, _( "There was a problem printing" ) );
diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp
index 7aca2fe892..85712c75ea 100644
--- a/gerbview/export_to_pcbnew.cpp
+++ b/gerbview/export_to_pcbnew.cpp
@@ -96,7 +96,7 @@ void GERBVIEW_FRAME::ExportDataInPcbnewFormat( wxCommandEvent& event )
                                      msg,
                                      this,
                                      wxFD_SAVE,
-                                     FALSE
+                                     false
                                      );
     if( FullFileName == wxEmptyString )
         return;
diff --git a/gerbview/initpcb.cpp b/gerbview/initpcb.cpp
index fbec7a140b..0e5fc1c33f 100644
--- a/gerbview/initpcb.cpp
+++ b/gerbview/initpcb.cpp
@@ -42,12 +42,12 @@ bool GERBVIEW_FRAME::Clear_Pcb( bool query )
     int layer;
 
     if( GetBoard() == NULL )
-        return FALSE;
+        return false;
 
     if( query && GetScreen()->IsModify() )
     {
         if( !IsOK( this, _( "Current data will be lost?" ) ) )
-            return FALSE;
+            return false;
     }
 
     SetCurItem( NULL );
diff --git a/gerbview/readgerb.cpp b/gerbview/readgerb.cpp
index c1f9cb7c03..a77b93deee 100644
--- a/gerbview/readgerb.cpp
+++ b/gerbview/readgerb.cpp
@@ -45,7 +45,7 @@ bool GERBVIEW_FRAME::Read_GERBER_File( const wxString& GERBER_FullFileName,
     {
         msg = _( "File " ) + GERBER_FullFileName + _( " not found" );
         DisplayError( this, msg, 10 );
-        return FALSE;
+        return false;
     }
 
     gerber->m_FileName = GERBER_FullFileName;
diff --git a/include/fctsys.h b/include/fctsys.h
index ba0d222e23..6f10a4214d 100644
--- a/include/fctsys.h
+++ b/include/fctsys.h
@@ -49,11 +49,6 @@
 #define UNIX_STRING_DIR_SEP wxT( "/" )
 #define WIN_STRING_DIR_SEP  wxT( "\\" )
 
-#ifndef TRUE
-#define TRUE       ((bool)1)
-#define FALSE      ((bool)0)
-#endif
-
 #define USE_RESIZE_BORDER
 #if defined(__UNIX__) || defined(USE_RESIZE_BORDER)
 #define MAYBE_RESIZE_BORDER wxRESIZE_BORDER   // linux users like resizeable
diff --git a/kicad/class_treeprojectfiles.cpp b/kicad/class_treeprojectfiles.cpp
index 3a6874f7db..c55c6c05e1 100644
--- a/kicad/class_treeprojectfiles.cpp
+++ b/kicad/class_treeprojectfiles.cpp
@@ -33,7 +33,7 @@ TREEPROJECTFILES::TREEPROJECTFILES( TREE_PROJECT_FRAME* parent ) :
     iconsize.y = dummy.GetHeight();
 
     // Make an image list containing small icons
-    m_ImageList = new wxImageList( iconsize.x, iconsize.y, TRUE, TREE_MAX );
+    m_ImageList = new wxImageList( iconsize.x, iconsize.y, true, TREE_MAX );
 
     m_ImageList->Add( KiBitmap( kicad_icon_small_xpm ) );       // TREE_PROJECT
     m_ImageList->Add( KiBitmap( eeschema_xpm ) );               // TREE_SCHEMA
diff --git a/kicad/tree_project_frame.cpp b/kicad/tree_project_frame.cpp
index 14229f5897..e3c7831254 100644
--- a/kicad/tree_project_frame.cpp
+++ b/kicad/tree_project_frame.cpp
@@ -688,7 +688,7 @@ void TREE_PROJECT_FRAME::ReCreateTreePrj()
                                                    TREE_PROJECT - 1,
                                                    TREE_PROJECT - 1 );
 
-    m_TreeProject->SetItemBold( rootcellule, TRUE );
+    m_TreeProject->SetItemBold( rootcellule, true );
 
     m_TreeProject->SetItemData( rootcellule,
                                 new TREEPROJECT_ITEM( TREE_PROJECT,
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index a574957e05..700daeff7e 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones.cpp
@@ -324,9 +324,9 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab
     m_Zone_Setting->SetCornerRadius( ReturnValueFromString( g_UserUnit, txtvalue, m_Parent->GetInternalUnits() ) );
 
     if( m_OrientEdgesOpt->GetSelection() == 0 )
-        g_Zone_45_Only = FALSE;
+        g_Zone_45_Only = false;
     else
-        g_Zone_45_Only = TRUE;
+        g_Zone_45_Only = true;
 
     m_Zone_Setting->m_ThermalReliefGap = ReturnValueFromTextCtrl( *m_AntipadSizeValue,
                                                                        PCB_INTERNAL_UNIT );
diff --git a/pcbnew/dialogs/dialog_display_options.cpp b/pcbnew/dialogs/dialog_display_options.cpp
index 60725bad40..e08c611da6 100644
--- a/pcbnew/dialogs/dialog_display_options.cpp
+++ b/pcbnew/dialogs/dialog_display_options.cpp
@@ -106,12 +106,12 @@ void DIALOG_DISPLAY_OPTIONS::OnOkClick(wxCommandEvent& event)
     if ( m_Show_Page_Limits->GetSelection() == 0 )
         g_ShowPageLimits = true;
     else
-        g_ShowPageLimits = FALSE;
+        g_ShowPageLimits = false;
 
     if ( m_OptDisplayTracks->GetSelection() == 1 )
         DisplayOpt.DisplayPcbTrackFill = true;
     else
-        DisplayOpt.DisplayPcbTrackFill = FALSE;
+        DisplayOpt.DisplayPcbTrackFill = false;
 
     m_Parent->m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill;
     DisplayOpt.m_DisplayViaMode = (VIA_DISPLAY_MODE_T) m_OptDisplayViaHole->GetSelection();
diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
index 314dd7af15..f79d18209b 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
@@ -72,7 +72,7 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()
     m_LayerCtrl->SetSelection(
          (m_CurrentModule->GetLayer() == LAYER_N_BACK) ? 1 : 0 );
 
-    bool select = FALSE;
+    bool select = false;
     switch( (int) m_CurrentModule->GetOrientation() )
     {
     case 0:
@@ -96,7 +96,7 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()
 
     default:
         m_OrientCtrl->SetSelection( 4 );
-        select = TRUE;
+        select = true;
         break;
     }
 
@@ -168,27 +168,27 @@ void DIALOG_MODULE_BOARD_EDITOR::ModuleOrientEvent( wxCommandEvent& event )
     switch( m_OrientCtrl->GetSelection() )
     {
     case 0:
-        m_OrientValue->Enable( FALSE );
+        m_OrientValue->Enable( false );
         m_OrientValue->SetValue( wxT( "0" ) );
         break;
 
     case 1:
-        m_OrientValue->Enable( FALSE );
+        m_OrientValue->Enable( false );
         m_OrientValue->SetValue( wxT( "900" ) );
         break;
 
     case 2:
-        m_OrientValue->Enable( FALSE );
+        m_OrientValue->Enable( false );
         m_OrientValue->SetValue( wxT( "2700" ) );
         break;
 
     case 3:
-        m_OrientValue->Enable( FALSE );
+        m_OrientValue->Enable( false );
         m_OrientValue->SetValue( wxT( "1800" ) );
         break;
 
     default:
-        m_OrientValue->Enable( TRUE );
+        m_OrientValue->Enable( true );
         break;
     }
 }
@@ -398,7 +398,7 @@ void DIALOG_MODULE_BOARD_EDITOR::Browse3DLib( wxCommandEvent& event )
                                      mask,
                                      this,
                                      wxFD_OPEN,
-                                     TRUE
+                                     true
                                      );
 
     if( fullfilename == wxEmptyString )
@@ -526,14 +526,14 @@ void DIALOG_MODULE_BOARD_EDITOR::OnOkClick( wxCommandEvent& event )
                                  orient - m_CurrentModule->m_Orient );
 
     // Set component side, that also have effect on the fields positions on board
-    bool change_layer = FALSE;
+    bool change_layer = false;
     if( m_LayerCtrl->GetSelection() == 0 )     // layer req = COMPONENT
     {
         if( m_CurrentModule->GetLayer() == LAYER_N_BACK )
-            change_layer = TRUE;
+            change_layer = true;
     }
     else if( m_CurrentModule->GetLayer() == LAYER_N_FRONT )
-        change_layer = TRUE;
+        change_layer = true;
 
     if( change_layer )
         m_CurrentModule->Flip( m_CurrentModule->m_Pos );
diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
index 54e8ab964b..555e840c5c 100644
--- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
@@ -273,7 +273,7 @@ void DIALOG_MODULE_MODULE_EDITOR::BrowseAndAdd3DLib( wxCommandEvent& event )
                                      mask,
                                      this,
                                      wxFD_OPEN,
-                                     TRUE
+                                     true
                                      );
 
     if( fullfilename == wxEmptyString )
diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp
index 249f82958d..15f3b65fd9 100644
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@@ -320,7 +320,7 @@ void DIALOG_GENDRILL::SetParams( void )
     m_createMap = m_Choice_Drill_Map->GetSelection();
     m_createRpt = m_Choice_Drill_Report->GetSelection();
 
-    m_UnitDrillIsInch = (m_Choice_Unit->GetSelection() == 0) ? FALSE : TRUE;
+    m_UnitDrillIsInch = (m_Choice_Unit->GetSelection() == 0) ? false : true;
     m_MinimalHeader   = m_Check_Minimal->IsChecked();
     m_Mirror = m_Check_Mirror->IsChecked();
     m_ZerosFormat = m_Choice_Zeros_Format->GetSelection();
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
index b6d806e52a..0ac42a8555 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
@@ -234,7 +234,7 @@ void DialogGraphicItemProperties::OnOkClick( wxCommandEvent& event )
 
     m_Parent->GetBoard()->SetDesignSettings( m_BrdSettings );
 
-    Close( TRUE );
+    Close( true );
 }
 
 void DialogGraphicItemProperties::OnCancelClick( wxCommandEvent& event )
diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp
index 5bfe04d249..39b7223e1f 100644
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/pcbnew/dialogs/dialog_netlist.cpp
@@ -105,10 +105,10 @@ void DIALOG_NETLIST::OnReadNetlistFileClick( wxCommandEvent& event )
 
     m_Parent->ReadPcbNetlist( m_NetlistFilenameCtrl->GetValue(),
                               fn.GetFullPath(), m_MessageWindow,
-                              m_ChangeExistingFootprintCtrl->GetSelection() == 1 ? TRUE : FALSE,
-                              m_DeleteBadTracks->GetSelection() == 1 ? TRUE : FALSE,
-                              m_RemoveExtraFootprintsCtrl->GetSelection() == 1 ? TRUE : FALSE,
-                              m_Select_By_Timestamp->GetSelection() == 1 ? TRUE : FALSE );
+                              m_ChangeExistingFootprintCtrl->GetSelection() == 1 ? true : false,
+                              m_DeleteBadTracks->GetSelection() == 1 ? true : false,
+                              m_RemoveExtraFootprintsCtrl->GetSelection() == 1 ? true : false,
+                              m_Select_By_Timestamp->GetSelection() == 1 ? true : false );
 }
 
 
@@ -124,7 +124,7 @@ void DIALOG_NETLIST::OnTestFootprintsClick( wxCommandEvent& event )
 
 void DIALOG_NETLIST::OnCompileRatsnestClick( wxCommandEvent& event )
 {
-    m_Parent->Compile_Ratsnest( m_DC, TRUE );
+    m_Parent->Compile_Ratsnest( m_DC, true );
 }
 
 
diff --git a/pcbnew/dialogs/dialog_orient_footprints.cpp b/pcbnew/dialogs/dialog_orient_footprints.cpp
index 2cafc222bc..2fd7346d3e 100644
--- a/pcbnew/dialogs/dialog_orient_footprints.cpp
+++ b/pcbnew/dialogs/dialog_orient_footprints.cpp
@@ -136,10 +136,10 @@ bool PCB_EDIT_FRAME::ReOrientModules( const wxString& ModuleMask,
         if( module->IsLocked() && !include_fixe )
             continue;
 
-        if( WildCompareString( ModuleMask, module->m_Reference->m_Text, FALSE ) )
+        if( WildCompareString( ModuleMask, module->m_Reference->m_Text, false ) )
         {
             modified = true;
-            Rotate_Module( NULL, module, Orient, FALSE );
+            Rotate_Module( NULL, module, Orient, false );
         }
     }
 
diff --git a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.cpp b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.cpp
index 6cf8d4f56d..b733dd2fae 100644
--- a/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.cpp
+++ b/pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths.cpp
@@ -165,7 +165,7 @@ void DIALOG_PCBNEW_CONFIG_LIBS::OnButtonUpClick( wxCommandEvent& event )
         m_ListLibr->SetSelection(jj-1);
     }
 
-    m_LibListChanged = TRUE;
+    m_LibListChanged = true;
 }
 
 
@@ -199,7 +199,7 @@ void DIALOG_PCBNEW_CONFIG_LIBS::OnButtonDownClick( wxCommandEvent& event )
         m_ListLibr->SetSelection(jj+1);
     }
 
-    m_LibListChanged = TRUE;
+    m_LibListChanged = true;
 }
 
 
@@ -215,7 +215,7 @@ void DIALOG_PCBNEW_CONFIG_LIBS::OnRemoveLibClick( wxCommandEvent& event )
     for( int ii = selections.GetCount()-1; ii >= 0; ii-- )
     {
         m_ListLibr->Delete( selections[ii] );
-        m_LibListChanged = TRUE;
+        m_LibListChanged = true;
     }
 }
 
@@ -280,7 +280,7 @@ void DIALOG_PCBNEW_CONFIG_LIBS::OnAddOrInsertLibClick( wxCommandEvent& event )
         //Add or insert new library name, if not already in list
         if( m_ListLibr->FindString( libfilename, fn.IsCaseSensitive() ) == wxNOT_FOUND )
         {
-            m_LibListChanged = TRUE;
+            m_LibListChanged = true;
 
             if( event.GetId() == ID_ADD_LIB )
                 m_ListLibr->Append( libfilename );
diff --git a/pcbnew/dialogs/dialog_print_for_modedit.cpp b/pcbnew/dialogs/dialog_print_for_modedit.cpp
index 88259fbe10..6269bb1c43 100644
--- a/pcbnew/dialogs/dialog_print_for_modedit.cpp
+++ b/pcbnew/dialogs/dialog_print_for_modedit.cpp
@@ -194,7 +194,7 @@ void DIALOG_PRINT_FOR_MODEDIT::OnPrintPreview( wxCommandEvent& event )
     wxPreviewFrame* frame = new wxPreviewFrame( preview, this, title, WPos, WSize );
 
     frame->Initialize();
-    frame->Show( TRUE );
+    frame->Show( true );
 }
 
 
@@ -222,7 +222,7 @@ void DIALOG_PRINT_FOR_MODEDIT::OnPrintButtonClick( wxCommandEvent& event )
     ( (wxPostScriptDC*) dc )->SetResolution( 600 );  // Postscript DC resolution is 600 ppi
 #endif
 
-    if( !printer.Print( this, &printout, TRUE ) )
+    if( !printer.Print( this, &printout, true ) )
     {
         if( wxPrinter::GetLastError() == wxPRINTER_ERROR )
             DisplayError( this, _( "There was a problem printing" ) );
diff --git a/pcbnew/dialogs/dialog_print_using_printer.cpp b/pcbnew/dialogs/dialog_print_using_printer.cpp
index 70e32b69d7..c77ba1c488 100644
--- a/pcbnew/dialogs/dialog_print_using_printer.cpp
+++ b/pcbnew/dialogs/dialog_print_using_printer.cpp
@@ -508,7 +508,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event )
     wxPreviewFrame* frame = new wxPreviewFrame( preview, this, title, WPos, WSize );
 
     frame->Initialize();
-    frame->Show( TRUE );
+    frame->Show( true );
 }
 
 
@@ -541,7 +541,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintButtonClick( wxCommandEvent& event )
     ( (wxPostScriptDC*) dc )->SetResolution( 600 );  // Postscript DC resolution is 600 ppi
 #endif
 
-    if( !printer.Print( this, &printout, TRUE ) )
+    if( !printer.Print( this, &printout, true ) )
     {
         if( wxPrinter::GetLastError() == wxPRINTER_ERROR )
             DisplayError( this, _( "There was a problem printing" ) );
diff --git a/pcbnew/export_vrml.cpp b/pcbnew/export_vrml.cpp
index 8429b4f4f1..ff7dd15272 100644
--- a/pcbnew/export_vrml.cpp
+++ b/pcbnew/export_vrml.cpp
@@ -277,7 +277,7 @@ static void write_triangle_bag( FILE* output_file, int color_index, /*{{{*/
         "            }\n",
         "          }\n",
         "          geometry IndexedFaceSet {\n",
-        "            solid TRUE\n",
+        "            solid true\n",
         "            coord Coordinate {\n",
         "              point [\n",
         0,                                          /* Coordinates marker */
diff --git a/polygon/PolyLine.cpp b/polygon/PolyLine.cpp
index cf40aec209..672b973993 100644
--- a/polygon/PolyLine.cpp
+++ b/polygon/PolyLine.cpp
@@ -59,7 +59,7 @@ CPolyLine::~CPolyLine()
  * because copper areas have only one outside contour
  * Therefore, if this results in new CPolyLines, return them as std::vector pa
  * @param aExtraPolyList: pointer on a std::vector<CPolyLine*> to store extra CPolyLines
- * @param bRetainArcs == TRUE, try to retain arcs in polys
+ * @param bRetainArcs == true, try to retain arcs in polys
  * @return number of external contours, or -1 if error
  */
 int CPolyLine::NormalizeWithKbool( std::vector<CPolyLine*> * aExtraPolyList, bool bRetainArcs )
@@ -150,7 +150,7 @@ int CPolyLine::NormalizeWithKbool( std::vector<CPolyLine*> * aExtraPolyList, boo
             }
 
             m_Kbool_Poly_Engine->EndPolygonGet();
-            polyline->Close( STRAIGHT, FALSE );
+            polyline->Close( STRAIGHT, false );
             n_ext_cont++;
         }
     }
@@ -194,10 +194,10 @@ int CPolyLine::NormalizeWithKbool( std::vector<CPolyLine*> * aExtraPolyList, boo
             {
                 int x = (*hole)[ii]; ii++;
                 int y = (*hole)[ii];
-                polyline->AppendCorner( x, y, STRAIGHT, FALSE );
+                polyline->AppendCorner( x, y, STRAIGHT, false );
             }
 
-            polyline->Close( STRAIGHT, FALSE );
+            polyline->Close( STRAIGHT, false );
         }
     }
 
@@ -605,7 +605,7 @@ void ArmBoolEng( Bool_Engine* aBooleng, bool aConvertHoles )
     aBooleng->SetSmoothAber( SMOOTHABER );
     aBooleng->SetMaxlinemerge( MAXLINEMERGE );
     aBooleng->SetRoundfactor( ROUNDFACTOR );
-    aBooleng->SetWindingRule( TRUE );           // This is the default kbool value
+    aBooleng->SetWindingRule( true );           // This is the default kbool value
 
     if( aConvertHoles )
     {
@@ -668,7 +668,7 @@ int CPolyLine::RestoreArcs( std::vector<CArc> * arc_array, std::vector<CPolyLine
         int arc_yf  = (*arc_array)[iarc].yf;
         int n_steps = (*arc_array)[iarc].n_steps;
         int style   = (*arc_array)[iarc].style;
-        bFound = FALSE;
+        bFound = false;
 
         // loop through polys
         for( int ip = 0; ip<n_polys; ip++ )
@@ -701,7 +701,7 @@ int CPolyLine::RestoreArcs( std::vector<CArc> * arc_array, std::vector<CPolyLine
                             if( xf == arc_xf && yf == arc_yf )
                             {
                                 // arc from ic to ic2
-                                bFound    = TRUE;
+                                bFound    = true;
                                 arc_start = ic;
                                 arc_end   = ic2;
                             }
@@ -716,7 +716,7 @@ int CPolyLine::RestoreArcs( std::vector<CArc> * arc_array, std::vector<CPolyLine
                                 if( xf == arc_xf && yf == arc_yf )
                                 {
                                     // arc from ic2 to ic
-                                    bFound    = TRUE;
+                                    bFound    = true;
                                     arc_start = ic2;
                                     arc_end   = ic;
                                     style = 3 - style;
@@ -751,7 +751,7 @@ int CPolyLine::RestoreArcs( std::vector<CArc> * arc_array, std::vector<CPolyLine
         }
 
         if( bFound )
-            (*arc_array)[iarc].bFound = TRUE;
+            (*arc_array)[iarc].bFound = true;
     }
 
     // now delete all marked corners
@@ -764,7 +764,7 @@ int CPolyLine::RestoreArcs( std::vector<CArc> * arc_array, std::vector<CPolyLine
         for( int ic = poly->GetNumCorners() - 1; ic>=0; ic-- )
         {
             if( poly->GetUtility( ic ) )
-                poly->DeleteCorner( ic, FALSE );
+                poly->DeleteCorner( ic, false );
         }
     }
 
@@ -794,7 +794,7 @@ void CPolyLine::Start( int layer, int x, int y, int hatch )
     m_layer      = layer;
     m_HatchStyle = hatch;
     CPolyPt poly_pt( x, y );
-    poly_pt.end_contour = FALSE;
+    poly_pt.end_contour = false;
 
     corner.push_back( poly_pt );
     side_style.push_back( 0 );
@@ -807,7 +807,7 @@ void CPolyLine::AppendCorner( int x, int y, int style, bool bDraw )
 {
     UnHatch();
     CPolyPt poly_pt( x, y );
-    poly_pt.end_contour = FALSE;
+    poly_pt.end_contour = false;
 
     // add entries for new corner and side
     corner.push_back( poly_pt );
@@ -829,7 +829,7 @@ void CPolyLine::Close( int style, bool bDraw )
     }
     UnHatch();
     side_style[corner.size() - 1] = style;
-    corner[corner.size() - 1].end_contour = TRUE;
+    corner[corner.size() - 1].end_contour = true;
     if( bDraw )
         Hatch();
 }
@@ -870,7 +870,7 @@ void CPolyLine::DeleteCorner( int ic, bool bDraw )
         corner.erase( corner.begin() + ic );
         side_style.erase( side_style.begin() + ic );
         if( ic == iend )
-            corner[ic - 1].end_contour = TRUE;
+            corner[ic - 1].end_contour = true;
     }
     if( bClosed && GetContourSize( icont ) < 3 )
     {
@@ -1156,8 +1156,8 @@ void CPolyLine::InsertCorner( int ic, int x, int y )
     {
         if( corner[ic].end_contour )
         {
-            corner[ic + 1].end_contour = TRUE;
-            corner[ic].end_contour = FALSE;
+            corner[ic + 1].end_contour = true;
+            corner[ic].end_contour = false;
         }
     }
     Hatch();