diff --git a/common/basic_gal.cpp b/common/basic_gal.cpp
index 6cab2972bd..54573c747a 100644
--- a/common/basic_gal.cpp
+++ b/common/basic_gal.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2017 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
@@ -24,7 +24,7 @@
 
 /**
  * @brief Implement a very basic GAL used to draw, plot and convert texts in segments
- * for DRC funstions, using the common GAL functions.
+ * for DRC functions, using the common GAL functions.
  * Draw functions use wxDC.
  * Plot functions use a PLOTTER
  * Convert texts in segments use a callback function created by the caller
@@ -32,7 +32,7 @@
  */
 
 #include <gr_basic.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <trigo.h>
 
 #include <basic_gal.h>
diff --git a/common/class_bitmap_base.cpp b/common/class_bitmap_base.cpp
index 892a5608f8..69ffb34622 100644
--- a/common/class_bitmap_base.cpp
+++ b/common/class_bitmap_base.cpp
@@ -5,8 +5,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2011 jean-pierre.charras
- * Copyright (C) 2011-2016 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2017 jean-pierre.charras
+ * Copyright (C) 2011-2017 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
@@ -33,7 +33,7 @@
 #include "trigo.h"
 #include "common.h"
 #include "richio.h"
-#include "plot_common.h"
+#include "class_plotter.h"
 
 #include "class_bitmap_base.h"
 
diff --git a/common/class_plotter.cpp b/common/class_plotter.cpp
index 8099c16df0..7f231e2dfd 100644
--- a/common/class_plotter.cpp
+++ b/common/class_plotter.cpp
@@ -43,7 +43,7 @@
 #include <wxstruct.h>
 #include <base_struct.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <macros.h>
 #include <class_base_screen.h>
 #include <drawtxt.h>
diff --git a/common/common_plotDXF_functions.cpp b/common/common_plotDXF_functions.cpp
index 2fd2f63349..d66631539b 100644
--- a/common/common_plotDXF_functions.cpp
+++ b/common/common_plotDXF_functions.cpp
@@ -5,7 +5,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2016 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2017 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 <trigo.h>
 #include <wxstruct.h>
 #include <base_struct.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <macros.h>
 #include <kicad_string.h>
 #include <convert_basic_shapes_to_polygon.h>
diff --git a/common/common_plotGERBER_functions.cpp b/common/common_plotGERBER_functions.cpp
index 75884ea547..6939941f2b 100644
--- a/common/common_plotGERBER_functions.cpp
+++ b/common/common_plotGERBER_functions.cpp
@@ -33,7 +33,7 @@
 #include <wxstruct.h>
 #include <base_struct.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <macros.h>
 #include <kicad_string.h>
 #include <convert_basic_shapes_to_polygon.h>
diff --git a/common/common_plotHPGL_functions.cpp b/common/common_plotHPGL_functions.cpp
index 782508d526..d211a04576 100644
--- a/common/common_plotHPGL_functions.cpp
+++ b/common/common_plotHPGL_functions.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2016 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2017 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
@@ -199,7 +199,7 @@
 #include <trigo.h>
 #include <wxstruct.h>
 #include <base_struct.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <macros.h>
 #include <kicad_string.h>
 #include <convert_basic_shapes_to_polygon.h>
diff --git a/common/common_plotPDF_functions.cpp b/common/common_plotPDF_functions.cpp
index 1404afed88..990faf1a3d 100644
--- a/common/common_plotPDF_functions.cpp
+++ b/common/common_plotPDF_functions.cpp
@@ -33,7 +33,7 @@
 #include <wxstruct.h>
 #include <base_struct.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <macros.h>
 #include <kicad_string.h>
 #include <wx/zstream.h>
diff --git a/common/common_plotPS_functions.cpp b/common/common_plotPS_functions.cpp
index ce39fb2eeb..8288b013be 100644
--- a/common/common_plotPS_functions.cpp
+++ b/common/common_plotPS_functions.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2016 KiCad Developers, see CHANGELOG.TXT for contributors.
+ * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2017 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 <wxstruct.h>
 #include <base_struct.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <macros.h>
 #include <kicad_string.h>
 #include <convert_basic_shapes_to_polygon.h>
