From 4c5bd01887ba818f31a0fd46fdc46a5b97228142 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sun, 28 Jan 2018 22:02:31 +0100
Subject: [PATCH] Rename a few files

---
 3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp | 2 +-
 3d-viewer/3d_canvas/create_layer_items.cpp         | 1 -
 common/class_marker_base.cpp                       | 6 +++---
 common/eda_text.cpp                                | 2 +-
 common/page_layout/class_worksheet_dataitem.cpp    | 2 +-
 common/page_layout/class_worksheet_layout.cpp      | 2 +-
 common/page_layout/page_layout_graphic_items.cpp   | 2 +-
 common/page_layout/title_block_shapes.cpp          | 2 +-
 common/plotters/common_plot_functions.cpp          | 2 +-
 common/plotters/plotter.cpp                        | 2 +-
 common/worksheet.cpp                               | 1 -
 eeschema/class_drc_erc_item.cpp                    | 2 +-
 eeschema/dialogs/dialog_edit_label.cpp             | 4 ++--
 eeschema/edit_label.cpp                            | 6 +++---
 eeschema/lib_field.cpp                             | 2 +-
 eeschema/lib_pin.cpp                               | 2 +-
 eeschema/lib_text.cpp                              | 2 +-
 eeschema/sch_eagle_plugin.cpp                      | 2 +-
 eeschema/sch_field.cpp                             | 2 +-
 eeschema/sch_legacy_plugin.cpp                     | 2 +-
 eeschema/sch_marker.h                              | 2 +-
 eeschema/sch_sheet.cpp                             | 2 +-
 eeschema/sch_sheet_pin.cpp                         | 2 +-
 eeschema/sch_text.cpp                              | 2 +-
 gerbview/class_gbr_layout.cpp                      | 2 +-
 gerbview/draw_gerber_screen.cpp                    | 2 +-
 include/{drawtxt.h => draw_graphic_text.h}         | 0
 include/{class_drc_item.h => drc_item.h}           | 8 ++++----
 include/{class_marker_base.h => marker_base.h}     | 8 ++++----
 include/plotter.h                                  | 2 +-
 pcbnew/board_items_to_polygon_shape_transform.cpp  | 2 +-
 pcbnew/class_drc_item.cpp                          | 4 ++--
 pcbnew/class_marker_pcb.h                          | 2 +-
 pcbnew/class_pad_draw_functions.cpp                | 2 +-
 pcbnew/class_pcb_text.cpp                          | 2 +-
 pcbnew/class_text_mod.cpp                          | 2 +-
 pcbnew/class_track.cpp                             | 2 +-
 pcbnew/dialogs/dialog_drc.h                        | 2 +-
 pcbnew/dialogs/dialog_drclistbox.h                 | 4 ++--
 pcbnew/dialogs/dialog_edit_module_text.cpp         | 2 +-
 pcbnew/dialogs/dialog_pcb_text_properties.cpp      | 6 +++---
 pcbnew/dialogs/dialog_plot.cpp                     | 4 +++-
 pcbnew/dialogs/dialog_plot.h                       | 1 -
 pcbnew/dimension.cpp                               | 2 +-
 pcbnew/drc.cpp                                     | 2 +-
 pcbnew/{drc_stuff.h => drc.h}                      | 6 +++---
 pcbnew/drc_clearance_test_functions.cpp            | 2 +-
 pcbnew/drc_marker_functions.cpp                    | 4 ++--
 pcbnew/edit_track_width.cpp                        | 2 +-
 pcbnew/editrack-part2.cpp                          | 2 +-
 pcbnew/editrack.cpp                                | 2 +-
 pcbnew/edtxtmod.cpp                                | 4 ++--
 pcbnew/exporters/export_vrml.cpp                   | 2 +-
 pcbnew/exporters/gen_drill_report_files.cpp        | 2 +-
 pcbnew/legacy_plugin.cpp                           | 1 -
 pcbnew/move_or_drag_track.cpp                      | 2 +-
 pcbnew/pcbframe.cpp                                | 2 +-
 pcbnew/plot_board_layers.cpp                       | 2 +-
 pcbnew/plot_brditems_plotter.cpp                   | 2 +-
 pcbnew/toolbars_update_user_interface.cpp          | 2 +-
 pcbnew/zones_by_polygon.cpp                        | 2 +-
 pcbnew/zones_test_and_combine_areas.cpp            | 2 +-
 62 files changed, 78 insertions(+), 80 deletions(-)
 rename include/{drawtxt.h => draw_graphic_text.h} (100%)
 rename include/{class_drc_item.h => drc_item.h} (98%)
 rename include/{class_marker_base.h => marker_base.h} (98%)
 rename pcbnew/{drc_stuff.h => drc.h} (99%)

