diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index 926d2d6080..2dfb3045b9 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -188,7 +188,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow
 
 void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnListItemDeselected( wxListEvent& event )
 {
-    D( printf( "OnListItemDeselected()\n" ); )
+    DBG( printf( "OnListItemDeselected()\n" ); )
 
     if( !m_skipCopyFromPanel )
     {
@@ -200,7 +200,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnListItemDeselected( wxListEvent& even
 
 void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::OnListItemSelected( wxListEvent& event )
 {
-    D( printf( "OnListItemSelected()\n" ); )
+    DBG( printf( "OnListItemSelected()\n" ); )
 
     // remember the selected row, statically
     s_SelectedRow = event.GetIndex();
@@ -448,7 +448,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::moveUpButtonHandler( wxCommandEvent& ev
     // and in the fieldListCtrl
     SCH_FIELD tmp = m_FieldsBuf[fieldNdx - 1];
 
-    D( printf( "tmp.m_Text=\"%s\" tmp.m_Name=\"%s\"\n",
+    DBG( printf( "tmp.m_Text=\"%s\" tmp.m_Name=\"%s\"\n",
                TO_UTF8( tmp.GetText() ), TO_UTF8( tmp.GetName( false ) ) ); )
 
     m_FieldsBuf[fieldNdx - 1] = m_FieldsBuf[fieldNdx];
@@ -866,12 +866,12 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
     if( mirror == CMP_MIRROR_X )
     {
         mirrorRadioBox->SetSelection( 1 );
-        D( printf( "mirror=X,1\n" ); )
+        DBG( printf( "mirror=X,1\n" ); )
     }
     else if( mirror == CMP_MIRROR_Y )
     {
         mirrorRadioBox->SetSelection( 2 );
-        D( printf( "mirror=Y,2\n" ); )
+        DBG( printf( "mirror=Y,2\n" ); )
     }
     else
         mirrorRadioBox->SetSelection( 0 );
@@ -891,7 +891,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
     // Show the "Parts Locked" option?
     if( !m_LibEntry || !m_LibEntry->UnitsLocked() )
     {
-        D( printf( "partsAreLocked->false\n" ); )
+        DBG( printf( "partsAreLocked->false\n" ); )
         partsAreLockedLabel->Show( false );
     }
 
diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
index d4f5b2159e..8fe7d7c2a5 100644
--- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
+++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
@@ -472,7 +472,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()
     // fixed fields:
     for( int i=0; i<MANDATORY_FIELDS; ++i )
     {
-        D( printf( "add fixed:%s\n", TO_UTF8( cmpFields[i].GetName() ) ); )
+        DBG( printf( "add fixed:%s\n", TO_UTF8( cmpFields[i].GetName() ) ); )
         m_FieldsBuf.push_back( cmpFields[i] );
     }
 
@@ -497,7 +497,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()
         // values from the component will be set.
         if( !libField )
         {
-            D( printf( "add template:%s\n", TO_UTF8( it->m_Name ) ); )
+            DBG( printf( "add template:%s\n", TO_UTF8( it->m_Name ) ); )
 
             fld.SetName( it->m_Name );
             fld.SetText( it->m_Value );   // empty? ok too.
@@ -509,7 +509,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()
         }
         else
         {
-            D( printf( "match template:%s\n", TO_UTF8( libField->GetName() ) ); )
+            DBG( printf( "match template:%s\n", TO_UTF8( libField->GetName() ) ); )
             fld = *libField;    // copy values from component, m_Name too
         }
 
@@ -525,7 +525,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()
 
         if( !buf )
         {
-            D( printf( "add cmp:%s\n", TO_UTF8( cmp->GetName() ) ); )
+            DBG( printf( "add cmp:%s\n", TO_UTF8( cmp->GetName() ) ); )
             m_FieldsBuf.push_back( *cmp );
         }
     }
@@ -721,11 +721,11 @@ bool DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::copyPanelToSelectedField()
     if( field.GetId() >= MANDATORY_FIELDS )
     {
         wxString name = fieldNameTextCtrl->GetValue();
-        D( printf("name:%s\n", TO_UTF8( name ) ); )
+        DBG( printf("name:%s\n", TO_UTF8( name ) ); )
         field.SetName( name );
     }
 
-    D( printf("setname:%s\n", TO_UTF8( field.GetName() ) ); )
+    DBG( printf("setname:%s\n", TO_UTF8( field.GetName() ) ); )
 
     setRowItem( fieldNdx, field );  // update fieldListCtrl
 
diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp
index 832a2b274f..2cd3e3931e 100644
--- a/eeschema/eeschema_config.cpp
+++ b/eeschema/eeschema_config.cpp
@@ -292,7 +292,7 @@ void SCH_EDIT_FRAME::OnSetOptions( wxCommandEvent& event )
 
     for( unsigned i=0; i<tfnames.size(); ++i )
     {
-        D(printf("dlg.SetFieldName(%d, '%s')\n", i, TO_UTF8( tfnames[i].m_Name) );)
+        DBG(printf("dlg.SetFieldName(%d, '%s')\n", i, TO_UTF8( tfnames[i].m_Name) );)
 
         dlg.SetFieldName( i, tfnames[i].m_Name );
     }
@@ -680,7 +680,7 @@ void SCH_EDIT_FRAME::LoadSettings()
         catch( IO_ERROR& e )
         {
             // @todo show error msg
-            D( printf( "templatefieldnames parsing error: '%s'\n",
+            DBG( printf( "templatefieldnames parsing error: '%s'\n",
                        TO_UTF8( e.errorText ) ); )
         }
     }
@@ -751,7 +751,7 @@ void SCH_EDIT_FRAME::SaveSettings()
 
     m_TemplateFieldNames.Format( &sf, 0 );
 
-    D(printf("saving formatted template fieldnames:'%s'\n", sf.GetString().c_str() );)
+    DBG(printf("saving formatted template fieldnames:'%s'\n", sf.GetString().c_str() );)
 
     wxString record = FROM_UTF8( sf.GetString().c_str() );
     record.Replace( wxT("\n"), wxT(""), true );   // strip all newlines
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index 2a3fbdb245..d68d6cc043 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -640,7 +640,7 @@ void LIB_FIELD::SetName( const wxString& aName )
     // Besides, m_id is a relic that is untrustworthy now.
     if( m_id >=0 && m_id < MANDATORY_FIELDS )
     {
-        D(printf( "trying to set a MANDATORY_FIELD's name\n" );)
+        DBG(printf( "trying to set a MANDATORY_FIELD's name\n" );)
         return;
     }
 
diff --git a/eeschema/netform.cpp b/eeschema/netform.cpp
index fbb16a245b..3b2ae8b74a 100644
--- a/eeschema/netform.cpp
+++ b/eeschema/netform.cpp
@@ -417,7 +417,7 @@ bool SCH_EDIT_FRAME::WriteNetListFile( int aFormat, const wxString& aFullFileNam
             wxFileName  tmpFile = aFullFileName;
             tmpFile.SetExt( INTERMEDIATE_NETLIST_EXT );
 
-            D(printf("tmpFile:'%s'\n", TO_UTF8( tmpFile.GetFullPath() ) );)
+            DBG(printf("tmpFile:'%s'\n", TO_UTF8( tmpFile.GetFullPath() ) );)
 
             ret = helper.WriteGENERICNetList( tmpFile.GetFullPath() );
             if( !ret )
@@ -435,7 +435,7 @@ bool SCH_EDIT_FRAME::WriteNetListFile( int aFormat, const wxString& aFullFileNam
                                                                  tmpFile.GetFullPath(),
                                                                  aFullFileName );
 
-            D(printf("commandLine:'%s'\n", TO_UTF8( commandLine ) );)
+            DBG(printf("commandLine:'%s'\n", TO_UTF8( commandLine ) );)
 
             ProcessExecute( commandLine, wxEXEC_SYNC );
 
diff --git a/eeschema/template_fieldnames.cpp b/eeschema/template_fieldnames.cpp
index c3c1730659..92ef9a90e9 100644
--- a/eeschema/template_fieldnames.cpp
+++ b/eeschema/template_fieldnames.cpp
@@ -151,7 +151,7 @@ int TEMPLATES::AddTemplateFieldName( const TEMPLATE_FIELDNAME& aFieldName )
     {
         if( m_Fields[i].m_Name == aFieldName.m_Name )
         {
-            D( printf( "inserting template fieldname:'%s' at %d\n",
+            DBG( printf( "inserting template fieldname:'%s' at %d\n",
                        TO_UTF8( aFieldName.m_Name ), i ); )
 
             m_Fields[i] = aFieldName;
@@ -159,7 +159,7 @@ int TEMPLATES::AddTemplateFieldName( const TEMPLATE_FIELDNAME& aFieldName )
         }
     }
 
-    // D(printf("appending template fieldname:'%s'\n", aFieldName.m_Name.utf8_str() );)
+    // DBG(printf("appending template fieldname:'%s'\n", aFieldName.m_Name.utf8_str() );)
 
     // the name is legal and not previously added to the config container, append
     // it and return its index within the container.
diff --git a/gerbview/class_aperture_macro.cpp b/gerbview/class_aperture_macro.cpp
index 28dabd5e19..3ea87648e1 100644
--- a/gerbview/class_aperture_macro.cpp
+++ b/gerbview/class_aperture_macro.cpp
@@ -409,7 +409,7 @@ void AM_PRIMITIVE::DrawBasicShape( GERBER_DRAW_ITEM* aParent,
 
     case AMP_UNKNOWN:
     default:
-        D( printf( "AM_PRIMITIVE::DrawBasicShape() err: unknown prim id %d\n",primitive_id) );
+        DBG( printf( "AM_PRIMITIVE::DrawBasicShape() err: unknown prim id %d\n",primitive_id) );
         break;
     }
 }
diff --git a/gerbview/rs274x.cpp b/gerbview/rs274x.cpp
index d65cc3bafa..e35c94bd2e 100644
--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
@@ -167,7 +167,7 @@ bool GERBER_IMAGE::ExecuteRS274XCommand( int       command,
     if( m_GerbMetric )
         conv_scale /= 25.4;
 
-//    D( printf( "%22s: Command <%c%c>\n", __func__, (command >> 8) & 0xFF, command & 0xFF ); )
+//    DBG( printf( "%22s: Command <%c%c>\n", __func__, (command >> 8) & 0xFF, command & 0xFF ); )
 
     switch( command )
     {
@@ -521,7 +521,7 @@ bool GERBER_IMAGE::ExecuteRS274XCommand( int       command,
             m_ImageNegative = true;
         else
             m_ImageNegative = false;
-        D( printf( "%22s: IMAGE_POLARITY m_ImageNegative=%s\n", __func__,
+        DBG( printf( "%22s: IMAGE_POLARITY m_ImageNegative=%s\n", __func__,
                    m_ImageNegative ? "true" : "false" ); )
         break;
 
@@ -531,7 +531,7 @@ bool GERBER_IMAGE::ExecuteRS274XCommand( int       command,
 
         else
             GetLayerParams().m_LayerNegative = false;
-        D( printf( "%22s: LAYER_POLARITY m_LayerNegative=%s\n", __func__,
+        DBG( printf( "%22s: LAYER_POLARITY m_LayerNegative=%s\n", __func__,
                    GetLayerParams().m_LayerNegative ? "true" : "false" ); )
         break;