diff --git a/common/common_plotSVG_functions.cpp b/common/common_plotSVG_functions.cpp
index e95f8dd841..b8aacc3bc5 100644
--- a/common/common_plotSVG_functions.cpp
+++ b/common/common_plotSVG_functions.cpp
@@ -96,7 +96,7 @@
 #include <class_eda_rect.h>
 #include <base_struct.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <macros.h>
 #include <kicad_string.h>
 
diff --git a/common/common_plot_functions.cpp b/common/common_plot_functions.cpp
index 98adc52e9b..3ce45d9afd 100644
--- a/common/common_plot_functions.cpp
+++ b/common/common_plot_functions.cpp
@@ -6,7 +6,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2013 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
  *
  *
  * This program is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <base_struct.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <worksheet.h>
 #include <class_base_screen.h>
 #include <drawtxt.h>
diff --git a/common/drawtxt.cpp b/common/drawtxt.cpp
index a09dbb7ef9..59cfeca81f 100644
--- a/common/drawtxt.cpp
+++ b/common/drawtxt.cpp
@@ -6,10 +6,10 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
  * Copyright (C) 2012 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2017 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 <fctsys.h>
 #include <gr_basic.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <eda_text.h>               // EDA_TEXT_HJUSTIFY_T and EDA_TEXT_VJUSTIFY_T
 #include <trigo.h>
 #include <macros.h>
diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp
index 44f95588bc..e6a2127989 100644
--- a/eeschema/class_libentry.cpp
+++ b/eeschema/class_libentry.cpp
@@ -31,7 +31,7 @@
 #include <macros.h>
 #include <kicad_string.h>
 #include <class_drawpanel.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <gr_basic.h>
 #include <class_sch_screen.h>
 #include <richio.h>
diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp
index cf3df60099..138dc4a75e 100644
--- a/eeschema/dialogs/dialog_plot_schematic.cpp
+++ b/eeschema/dialogs/dialog_plot_schematic.cpp
@@ -8,7 +8,7 @@
  * Copyright (C) 1992-2010 Lorenzo Marcantonio
  * Copyright (C) 2011 Wayne Stambaugh <stambaughw@gmail.com>
  *
- * Copyright (C) 1992-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2017 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,6 @@
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <worksheet.h>
-#include <plot_common.h>
 #include <class_sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
diff --git a/eeschema/dialogs/dialog_plot_schematic.h b/eeschema/dialogs/dialog_plot_schematic.h
index 79ad300e93..e6461ee881 100644
--- a/eeschema/dialogs/dialog_plot_schematic.h
+++ b/eeschema/dialogs/dialog_plot_schematic.h
@@ -1,14 +1,14 @@
-/** @file dialog_plot_schematic.cpp
+/** @file dialog_plot_schematic.h
  */
 
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2014 Jean-Pierre Charras <jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2017 Jean-Pierre Charras <jp.charras at wanadoo.fr
  * Copyright (C) 1992-2010 Lorenzo Marcantonio
  * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
  *
- * Copyright (C) 1992-2012 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2017 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
@@ -29,7 +29,7 @@
  */
 
 #include <fctsys.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <class_sch_screen.h>
 #include <schframe.h>
 #include <dialog_plot_schematic_base.h>
diff --git a/eeschema/lib_arc.cpp b/eeschema/lib_arc.cpp
index 1c8bb20f38..d964fe2e76 100644
--- a/eeschema/lib_arc.cpp
+++ b/eeschema/lib_arc.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2004-2017 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 <gr_basic.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <trigo.h>
 #include <wxstruct.h>
 #include <richio.h>
diff --git a/eeschema/lib_bezier.cpp b/eeschema/lib_bezier.cpp
index 8ea7784336..fbbca13193 100644
--- a/eeschema/lib_bezier.cpp
+++ b/eeschema/lib_bezier.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2017 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
@@ -29,7 +29,7 @@
 #include <gr_basic.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <trigo.h>
 #include <wxstruct.h>
 #include <bezier_curves.h>