diff --git a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
index 5852bdedbc..c6bb1a7e77 100644
--- a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
+++ b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
@@ -50,7 +50,7 @@
 #include <class_text_mod.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <trigo.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <utility>
 #include <vector>
 
diff --git a/3d-viewer/3d_canvas/create_layer_items.cpp b/3d-viewer/3d_canvas/create_layer_items.cpp
index a6f5a71594..888925c24d 100644
--- a/3d-viewer/3d_canvas/create_layer_items.cpp
+++ b/3d-viewer/3d_canvas/create_layer_items.cpp
@@ -50,7 +50,6 @@
 #include <class_text_mod.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <trigo.h>
-#include <drawtxt.h>
 #include <utility>
 #include <vector>
 
diff --git a/common/class_marker_base.cpp b/common/class_marker_base.cpp
index 91e05a2ad7..f06fa09768 100644
--- a/common/class_marker_base.cpp
+++ b/common/class_marker_base.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@
 #include "common.h"
 #include "macros.h"
 #include "class_drawpanel.h"
-#include "class_marker_base.h"
+#include "marker_base.h"
 #include "dialog_display_info_HTML_base.h"
 
 
diff --git a/common/eda_text.cpp b/common/eda_text.cpp
index 822609a1b7..62e9c05104 100644
--- a/common/eda_text.cpp
+++ b/common/eda_text.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <eda_text.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_eda_rect.h>
 #include <macros.h>
 #include <trigo.h>               // RotatePoint
diff --git a/common/page_layout/class_worksheet_dataitem.cpp b/common/page_layout/class_worksheet_dataitem.cpp
index 6f61f314e3..773a1814d0 100644
--- a/common/page_layout/class_worksheet_dataitem.cpp
+++ b/common/page_layout/class_worksheet_dataitem.cpp
@@ -55,7 +55,7 @@
  */
 
 #include <fctsys.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_eda_rect.h>
 #include <worksheet.h>
 #include <class_title_block.h>
diff --git a/common/page_layout/class_worksheet_layout.cpp b/common/page_layout/class_worksheet_layout.cpp
index 94c11a1bb1..a53a6a1f4f 100644
--- a/common/page_layout/class_worksheet_layout.cpp
+++ b/common/page_layout/class_worksheet_layout.cpp
@@ -51,7 +51,7 @@
 
 #include <fctsys.h>
 #include <kiface_i.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <worksheet.h>
 #include <class_title_block.h>
 #include <worksheet_shape_builder.h>
diff --git a/common/page_layout/page_layout_graphic_items.cpp b/common/page_layout/page_layout_graphic_items.cpp
index 80575125d6..94559dbe9e 100644
--- a/common/page_layout/page_layout_graphic_items.cpp
+++ b/common/page_layout/page_layout_graphic_items.cpp
@@ -54,7 +54,7 @@
 
 #include <fctsys.h>
 #include <class_eda_rect.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <worksheet.h>
 #include <class_title_block.h>
 #include <worksheet_shape_builder.h>