diff --git a/eeschema/lib_circle.cpp b/eeschema/lib_circle.cpp
index 18ecfb000c..8d40aa5d15 100644
--- a/eeschema/lib_circle.cpp
+++ b/eeschema/lib_circle.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2004-2017 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 <gr_basic.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <trigo.h>
 #include <wxstruct.h>
 #include <richio.h>
diff --git a/eeschema/lib_field.cpp b/eeschema/lib_field.cpp
index 26237bdf14..2864206349 100644
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@@ -34,7 +34,7 @@
 #include <drawtxt.h>
 #include <kicad_string.h>
 #include <class_drawpanel.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <trigo.h>
 #include <base_units.h>
 #include <msgpanel.h>
diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index 32c2db648b..c8e0563b19 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -34,7 +34,7 @@
 #include <trigo.h>
 #include <class_drawpanel.h>
 #include <drawtxt.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <schframe.h>
 #include <richio.h>
 #include <base_units.h>
diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp
index cab382b4d2..2a232072c1 100644
--- a/eeschema/lib_polyline.cpp
+++ b/eeschema/lib_polyline.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2004-2017 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 <gr_basic.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <trigo.h>
 #include <wxstruct.h>
 #include <richio.h>
diff --git a/eeschema/lib_rectangle.cpp b/eeschema/lib_rectangle.cpp
index a0314f81c5..c9622f2699 100644
--- a/eeschema/lib_rectangle.cpp
+++ b/eeschema/lib_rectangle.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2004-2017 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 <gr_basic.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <trigo.h>
 #include <wxstruct.h>
 #include <richio.h>
diff --git a/eeschema/lib_text.cpp b/eeschema/lib_text.cpp
index d07f30533e..021f11600c 100644
--- a/eeschema/lib_text.cpp
+++ b/eeschema/lib_text.cpp
@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2017 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
@@ -29,7 +29,7 @@
 #include <gr_basic.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <drawtxt.h>
 #include <trigo.h>
 #include <wxstruct.h>
diff --git a/eeschema/plot_schematic_DXF.cpp b/eeschema/plot_schematic_DXF.cpp
index 9762803632..567e6edfe5 100644
--- a/eeschema/plot_schematic_DXF.cpp
+++ b/eeschema/plot_schematic_DXF.cpp
@@ -5,7 +5,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 1992-2010 Lorenzo Marcantonio
- * Copyright (C) 1992-2016 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2017 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
@@ -26,7 +26,7 @@
  */
 
 #include <fctsys.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <class_sch_screen.h>
 #include <schframe.h>
 #include <sch_sheet_path.h>
diff --git a/eeschema/plot_schematic_HPGL.cpp b/eeschema/plot_schematic_HPGL.cpp
index 4cad993072..224c89fad6 100644
--- a/eeschema/plot_schematic_HPGL.cpp
+++ b/eeschema/plot_schematic_HPGL.cpp
@@ -4,8 +4,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2010 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr
- * Copyright (C) 1992-2016 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2010 Jean-Pierre Charras jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2017 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
@@ -26,7 +26,7 @@
  */
 
 #include <fctsys.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <class_sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
diff --git a/eeschema/plot_schematic_PDF.cpp b/eeschema/plot_schematic_PDF.cpp
index 2d679a8d73..11479672cf 100644
--- a/eeschema/plot_schematic_PDF.cpp
+++ b/eeschema/plot_schematic_PDF.cpp
@@ -4,8 +4,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2010 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr
- * Copyright (C) 1992-2016 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2010 Jean-Pierre Charras jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2017 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
@@ -26,7 +26,7 @@
  */
 
 #include <fctsys.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <class_sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
diff --git a/eeschema/plot_schematic_PS.cpp b/eeschema/plot_schematic_PS.cpp
index e13550c19d..a87d9e364e 100644
--- a/eeschema/plot_schematic_PS.cpp
+++ b/eeschema/plot_schematic_PS.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <fctsys.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <class_sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp
index b51d14f193..ea9e0763c8 100644
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 2004-2017 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
@@ -34,7 +34,7 @@
 #include <trigo.h>
 #include <common.h>
 #include <richio.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <bitmaps.h>
 
 #include <eeschema_config.h>
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index 3f3e7fb2ce..c293f06a1c 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -34,7 +34,7 @@
 #include <kicad_string.h>
 #include <richio.h>
 #include <schframe.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
 
diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp
index a141d5eb48..83da6fdd1f 100644
--- a/eeschema/sch_field.cpp
+++ b/eeschema/sch_field.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2004-2014 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2017 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
@@ -42,7 +42,7 @@
 #include <drawtxt.h>
 #include <macros.h>
 #include <schframe.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <bitmaps.h>
 
 #include <general.h>
diff --git a/eeschema/sch_junction.cpp b/eeschema/sch_junction.cpp
index 3c2e1fdb58..fb5f89760c 100644
--- a/eeschema/sch_junction.cpp
+++ b/eeschema/sch_junction.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2009 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2009 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2017 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
@@ -33,7 +33,7 @@
 #include <trigo.h>
 #include <common.h>
 #include <richio.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <bitmaps.h>
 
 #include <sch_junction.h>
diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp
index 911e802aa7..7f868259f0 100644
--- a/eeschema/sch_line.cpp
+++ b/eeschema/sch_line.cpp
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2017 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 <gr_basic.h>
 #include <macros.h>
 #include <class_drawpanel.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <base_units.h>
 #include <eeschema_config.h>
 #include <general.h>
diff --git a/eeschema/sch_no_connect.cpp b/eeschema/sch_no_connect.cpp
index 5a30375023..338a737cdb 100644
--- a/eeschema/sch_no_connect.cpp
+++ b/eeschema/sch_no_connect.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2017 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 <macros.h>
 #include <class_drawpanel.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <bitmaps.h>
 
 #include <general.h>
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index a6c1389302..2fd5071331 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -39,7 +39,7 @@
 #include <class_drawpanel.h>
 #include <sch_item_struct.h>
 #include <schframe.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 
 #include <netlist.h>
 #include <class_netlist_object.h>
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index 9a975d2b20..8d15918b8d 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -33,7 +33,7 @@
 #include <trigo.h>
 #include <richio.h>
 #include <schframe.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <kicad_string.h>
 #include <msgpanel.h>
 
diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp
index 2cf56e6428..b1dacbc231 100644
--- a/eeschema/sch_sheet_pin.cpp
+++ b/eeschema/sch_sheet_pin.cpp
@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <drawtxt.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <trigo.h>
 #include <richio.h>
 #include <schframe.h>
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index 10d55acd5d..19f77fe004 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -35,7 +35,7 @@
 #include <class_drawpanel.h>
 #include <drawtxt.h>
 #include <schframe.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <msgpanel.h>
 #include <gal/stroke_font.h>
 #include <bitmaps.h>
diff --git a/include/plot_common.h b/include/class_plotter.h
similarity index 100%
rename from include/plot_common.h
rename to include/class_plotter.h
diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index 784b6ddf17..77b3fa5a4c 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -32,7 +32,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <wxstruct.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <class_drawpanel.h>
 #include <trigo.h>
 #include <confirm.h>
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index efb7272690..8e6340c1f6 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -27,7 +27,7 @@
 
 
 #include <kiface_i.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <confirm.h>
 #include <wxPcbStruct.h>
 #include <pcbplot.h>
diff --git a/pcbnew/exporters/gen_drill_report_files.cpp b/pcbnew/exporters/gen_drill_report_files.cpp
index 0f94464824..57dad50b6b 100644
--- a/pcbnew/exporters/gen_drill_report_files.cpp
+++ b/pcbnew/exporters/gen_drill_report_files.cpp
@@ -7,7 +7,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 1992-2017 Jean_Pierre Charras <jp.charras at wanadoo.fr>
- * Copyright (C) 1992-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2017 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
@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <base_struct.h>
 #include <drawtxt.h>
 #include <confirm.h>