diff --git a/common/page_layout/title_block_shapes.cpp b/common/page_layout/title_block_shapes.cpp
index 1b8d44ae6e..dc155318e9 100644
--- a/common/page_layout/title_block_shapes.cpp
+++ b/common/page_layout/title_block_shapes.cpp
@@ -55,7 +55,7 @@
  */
 
 #include <fctsys.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_page_info.h>
 #include <worksheet.h>
 #include <class_title_block.h>
diff --git a/common/plotters/common_plot_functions.cpp b/common/plotters/common_plot_functions.cpp
index 5c23e835b1..801eddacdf 100644
--- a/common/plotters/common_plot_functions.cpp
+++ b/common/plotters/common_plot_functions.cpp
@@ -32,7 +32,7 @@
 #include <plotter.h>
 #include <worksheet.h>
 #include <class_base_screen.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_title_block.h>
 #include "worksheet_shape_builder.h"
 #include "class_worksheet_dataitem.h"
diff --git a/common/plotters/plotter.cpp b/common/plotters/plotter.cpp
index d5d7fa6004..39ad63101e 100644
--- a/common/plotters/plotter.cpp
+++ b/common/plotters/plotter.cpp
@@ -46,7 +46,7 @@
 #include <plotter.h>
 #include <macros.h>
 #include <class_base_screen.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <geometry/shape_line_chain.h>
 
 
diff --git a/common/worksheet.cpp b/common/worksheet.cpp
index ea01e47871..72b01ac65d 100644
--- a/common/worksheet.cpp
+++ b/common/worksheet.cpp
@@ -36,7 +36,6 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <class_base_screen.h>
-#include <drawtxt.h>
 #include <draw_frame.h>
 #include <worksheet.h>
 #include <class_title_block.h>
diff --git a/eeschema/class_drc_erc_item.cpp b/eeschema/class_drc_erc_item.cpp
index 25b3efa498..b5fe9b1d66 100644
--- a/eeschema/class_drc_erc_item.cpp
+++ b/eeschema/class_drc_erc_item.cpp
@@ -28,7 +28,7 @@
 #include <fctsys.h>
 #include <common.h>
 
-#include <class_drc_item.h>
+#include <drc_item.h>
 #include <erc.h>
 #include <base_units.h>
 
diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp
index 9558267055..e7daef465d 100644
--- a/eeschema/dialogs/dialog_edit_label.cpp
+++ b/eeschema/dialogs/dialog_edit_label.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2013 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@
 
 #include <class_drawpanel.h>
 #include <general.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <confirm.h>
 #include <sch_text.h>
 #include <typeinfo>
diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp
index adbd39481b..16ab20d5a3 100644
--- a/eeschema/edit_label.cpp
+++ b/eeschema/edit_label.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2004-2013 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2004-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <schframe.h>
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index 6c0d54df3a..7acbf73280 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <macros.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <kicad_string.h>
 #include <class_drawpanel.h>
 #include <plotter.h>
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index 05105667f6..7db39e997c 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -35,7 +35,7 @@
 #include <macros.h>
 #include <trigo.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <plotter.h>
 #include <schframe.h>
 #include <base_units.h>
diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index 18af57a6e9..d33b1878f9 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -30,7 +30,7 @@
 #include <macros.h>
 #include <class_drawpanel.h>
 #include <plotter.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <wxstruct.h>
 #include <base_units.h>
diff --git a/eeschema/sch_eagle_plugin.cpp b/eeschema/sch_eagle_plugin.cpp
index 16dc6ce56f..f484ee002b 100644
--- a/eeschema/sch_eagle_plugin.cpp
+++ b/eeschema/sch_eagle_plugin.cpp
@@ -45,7 +45,7 @@
 #include <lib_pin.h>
 #include <lib_text.h>
 #include <sch_text.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <sch_marker.h>
 #include <sch_bus_entry.h>
 #include <eagle_parser.h>
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index 7b6f2d9a69..af856b7a4c 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -39,7 +39,7 @@
 #include <class_drawpanel.h>
 #include <base_struct.h>
 #include <gr_basic.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <macros.h>
 #include <schframe.h>
 #include <plotter.h>
diff --git a/eeschema/sch_legacy_plugin.cpp b/eeschema/sch_legacy_plugin.cpp
index 5dab47f2b7..f04db55ef1 100644
--- a/eeschema/sch_legacy_plugin.cpp
+++ b/eeschema/sch_legacy_plugin.cpp
@@ -27,7 +27,7 @@
 #include <wx/filename.h>
 #include <wx/tokenzr.h>
 
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <kiway.h>
 #include <kicad_string.h>
 #include <richio.h>
diff --git a/eeschema/sch_marker.h b/eeschema/sch_marker.h
index 468cc79430..3f3cf61a11 100644
--- a/eeschema/sch_marker.h
+++ b/eeschema/sch_marker.h
@@ -31,7 +31,7 @@
 #define TYPE_SCH_MARKER_H_
 
 #include <sch_item_struct.h>
-#include <class_marker_base.h>
+#include <marker_base.h>
 
 
 /* Names for corresponding types of markers: */
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index 8fa83558b8..9a8d37722e 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <richio.h>
 #include <schframe.h>
diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp
index 5187a0c344..f032113827 100644
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <plotter.h>
 #include <trigo.h>
 #include <richio.h>
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 6bdfdccbfd..83f8a9ff79 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -33,7 +33,7 @@
 #include <macros.h>
 #include <trigo.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <schframe.h>
 #include <plotter.h>
 #include <msgpanel.h>
diff --git a/gerbview/class_gbr_layout.cpp b/gerbview/class_gbr_layout.cpp
index 4e8aef726e..ea0c80f68c 100644
--- a/gerbview/class_gbr_layout.cpp
+++ b/gerbview/class_gbr_layout.cpp
@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <gr_basic.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <gerbview_frame.h>
 #include <class_drawpanel.h>
 #include <class_gbr_layout.h>
diff --git a/gerbview/draw_gerber_screen.cpp b/gerbview/draw_gerber_screen.cpp
index a876265b79..af2a3eac93 100644
--- a/gerbview/draw_gerber_screen.cpp
+++ b/gerbview/draw_gerber_screen.cpp
@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <common.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <base_units.h>
 
 #include <gerbview.h>
diff --git a/include/drawtxt.h b/include/draw_graphic_text.h
similarity index 100%
rename from include/drawtxt.h
rename to include/draw_graphic_text.h
diff --git a/include/class_drc_item.h b/include/drc_item.h
similarity index 98%
rename from include/class_drc_item.h
rename to include/drc_item.h
index 73a77ed9a1..4ea40f33a2 100644
--- a/include/class_drc_item.h
+++ b/include/drc_item.h
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2007 Dick Hollenbeck, dick@softplc.com
- * Copyright (C) 2007 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef _CLASS_DRC_ITEM_H
-#define _CLASS_DRC_ITEM_H
+#ifndef DRC_ITEM_H
+#define DRC_ITEM_H
 
 #include <macros.h>
 
@@ -271,4 +271,4 @@ public:
 };
 
 
-#endif      // _CLASS_DRC_ITEM_H
+#endif      // DRC_ITEM_H
diff --git a/include/class_marker_base.h b/include/marker_base.h
similarity index 98%
rename from include/class_marker_base.h
rename to include/marker_base.h
index 5903eae959..fcbba97e0a 100644
--- a/include/class_marker_base.h
+++ b/include/marker_base.h
@@ -23,10 +23,10 @@
  */
 
 
-#ifndef _CLASS_MARKER_BASE_H
-#define _CLASS_MARKER_BASE_H
+#ifndef MARKER_BASE_H
+#define MARKER_BASE_H
 
-#include <class_drc_item.h>
+#include <drc_item.h>
 #include <gr_basic.h>
 
 
@@ -230,4 +230,4 @@ public:
 };
 
 