diff --git a/pcbnew/exporters/gendrill_Excellon_writer.cpp b/pcbnew/exporters/gendrill_Excellon_writer.cpp
index 6d4d399c38..889ab5a647 100644
--- a/pcbnew/exporters/gendrill_Excellon_writer.cpp
+++ b/pcbnew/exporters/gendrill_Excellon_writer.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2017 Jean_Pierre Charras <jp.charras at wanadoo.fr>
  * Copyright (C) 2015 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 1992-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2017 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 <fctsys.h>
 
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <kicad_string.h>
 #include <wxPcbStruct.h>
 #include <pgm_base.h>
diff --git a/pcbnew/exporters/gendrill_gerber_writer.cpp b/pcbnew/exporters/gendrill_gerber_writer.cpp
index 8fcf44a7cb..b8c2da3cf3 100644
--- a/pcbnew/exporters/gendrill_gerber_writer.cpp
+++ b/pcbnew/exporters/gendrill_gerber_writer.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2017 Jean_Pierre Charras <jp.charras at wanadoo.fr>
- * Copyright (C) 1992-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2017 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 <vector>
 
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <kicad_string.h>
 #include <wxPcbStruct.h>
 #include <pgm_base.h>
diff --git a/pcbnew/exporters/gerber_jobfile_writer.cpp b/pcbnew/exporters/gerber_jobfile_writer.cpp
index 90fb6205cc..07d7e77fb9 100644
--- a/pcbnew/exporters/gerber_jobfile_writer.cpp
+++ b/pcbnew/exporters/gerber_jobfile_writer.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2017 Jean_Pierre Charras <jp.charras at wanadoo.fr>
- * Copyright (C) 1992-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2017 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 <vector>
 
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <wxPcbStruct.h>
 #include <build_version.h>
 
diff --git a/pcbnew/pcb_plot_params.cpp b/pcbnew/pcb_plot_params.cpp
index 46b5f1e7b0..334041cc37 100644
--- a/pcbnew/pcb_plot_params.cpp
+++ b/pcbnew/pcb_plot_params.cpp
@@ -1,8 +1,7 @@
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2015 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2017 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
@@ -26,7 +25,7 @@
 #include <pcb_plot_params_parser.h>
 #include <pcb_plot_params.h>
 #include <layers_id_colors_and_visibility.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <macros.h>
 #include <convert_to_biu.h>
 
diff --git a/pcbnew/pcb_plot_params.h b/pcbnew/pcb_plot_params.h
index cf3e6e082a..608ead3a34 100644
--- a/pcbnew/pcb_plot_params.h
+++ b/pcbnew/pcb_plot_params.h
@@ -25,7 +25,7 @@
 
 #include <wx/wx.h>
 #include <eda_text.h>                // EDA_DRAW_MODE_T
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <layers_id_colors_and_visibility.h>
 
 class PCB_PLOT_PARAMS_PARSER;
diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp
index d08cd7a985..a4f0454f42 100644
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@@ -40,7 +40,7 @@
 #include <macros.h>
 #include <wxPcbStruct.h>
 #include <class_board_design_settings.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <worksheet.h>
 #include <dialog_hotkeys_editor.h>
 #include <fp_lib_table.h>
diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp
index cede89ef10..eaa34f9d75 100644
--- a/pcbnew/pcbplot.cpp
+++ b/pcbnew/pcbplot.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <fctsys.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <confirm.h>
 #include <wxPcbStruct.h>
 #include <pcbplot.h>
diff --git a/pcbnew/plot_board_layers.cpp b/pcbnew/plot_board_layers.cpp
index 8a9957a4e6..529494bae0 100644
--- a/pcbnew/plot_board_layers.cpp
+++ b/pcbnew/plot_board_layers.cpp
@@ -31,7 +31,7 @@
 
 #include <fctsys.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <base_struct.h>
 #include <drawtxt.h>
 #include <trigo.h>
diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp
index 68fff41483..bc41c761c0 100644
--- a/pcbnew/plot_brditems_plotter.cpp
+++ b/pcbnew/plot_brditems_plotter.cpp
@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <common.h>
-#include <plot_common.h>
+#include <class_plotter.h>
 #include <base_struct.h>
 #include <drawtxt.h>
 #include <trigo.h>