-#endif      //  _CLASS_MARKER_BASE_H
+#endif      //  MARKER_BASE_H
diff --git a/include/plotter.h b/include/plotter.h
index e86fd4fec1..543df78deb 100644
--- a/include/plotter.h
+++ b/include/plotter.h
@@ -34,7 +34,7 @@
 
 #include <vector>
 #include <math/box2.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <class_page_info.h>
 #include <eda_text.h>       // FILL_T
 
diff --git a/pcbnew/board_items_to_polygon_shape_transform.cpp b/pcbnew/board_items_to_polygon_shape_transform.cpp
index 92f2a3d73a..77136d2ece 100644
--- a/pcbnew/board_items_to_polygon_shape_transform.cpp
+++ b/pcbnew/board_items_to_polygon_shape_transform.cpp
@@ -33,7 +33,7 @@
 #include <vector>
 
 #include <fctsys.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <pcbnew.h>
 #include <wxPcbStruct.h>
 #include <trigo.h>
diff --git a/pcbnew/class_drc_item.cpp b/pcbnew/class_drc_item.cpp
index cfd8d5cea9..eccfe04e64 100644
--- a/pcbnew/class_drc_item.cpp
+++ b/pcbnew/class_drc_item.cpp
@@ -30,8 +30,8 @@
 #include <common.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
-#include <class_drc_item.h>
+#include <drc.h>
+#include <drc_item.h>
 #include <base_units.h>
 
 
diff --git a/pcbnew/class_marker_pcb.h b/pcbnew/class_marker_pcb.h
index 1384effb20..9a95e5ac2d 100644
--- a/pcbnew/class_marker_pcb.h
+++ b/pcbnew/class_marker_pcb.h
@@ -32,7 +32,7 @@
 
 
 #include <class_board_item.h>
-#include <class_marker_base.h>
+#include <marker_base.h>
 
 
 class MSG_PANEL_ITEM;
diff --git a/pcbnew/class_pad_draw_functions.cpp b/pcbnew/class_pad_draw_functions.cpp
index 667727d2ce..23b0695a46 100644
--- a/pcbnew/class_pad_draw_functions.cpp
+++ b/pcbnew/class_pad_draw_functions.cpp
@@ -34,7 +34,7 @@
 #include <trigo.h>
 #include <class_pcb_screen.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <layers_id_colors_and_visibility.h>
 #include <wxBasePcbFrame.h>
 #include <wxPcbStruct.h>
diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp
index 0b79dea428..0331e04743 100644
--- a/pcbnew/class_pcb_text.cpp
+++ b/pcbnew/class_pcb_text.cpp
@@ -32,7 +32,7 @@
 #include <wxstruct.h>
 #include <gr_basic.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <kicad_string.h>
 #include <trigo.h>
 #include <richio.h>
diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index 0effbd2103..30dc794bef 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -33,7 +33,7 @@
 #include <wxstruct.h>
 #include <trigo.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <kicad_string.h>
 #include <richio.h>
 #include <macros.h>
diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp
index 0d9cd254cd..6a2e6508e9 100644
--- a/pcbnew/class_track.cpp
+++ b/pcbnew/class_track.cpp
@@ -37,7 +37,7 @@
 #include <macros.h>
 #include <class_drawpanel.h>
 #include <class_pcb_screen.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <wxstruct.h>
 #include <wxBasePcbFrame.h>
 #include <class_board.h>
diff --git a/pcbnew/dialogs/dialog_drc.h b/pcbnew/dialogs/dialog_drc.h
index b88ef369a1..f39c2dc41c 100644
--- a/pcbnew/dialogs/dialog_drc.h
+++ b/pcbnew/dialogs/dialog_drc.h
@@ -33,7 +33,7 @@
 #include <pcbnew.h>
 #include <class_drawpanel.h>
 #include <wxstruct.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <class_marker_pcb.h>
 #include <class_board.h>
 
diff --git a/pcbnew/dialogs/dialog_drclistbox.h b/pcbnew/dialogs/dialog_drclistbox.h
index 8fc031be0b..bd6a4be426 100644
--- a/pcbnew/dialogs/dialog_drclistbox.h
+++ b/pcbnew/dialogs/dialog_drclistbox.h
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2009-2016 Dick Hollenbeck, dick@softplc.com
- * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,7 +32,7 @@
 #include <pcbnew.h>
 #include <class_drawpanel.h>
 #include <wxstruct.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <class_marker_pcb.h>
 #include <class_board.h>
 
diff --git a/pcbnew/dialogs/dialog_edit_module_text.cpp b/pcbnew/dialogs/dialog_edit_module_text.cpp
index 75ed66d10a..c4dbd72235 100644
--- a/pcbnew/dialogs/dialog_edit_module_text.cpp
+++ b/pcbnew/dialogs/dialog_edit_module_text.cpp
@@ -36,7 +36,7 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <confirm.h>
 #include <wxBasePcbFrame.h>
 #include <base_units.h>
diff --git a/pcbnew/dialogs/dialog_pcb_text_properties.cpp b/pcbnew/dialogs/dialog_pcb_text_properties.cpp
index b8b1afcd82..6b7520790c 100644
--- a/pcbnew/dialogs/dialog_pcb_text_properties.cpp
+++ b/pcbnew/dialogs/dialog_pcb_text_properties.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004-2010 Jean-Pierre Charras <jean-pierre.charras@gpisa-lab.inpg.fr>
- * Copyright (C) 2010-2016 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2018 Jean-Pierre Charras jp.charras at wanadoo.fr
+ * Copyright (C) 2010-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,7 +31,7 @@
 #include <class_drawpanel.h>
 #include <pcbnew.h>
 #include <wxPcbStruct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <confirm.h>
 #include <base_units.h>
 #include <wx/valnum.h>
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index f7aa62435d..14857bfc8a 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -41,6 +41,8 @@
 #include <wx/ffile.h>
 #include <dialog_plot.h>
 #include <wx_html_report_panel.h>
+#include <drc.h>
+
 
 DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
     DIALOG_PLOT_BASE( aParent ), m_parent( aParent ),
@@ -888,7 +890,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
     }
 }
 
-#include <drc_stuff.h>
+
 void DIALOG_PLOT::onRunDRC( wxCommandEvent& event )
 {
     PCB_EDIT_FRAME* parent = dynamic_cast<PCB_EDIT_FRAME*>( GetParent() );
diff --git a/pcbnew/dialogs/dialog_plot.h b/pcbnew/dialogs/dialog_plot.h
index 39faa712e6..fa52b3a32a 100644
--- a/pcbnew/dialogs/dialog_plot.h
+++ b/pcbnew/dialogs/dialog_plot.h
@@ -25,7 +25,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-//#include <fctsys.h>
 #include <class_board.h>
 #include <dialog_plot_base.h>
 #include <pcb_plot_params.h>
diff --git a/pcbnew/dimension.cpp b/pcbnew/dimension.cpp
index b40d2cc969..8201b807d1 100644
--- a/pcbnew/dimension.cpp
+++ b/pcbnew/dimension.cpp
@@ -33,7 +33,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <wxPcbStruct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <dialog_helpers.h>
 #include <macros.h>
 #include <base_units.h>
diff --git a/pcbnew/drc.cpp b/pcbnew/drc.cpp
index 3db18ce5ba..c199e5b89d 100644
--- a/pcbnew/drc.cpp
+++ b/pcbnew/drc.cpp
@@ -50,7 +50,7 @@
 #include <tools/pcb_actions.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 
 #include <dialog_drc.h>
 #include <wx/progdlg.h>
diff --git a/pcbnew/drc_stuff.h b/pcbnew/drc.h
similarity index 99%
rename from pcbnew/drc_stuff.h
rename to pcbnew/drc.h
index c2792e7541..7234b1ea7f 100644
--- a/pcbnew/drc_stuff.h
+++ b/pcbnew/drc.h
@@ -26,8 +26,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef _DRC_STUFF_H
-#define _DRC_STUFF_H
+#ifndef DRC_H
+#define DRC_H
 
 #include <vector>
 #include <memory>
@@ -554,6 +554,6 @@ public:
 };
 
 
-#endif  // _DRC_STUFF_H
+#endif  // DRC_H
 
 //EOF
diff --git a/pcbnew/drc_clearance_test_functions.cpp b/pcbnew/drc_clearance_test_functions.cpp
index e71f95ef15..a481e51fa5 100644
--- a/pcbnew/drc_clearance_test_functions.cpp
+++ b/pcbnew/drc_clearance_test_functions.cpp
@@ -36,7 +36,7 @@
 #include <trigo.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/drc_marker_functions.cpp b/pcbnew/drc_marker_functions.cpp
index 0d5719c60b..49e8a75f2d 100644
--- a/pcbnew/drc_marker_functions.cpp
+++ b/pcbnew/drc_marker_functions.cpp
@@ -7,7 +7,7 @@
  *
  * Copyright (C) 2010 Dick Hollenbeck, dick@softplc.com
  * Copyright (C) 2004-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@
 #include <pcbnew.h>
 #include <class_board_design_settings.h>
 
-#include <drc_stuff.h>
+#include <drc.h>
 #include <class_pad.h>
 #include <class_track.h>
 #include <class_zone.h>
diff --git a/pcbnew/edit_track_width.cpp b/pcbnew/edit_track_width.cpp
index 519d84ecb8..2d6ecc562b 100644
--- a/pcbnew/edit_track_width.cpp
+++ b/pcbnew/edit_track_width.cpp
@@ -36,7 +36,7 @@
 #include <class_track.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 
 
 bool PCB_EDIT_FRAME::SetTrackSegmentWidth( TRACK*             aTrackItem,
diff --git a/pcbnew/editrack-part2.cpp b/pcbnew/editrack-part2.cpp
index 32c76ca561..209deedcf0 100644
--- a/pcbnew/editrack-part2.cpp
+++ b/pcbnew/editrack-part2.cpp
@@ -41,7 +41,7 @@
 #include <class_marker_pcb.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 
 
 bool PCB_EDIT_FRAME::Other_Layer_Route( TRACK* aTrack, wxDC* DC )
diff --git a/pcbnew/editrack.cpp b/pcbnew/editrack.cpp
index 1b559bff47..5b94bbbb5f 100644
--- a/pcbnew/editrack.cpp
+++ b/pcbnew/editrack.cpp
@@ -34,7 +34,7 @@
 #include <wxPcbStruct.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <protos.h>
 
 #include <class_board.h>
diff --git a/pcbnew/edtxtmod.cpp b/pcbnew/edtxtmod.cpp
index 0409277039..3279a64311 100644
--- a/pcbnew/edtxtmod.cpp
+++ b/pcbnew/edtxtmod.cpp
@@ -24,14 +24,14 @@
 
 /**
  * @file edtxtmod.cpp
- * @brief Edit module text.
+ * @brief Edit texts in footprints.
  */
 
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <common.h>
 #include <class_drawpanel.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <wxBasePcbFrame.h>
 #include <macros.h>
diff --git a/pcbnew/exporters/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp
index 470e87557d..1b4177035f 100644
--- a/pcbnew/exporters/export_vrml.cpp
+++ b/pcbnew/exporters/export_vrml.cpp
@@ -40,7 +40,7 @@
 #include "class_track.h"
 #include "class_zone.h"
 #include "convert_to_biu.h"
-#include "drawtxt.h"
+#include "draw_graphic_text.h"
 #include "macros.h"
 #include "pgm_base.h"
 #include "plugins/3dapi/ifsg_all.h"
diff --git a/pcbnew/exporters/gen_drill_report_files.cpp b/pcbnew/exporters/gen_drill_report_files.cpp
index cf94b5853b..76a245d90f 100644
--- a/pcbnew/exporters/gen_drill_report_files.cpp
+++ b/pcbnew/exporters/gen_drill_report_files.cpp
@@ -31,7 +31,7 @@
 #include <common.h>
 #include <plotter.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <confirm.h>
 #include <kicad_string.h>
 #include <macros.h>
diff --git a/pcbnew/legacy_plugin.cpp b/pcbnew/legacy_plugin.cpp
index b87f260813..39237adac8 100644
--- a/pcbnew/legacy_plugin.cpp
+++ b/pcbnew/legacy_plugin.cpp
@@ -83,7 +83,6 @@
 #include <3d_cache/3d_info.h>
 #include <pcb_plot_params.h>
 #include <pcb_plot_params_parser.h>
-#include <drawtxt.h>
 #include <convert_to_biu.h>
 #include <trigo.h>
 #include <build_version.h>
diff --git a/pcbnew/move_or_drag_track.cpp b/pcbnew/move_or_drag_track.cpp
index 32734cc78d..35a0b60e62 100644
--- a/pcbnew/move_or_drag_track.cpp
+++ b/pcbnew/move_or_drag_track.cpp
@@ -40,7 +40,7 @@
 #include <class_board.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <drag.h>
 #include <pcbnew_id.h>
 
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index fc229482f5..d3b80a8473 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -41,7 +41,7 @@
 
 #include <pcbnew.h>
 #include <pcbnew_id.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <layer_widget.h>
 #include <dialog_design_rules.h>
 #include <class_pcb_layer_widget.h>
diff --git a/pcbnew/plot_board_layers.cpp b/pcbnew/plot_board_layers.cpp
index b204ff3969..69cea587fd 100644
--- a/pcbnew/plot_board_layers.cpp
+++ b/pcbnew/plot_board_layers.cpp
@@ -33,7 +33,7 @@
 #include <common.h>
 #include <plotter.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <wxBasePcbFrame.h>
 #include <macros.h>
diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp
index 5549ca5e4b..549b9c8844 100644
--- a/pcbnew/plot_brditems_plotter.cpp
+++ b/pcbnew/plot_brditems_plotter.cpp
@@ -31,7 +31,7 @@
 #include <common.h>
 #include <plotter.h>
 #include <base_struct.h>
-#include <drawtxt.h>
+#include <draw_graphic_text.h>
 #include <trigo.h>
 #include <macros.h>
 #include <wxBasePcbFrame.h>
diff --git a/pcbnew/toolbars_update_user_interface.cpp b/pcbnew/toolbars_update_user_interface.cpp
index 302598ba50..9ef8f7f52e 100644
--- a/pcbnew/toolbars_update_user_interface.cpp
+++ b/pcbnew/toolbars_update_user_interface.cpp
@@ -37,7 +37,7 @@
 #include <class_board.h>
 #include <pcbnew.h>
 #include <pcbnew_id.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <class_pcb_layer_box_selector.h>
 
 
diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp
index 1a9518af41..c84670b713 100644
--- a/pcbnew/zones_by_polygon.cpp
+++ b/pcbnew/zones_by_polygon.cpp
@@ -44,7 +44,7 @@
 #include <pcbnew_id.h>
 #include <protos.h>
 #include <zones_functions_for_undo_redo.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <connectivity_data.h>
 
 #include <widgets/progress_reporter.h>
diff --git a/pcbnew/zones_test_and_combine_areas.cpp b/pcbnew/zones_test_and_combine_areas.cpp
index 4487da3698..2e48cbfe12 100644
--- a/pcbnew/zones_test_and_combine_areas.cpp
+++ b/pcbnew/zones_test_and_combine_areas.cpp
@@ -40,7 +40,7 @@
 #include <class_marker_pcb.h>
 
 #include <pcbnew.h>
-#include <drc_stuff.h>
+#include <drc.h>
 #include <math_for_graphics.h>
 
 #define STRAIGHT 0      // To be remove after math_for_graphics code cleanup