diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 1d4c315fed..d5495ad5f0 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -28,17 +28,17 @@ set( DIALOGS_SRCS
 
 set( GERBVIEW_SRCS
     block.cpp
-    class_am_param.cpp
-    class_aperture_macro.cpp
-    class_DCodeSelectionbox.cpp
-    class_gbr_screen.cpp
-    class_gbr_layout.cpp
-    class_gerber_file_image.cpp
-    class_gerber_file_image_list.cpp
-    class_gerber_draw_item.cpp
-    class_gerbview_layer_widget.cpp
-    class_gbr_layer_box_selector.cpp
-    class_X2_gerber_attributes.cpp
+    am_param.cpp
+    am_primitive.cpp
+    DCodeSelectionbox.cpp
+    gbr_screen.cpp
+    gbr_layout.cpp
+    gerber_file_image.cpp
+    gerber_file_image_list.cpp
+    gerber_draw_item.cpp
+    gerbview_layer_widget.cpp
+    gbr_layer_box_selector.cpp
+    X2_gerber_attributes.cpp
     clear_gbr_drawlayers.cpp
     controle.cpp
     dcode.cpp
diff --git a/gerbview/DCodeSelectionbox.cpp b/gerbview/DCodeSelectionbox.cpp
index a303a09649..5b54ff5663 100644
--- a/gerbview/DCodeSelectionbox.cpp
+++ b/gerbview/DCodeSelectionbox.cpp
@@ -27,7 +27,7 @@
 #include <wxstruct.h>
 #include <dcode.h>
 
-#include <class_DCodeSelectionbox.h>
+#include <DCodeSelectionbox.h>
 
 /*******************************************/
 /* Helper class for displaying DCodes list */
diff --git a/gerbview/DCodeSelectionbox.h b/gerbview/DCodeSelectionbox.h
index ebb5e5bc47..5ae98b0f14 100644
--- a/gerbview/DCodeSelectionbox.h
+++ b/gerbview/DCodeSelectionbox.h
@@ -24,8 +24,8 @@
 
 // file class_DCodeSelectionbox.h
 
-#ifndef CLASS_DCODESELECTIONBOX_H
-#define CLASS_DCODESELECTIONBOX_H
+#ifndef DCODESELECTIONBOX_H
+#define DCODESELECTIONBOX_H
 
 /* helper class to display a DCode list and select a DCode id.
  */
@@ -59,4 +59,4 @@ public: DCODE_SELECTION_BOX( wxAuiToolBar* aParent, wxWindowID aId,
     void AppendDCodeList( const wxArrayString& aChoices );
 };
 
-#endif //CLASS_DCODESELECTIONBOX_H
+#endif //DCODESELECTIONBOX_H
diff --git a/gerbview/X2_gerber_attributes.cpp b/gerbview/X2_gerber_attributes.cpp
index bdc0d356c7..e0c38a1e99 100644
--- a/gerbview/X2_gerber_attributes.cpp
+++ b/gerbview/X2_gerber_attributes.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2010-2014 Jean-Pierre Charras  jp.charras at wanadoo.fr
- * Copyright (C) 1992-2014 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2014 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
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file class_X2_gerber_attributes.cpp
+ * @file X2_gerber_attributes.cpp
  */
 
 /*
@@ -42,7 +42,7 @@
  */
 
 #include <wx/log.h>
-#include <class_X2_gerber_attributes.h>
+#include <X2_gerber_attributes.h>
 
 /*
  * class X2_ATTRIBUTE
diff --git a/gerbview/X2_gerber_attributes.h b/gerbview/X2_gerber_attributes.h
index 16f5d18ec9..83002dca94 100644
--- a/gerbview/X2_gerber_attributes.h
+++ b/gerbview/X2_gerber_attributes.h
@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2010-2014 Jean-Pierre Charras  jp.charras at wanadoo.fr
- * Copyright (C) 1992-2014 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2010-2018 Jean-Pierre Charras  jp.charras at wanadoo.fr
+ * 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
@@ -23,11 +23,11 @@
  */
 
 /**
- * @file class_X2_gerber_attributes.h
+ * @file X2_gerber_attributes.h
  */
 
-#ifndef _CLASS_X2_GERBER_ATTRIBUTE_H_
-#define _CLASS_X2_GERBER_ATTRIBUTE_H_
+#ifndef X2_GERBER_ATTRIBUTE_H
+#define X2_GERBER_ATTRIBUTE_H
 
 /*
  * Manage the gerber extensions (attributes) in the new X2 version
@@ -201,4 +201,4 @@ private:
     void set_Z_Order();
 };
 
-#endif      // _CLASS_X2_GERBER_ATTRIBUTE_H_
+#endif      // X2_GERBER_ATTRIBUTE_H
diff --git a/gerbview/am_param.cpp b/gerbview/am_param.cpp
index 5fd5b5e572..d4b559d912 100644
--- a/gerbview/am_param.cpp
+++ b/gerbview/am_param.cpp
@@ -1,5 +1,5 @@
 /**
- * @file class_am_param.cpp
+ * @file am_param.cpp
  */
 
 /*
@@ -27,8 +27,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <class_am_param.h>
-#include <class_aperture_macro.h>
+#include <am_param.h>
+#include <am_primitive.h>
 
 extern int    ReadInt( char*& text, bool aSkipSeparator = true );
 extern double ReadDouble( char*& text, bool aSkipSeparator = true );
diff --git a/gerbview/am_param.h b/gerbview/am_param.h
index fbcbe200d3..d119d7a434 100644
--- a/gerbview/am_param.h
+++ b/gerbview/am_param.h
@@ -1,5 +1,5 @@
 /**
- * @file class_am_param.h
+ * @file am_param.h
  */
 
 /*
diff --git a/gerbview/am_primitive.cpp b/gerbview/am_primitive.cpp
index ba15d62af8..645a85629b 100644
--- a/gerbview/am_primitive.cpp
+++ b/gerbview/am_primitive.cpp
@@ -1,5 +1,5 @@
 /**
- * @file class_aperture_macro.cpp
+ * @file aperture_macro.cpp
  */
 
 /*
@@ -35,7 +35,7 @@
 #include <gr_basic.h>
 
 #include <gerbview.h>
-#include <class_gerber_file_image.h>
+#include <gerber_file_image.h>
 
 
 
diff --git a/gerbview/am_primitive.h b/gerbview/am_primitive.h
index 29af748945..458319d8f1 100644
--- a/gerbview/am_primitive.h
+++ b/gerbview/am_primitive.h
@@ -1,9 +1,9 @@
 /**
- * @file class_aperture_macro.h
+ * @file aperture_macro.h
  */
 
-#ifndef _APERTURE_MACRO_H_
-#define _APERTURE_MACRO_H_
+#ifndef AM_PRIMITIVE_H
+#define AM_PRIMITIVE_H
 
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
@@ -34,7 +34,7 @@
 #include <set>
 
 #include <base_struct.h>
-#include <class_am_param.h>
+#include <am_param.h>
 #include <eda_rect.h>
 
 class SHAPE_POLY_SET;
@@ -259,4 +259,4 @@ typedef std::set<APERTURE_MACRO, APERTURE_MACRO_less_than> APERTURE_MACRO_SET;
 typedef std::pair<APERTURE_MACRO_SET::iterator, bool>      APERTURE_MACRO_SET_PAIR;
 
 
-#endif  // ifndef _APERTURE_MACRO_H_
+#endif  // ifndef AM_PRIMITIVE_H
diff --git a/gerbview/block.cpp b/gerbview/block.cpp
index d284d7da74..3a6408116a 100644
--- a/gerbview/block.cpp
+++ b/gerbview/block.cpp
@@ -32,9 +32,9 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <gerbview_frame.h>
-#include <class_gerber_draw_item.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_draw_item.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 
 // Call back function used in block command
 static void DrawMovingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC,
diff --git a/gerbview/clear_gbr_drawlayers.cpp b/gerbview/clear_gbr_drawlayers.cpp
index 39af605b9f..96cdae1ddd 100644
--- a/gerbview/clear_gbr_drawlayers.cpp
+++ b/gerbview/clear_gbr_drawlayers.cpp
@@ -32,9 +32,9 @@
 #include <confirm.h>
 
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
-#include <class_gerbview_layer_widget.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
+#include <gerbview_layer_widget.h>
 #include <view/view.h>
 #include <tool/tool_manager.h>
 
diff --git a/gerbview/dcode.cpp b/gerbview/dcode.cpp
index 847a6835c3..99610804d0 100644
--- a/gerbview/dcode.cpp
+++ b/gerbview/dcode.cpp
@@ -34,7 +34,7 @@
 #include <trigo.h>
 
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
+#include <gerber_file_image.h>
 #include <convert_to_biu.h>
 #include <convert_basic_shapes_to_polygon.h>
 
diff --git a/gerbview/dialogs/dialog_print_using_printer.cpp b/gerbview/dialogs/dialog_print_using_printer.cpp
index ae8e672e22..c251ec1713 100644
--- a/gerbview/dialogs/dialog_print_using_printer.cpp
+++ b/gerbview/dialogs/dialog_print_using_printer.cpp
@@ -34,8 +34,8 @@
 
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 
 ///@{
 /// \ingroup config
diff --git a/gerbview/draw_gerber_screen.cpp b/gerbview/draw_gerber_screen.cpp
index af2a3eac93..0182d445f6 100644
--- a/gerbview/draw_gerber_screen.cpp
+++ b/gerbview/draw_gerber_screen.cpp
@@ -37,8 +37,8 @@
 
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 #include <printout_controler.h>
 
 
diff --git a/gerbview/evaluate.cpp b/gerbview/evaluate.cpp
index 22a45eff33..28d7b3b94c 100644
--- a/gerbview/evaluate.cpp
+++ b/gerbview/evaluate.cpp
@@ -74,7 +74,7 @@
  *  Upon which you will get the result 11.
  */
 
-#include <class_am_param.h>
+#include <am_param.h>
 
 /**
  * Evaluate an basic arithmetic expression (infix notation) with precedence
diff --git a/gerbview/events_called_functions.cpp b/gerbview/events_called_functions.cpp
index d512fe3802..72d47f890a 100644
--- a/gerbview/events_called_functions.cpp
+++ b/gerbview/events_called_functions.cpp
@@ -36,11 +36,11 @@
 #include <gerbview_frame.h>
 #include <kicad_device_context.h>
 #include <gerbview_id.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 #include <dialog_helpers.h>
-#include <class_DCodeSelectionbox.h>
-#include <class_gerbview_layer_widget.h>
+#include <DCodeSelectionbox.h>
+#include <gerbview_layer_widget.h>
 #include <dialog_show_page_borders.h>
 
 #include <tool/tool_manager.h>
diff --git a/gerbview/excellon_image.h b/gerbview/excellon_image.h
index d60f7cab17..edeb61ad0f 100644
--- a/gerbview/excellon_image.h
+++ b/gerbview/excellon_image.h
@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef CLASS_EXCELLON_H
-#define CLASS_EXCELLON_H
+#ifndef EXCELLON_IMAGE_H
+#define EXCELLON_IMAGE_H
 
 
 enum drill_M_code_t {
@@ -318,4 +318,4 @@ private:
  *  M95             End of the header
  */
 
-#endif  // CLASS_EXCELLON_H
+#endif  // EXCELLON_IMAGE_H
diff --git a/gerbview/excellon_read_drill_file.cpp b/gerbview/excellon_read_drill_file.cpp
index 950a10a7d7..8895ff394d 100644
--- a/gerbview/excellon_read_drill_file.cpp
+++ b/gerbview/excellon_read_drill_file.cpp
@@ -68,11 +68,11 @@
 
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
-#include <class_excellon.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
+#include <excellon_image.h>
 #include <kicad_string.h>
-#include <class_X2_gerber_attributes.h>
+#include <X2_gerber_attributes.h>
 #include <view/view.h>
 
 #include <cmath>
diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp
index 3f6032702d..3f35ddf6f4 100644
--- a/gerbview/export_to_pcbnew.cpp
+++ b/gerbview/export_to_pcbnew.cpp
@@ -36,8 +36,8 @@
 #include <trigo.h>
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 #include <select_layers_to_pcb.h>
 #include <build_version.h>
 #include <wildcards_and_files_ext.h>
diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index 969a92904c..e685cf9252 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -38,8 +38,8 @@
 
 #include <gerbview_frame.h>
 #include <gerbview_id.h>
-#include <class_gerber_file_image.h>
-#include <class_gerbview_layer_widget.h>
+#include <gerber_file_image.h>
+#include <gerbview_layer_widget.h>
 #include <wildcards_and_files_ext.h>
 
 // HTML Messages used more than one time:
diff --git a/gerbview/gbr_display_options.h b/gerbview/gbr_display_options.h
index ebd392df2b..b46e42ae4f 100644
--- a/gerbview/gbr_display_options.h
+++ b/gerbview/gbr_display_options.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file class_gbr_display_options.h
+ * @file gbr_display_options.h
  * @brief Class GBR_DISPLAY_OPTIONS is a helper class to handle display options
  * (filling modes and afew other options
  */
diff --git a/gerbview/gbr_layer_box_selector.cpp b/gerbview/gbr_layer_box_selector.cpp
index b7dfd2227e..532af6ebbf 100644
--- a/gerbview/gbr_layer_box_selector.cpp
+++ b/gerbview/gbr_layer_box_selector.cpp
@@ -1,5 +1,5 @@
 /**
- * @file class_gbr_layer_box_selector.cpp
+ * @file gbr_layer_box_selector.cpp
  * @brief a derived class of LAYER_BOX_SELECTOR to handle the layer box selector
  * in GerbView
  */
@@ -31,9 +31,9 @@
 
 #include <common.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image_list.h>
 
-#include <class_gbr_layer_box_selector.h>
+#include <gbr_layer_box_selector.h>
 
 void GBR_LAYER_BOX_SELECTOR::Resync()
 {
diff --git a/gerbview/gbr_layer_box_selector.h b/gerbview/gbr_layer_box_selector.h
index bf9631883d..65177dfa93 100644
--- a/gerbview/gbr_layer_box_selector.h
+++ b/gerbview/gbr_layer_box_selector.h
@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef CLASS_GBR_LAYER_BOX_SELECTOR_H
-#define CLASS_GBR_LAYER_BOX_SELECTOR_H 1
+#ifndef GBR_LAYER_BOX_SELECTOR_H
+#define GBR_LAYER_BOX_SELECTOR_H 1
 
 #include <class_layer_box_selector.h>
 
@@ -56,4 +56,4 @@ public:
     wxString GetLayerName( int aLayer ) const override;
 };
 
-#endif //CLASS_GBR_LAYER_BOX_SELECTOR_H
+#endif //GBR_LAYER_BOX_SELECTOR_H
diff --git a/gerbview/gbr_layout.cpp b/gerbview/gbr_layout.cpp
index ea0c80f68c..6a6d25dac3 100644
--- a/gerbview/gbr_layout.cpp
+++ b/gerbview/gbr_layout.cpp
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file class_gbr_layout.cpp
+ * @file gbr_layout.cpp
  * @brief  GBR_LAYOUT class functions.
  */
 
@@ -32,9 +32,9 @@
 #include <draw_graphic_text.h>
 #include <gerbview_frame.h>
 #include <class_drawpanel.h>
-#include <class_gbr_layout.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gbr_layout.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 
 GBR_LAYOUT::GBR_LAYOUT() :
     EDA_ITEM( (EDA_ITEM*)NULL, GERBER_LAYOUT_T )
diff --git a/gerbview/gbr_layout.h b/gerbview/gbr_layout.h
index d1daf0c868..a919c6040c 100644
--- a/gerbview/gbr_layout.h
+++ b/gerbview/gbr_layout.h
@@ -23,13 +23,13 @@
  */
 
 /**
- * @file class_gbr_layout.h
+ * @file gbr_layout.h
  * @brief Class CLASS_GBR_LAYOUT to handle info to draw/print loaded Gerber images
  * and page frame reference
  */
 
-#ifndef CLASS_GBR_LAYOUT_H
-#define CLASS_GBR_LAYOUT_H
+#ifndef GBR_LAYOUT_H
+#define GBR_LAYOUT_H
 
 
 #include <dlist.h>
@@ -38,8 +38,8 @@
 #include <common.h>                         // PAGE_INFO
 #include <gerbview.h>                       // GERBER_DRAWLAYERS_COUNT
 #include <title_block.h>
-#include <class_gerber_draw_item.h>
-#include <class_gbr_display_options.h>
+#include <gerber_draw_item.h>
+#include <gbr_display_options.h>
 
 #include <gr_basic.h>
 #include <eda_rect.h>
@@ -193,4 +193,4 @@ public:
 #endif
 };
 
-#endif      // #ifndef CLASS_GBR_LAYOUT_H
+#endif      // #ifndef GBR_LAYOUT_H
diff --git a/gerbview/gbr_screen.cpp b/gerbview/gbr_screen.cpp
index 47311ebba6..f5733d7f48 100644
--- a/gerbview/gbr_screen.cpp
+++ b/gerbview/gbr_screen.cpp
@@ -23,13 +23,13 @@
  */
 
 /**
- * @file class_gbr_screen.cpp
+ * @file gbr_screen.cpp
  */
 
 #include <fctsys.h>
 #include <common.h>
 #include <macros.h>
-#include <class_gbr_screen.h>
+#include <gbr_screen.h>
 #include <gerbview_id.h>
 
 
diff --git a/gerbview/gbr_screen.h b/gerbview/gbr_screen.h
index 1bce4a018e..691b4d4f5a 100644
--- a/gerbview/gbr_screen.h
+++ b/gerbview/gbr_screen.h
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2012-2014 Jean-Pierre Charras  jp.charras at wanadoo.fr
- * Copyright (C) 1992-2014 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 1992-2014 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
@@ -23,11 +23,11 @@
  */
 
 /**
- * @file class_gbr_screen.h
+ * @file gbr_screen.h
  */
 
-#ifndef CLASS_GBR_SCREEN_H_
-#define CLASS_GBR_SCREEN_H_
+#ifndef GBR_SCREEN_H
+#define GBR_SCREEN_H
 
 #include <base_units.h>
 
@@ -60,4 +60,4 @@ public:
 };
 
 
-#endif  // CLASS_GBR_SCREEN_H_
+#endif  // GBR_SCREEN_H
diff --git a/gerbview/gerber_draw_item.cpp b/gerbview/gerber_draw_item.cpp
index d5365c3090..d6df6d55b0 100644
--- a/gerbview/gerber_draw_item.cpp
+++ b/gerbview/gerber_draw_item.cpp
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file class_gerber_draw_item.cpp
+ * @file gerber_draw_item.cpp
  */
 
 #include <fctsys.h>
@@ -35,9 +35,9 @@
 #include <gerbview_frame.h>
 #include <convert_basic_shapes_to_polygon.h>
 
-#include <class_gerber_draw_item.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_draw_item.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 
 
 GERBER_DRAW_ITEM::GERBER_DRAW_ITEM( GERBER_FILE_IMAGE* aGerberImageFile ) :
diff --git a/gerbview/gerber_draw_item.h b/gerbview/gerber_draw_item.h
index 16a17515d4..9efb99fbd0 100644
--- a/gerbview/gerber_draw_item.h
+++ b/gerbview/gerber_draw_item.h
@@ -23,11 +23,11 @@
  */
 
 /**
- * @file class_gerber_draw_item.h
+ * @file gerber_draw_item.h
  */
 
-#ifndef CLASS_GERBER_DRAW_ITEM_H
-#define CLASS_GERBER_DRAW_ITEM_H
+#ifndef GERBER_DRAW_ITEM_H
+#define GERBER_DRAW_ITEM_H
 
 #include <base_struct.h>
 #include <dlist.h>
@@ -332,4 +332,4 @@ class GERBER_NEGATIVE_IMAGE_BACKDROP : public EDA_ITEM
 
 };
 
-#endif /* CLASS_GERBER_DRAW_ITEM_H */
+#endif /* GERBER_DRAW_ITEM_H */
diff --git a/gerbview/gerber_file_image.cpp b/gerbview/gerber_file_image.cpp
index 4d2b18b0b4..15543bded4 100644
--- a/gerbview/gerber_file_image.cpp
+++ b/gerbview/gerber_file_image.cpp
@@ -1,5 +1,5 @@
 /**
- * @file class_gerber_file_image.cpp
+ * @file gerber_file_image.cpp
  * a GERBER class handle for a given layer info about used D_CODES and how the layer is drawn
  */
 
@@ -35,8 +35,8 @@
 
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_X2_gerber_attributes.h>
+#include <gerber_file_image.h>
+#include <X2_gerber_attributes.h>
 
 #include <algorithm>
 #include <map>
diff --git a/gerbview/gerber_file_image.h b/gerbview/gerber_file_image.h
index a0f4798e3d..94cc0f443e 100644
--- a/gerbview/gerber_file_image.h
+++ b/gerbview/gerber_file_image.h
@@ -22,15 +22,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef CLASS_GERBER_FILE_IMAGE_H
-#define CLASS_GERBER_FILE_IMAGE_H
+#ifndef GERBER_FILE_IMAGE_H
+#define GERBER_FILE_IMAGE_H
 
 #include <vector>
 #include <set>
 
 #include <dcode.h>
-#include <class_gerber_draw_item.h>
-#include <class_aperture_macro.h>
+#include <gerber_draw_item.h>
+#include <am_primitive.h>
 #include <gbr_netlist_metadata.h>
 
 // An useful macro used when reading gerber files;
@@ -389,4 +389,4 @@ public:
 #endif
 };
 
-#endif  // ifndef CLASS_GERBER_FILE_IMAGE_H
+#endif  // ifndef GERBER_FILE_IMAGE_H
diff --git a/gerbview/gerber_file_image_list.cpp b/gerbview/gerber_file_image_list.cpp
index 0f034a53d9..364036acda 100644
--- a/gerbview/gerber_file_image_list.cpp
+++ b/gerbview/gerber_file_image_list.cpp
@@ -1,5 +1,5 @@
 /**
- * @file class_gerber_file_image.cpp
+ * @file gerber_file_image.cpp
  * a GERBER class handle for a given layer info about used D_CODES and how the layer is drawn
  */
 
@@ -31,9 +31,9 @@
 
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
-#include <class_X2_gerber_attributes.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
+#include <X2_gerber_attributes.h>
 
 #include <map>
 
diff --git a/gerbview/gerber_file_image_list.h b/gerbview/gerber_file_image_list.h
index ddd765ffd0..acfc369b65 100644
--- a/gerbview/gerber_file_image_list.h
+++ b/gerbview/gerber_file_image_list.h
@@ -22,14 +22,14 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#ifndef CLASS_GERBER_FILE_IMAGE_LIST_H
-#define CLASS_GERBER_FILE_IMAGE_LIST_H
+#ifndef GERBER_FILE_IMAGE_LIST_H
+#define GERBER_FILE_IMAGE_LIST_H
 
 #include <vector>
 #include <set>
 
-#include <class_gerber_draw_item.h>
-#include <class_aperture_macro.h>
+#include <gerber_draw_item.h>
+#include <am_primitive.h>
 
 /* gerber files have different parameters to define units and how items must be plotted.
  *  some are for the entire file, and other can change along a file.
@@ -128,4 +128,4 @@ public:
     #endif
 };
 
-#endif  // ifndef CLASS_GERBER_FILE_IMAGE_LIST_H
+#endif  // ifndef GERBER_FILE_IMAGE_LIST_H
diff --git a/gerbview/gerbview_draw_panel_gal.cpp b/gerbview/gerbview_draw_panel_gal.cpp
index 4f54786246..ee4f621b96 100644
--- a/gerbview/gerbview_draw_panel_gal.cpp
+++ b/gerbview/gerbview_draw_panel_gal.cpp
@@ -24,7 +24,7 @@
 
 #include <class_colors_design_settings.h>
 #include <gerbview_frame.h>
-#include <class_gbr_display_options.h>
+#include <gbr_display_options.h>
 #include <gal/graphics_abstraction_layer.h>
 
 #include <functional>
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index 395721db0c..b63721d2dc 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/gerbview/gerbview_frame.cpp
@@ -30,7 +30,7 @@
 #include <build_version.h>
 #include <trigo.h>
 #include <base_units.h>
-#include <class_gbr_layer_box_selector.h>
+#include <gbr_layer_box_selector.h>
 #include <msgpanel.h>
 #include <bitmaps.h>
 #include <wildcards_and_files_ext.h>
@@ -39,11 +39,11 @@
 #include <gerbview_frame.h>
 #include <gerbview_id.h>
 #include <hotkeys.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 #include <dialog_helpers.h>
-#include <class_DCodeSelectionbox.h>
-#include <class_gerbview_layer_widget.h>
+#include <DCodeSelectionbox.h>
+#include <gerbview_layer_widget.h>
 
 #include <gerbview_draw_panel_gal.h>
 #include <gal/graphics_abstraction_layer.h>
diff --git a/gerbview/gerbview_frame.h b/gerbview/gerbview_frame.h
index 6ec8799091..bf09f8f7e7 100644
--- a/gerbview/gerbview_frame.h
+++ b/gerbview/gerbview_frame.h
@@ -33,10 +33,10 @@
 
 #include <gerbview.h>
 #include <convert_to_biu.h>
-#include <class_gbr_layout.h>
-#include <class_gbr_screen.h>
+#include <gbr_layout.h>
+#include <gbr_screen.h>
 #include <page_info.h>
-#include <class_gbr_display_options.h>
+#include <gbr_display_options.h>
 #include <class_colors_design_settings.h>
 
 extern COLORS_DESIGN_SETTINGS g_ColorsSettings;
diff --git a/gerbview/gerbview_layer_widget.cpp b/gerbview/gerbview_layer_widget.cpp
index 1f84c68f78..415cfc0114 100644
--- a/gerbview/gerbview_layer_widget.cpp
+++ b/gerbview/gerbview_layer_widget.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2004-2010 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2016 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
@@ -33,13 +33,13 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <macros.h>
-#include <class_gbr_layer_box_selector.h>
+#include <gbr_layer_box_selector.h>
 
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image_list.h>
 #include <layer_widget.h>
-#include <class_gerbview_layer_widget.h>
+#include <gerbview_layer_widget.h>
 
 #include <view/view.h>
 #include <gerbview_painter.h>
diff --git a/gerbview/gerbview_layer_widget.h b/gerbview/gerbview_layer_widget.h
index 8f8e031333..2b2f258302 100644
--- a/gerbview/gerbview_layer_widget.h
+++ b/gerbview/gerbview_layer_widget.h
@@ -28,8 +28,8 @@
 /* class_gerber_layer_widget.h : header for the layers manager */
 /************************************************************/
 
-#ifndef _CLASS_GERBER_LAYER_WIDGET_H_
-#define _CLASS_GERBER_LAYER_WIDGET_H_
+#ifndef GERBER_LAYER_WIDGET_H
+#define GERBER_LAYER_WIDGET_H
 
 #include <layer_widget.h>
 
@@ -138,4 +138,4 @@ protected:
     };
 };
 
-#endif  // _CLASS_GERBER_LAYER_WIDGET_H_
+#endif  // GERBER_LAYER_WIDGET_H
diff --git a/gerbview/gerbview_painter.cpp b/gerbview/gerbview_painter.cpp
index 0da9400942..cd32ee1201 100644
--- a/gerbview/gerbview_painter.cpp
+++ b/gerbview/gerbview_painter.cpp
@@ -26,8 +26,8 @@
 #include <convert_to_biu.h>
 #include <gerbview.h>
 
-#include <class_gerber_draw_item.h>
-#include <class_gerber_file_image.h>
+#include <gerber_draw_item.h>
+#include <gerber_file_image.h>
 
 using namespace KIGFX;
 
diff --git a/gerbview/gerbview_painter.h b/gerbview/gerbview_painter.h
index e27352e183..167d8c0f8d 100644
--- a/gerbview/gerbview_painter.h
+++ b/gerbview/gerbview_painter.h
@@ -23,7 +23,7 @@
 
 #include <layers_id_colors_and_visibility.h>
 #include <painter.h>
-#include <class_gbr_display_options.h>
+#include <gbr_display_options.h>
 #include <geometry/shape_poly_set.h>
 
 #include <memory>
diff --git a/gerbview/hotkeys.cpp b/gerbview/hotkeys.cpp
index a3f17d58fb..12a47d939b 100644
--- a/gerbview/hotkeys.cpp
+++ b/gerbview/hotkeys.cpp
@@ -33,7 +33,7 @@
 #include <gerbview.h>
 #include <gerbview_frame.h>
 #include <class_drawpanel.h>
-#include <class_gerbview_layer_widget.h>
+#include <gerbview_layer_widget.h>
 #include <hotkeys.h>
 
 
diff --git a/gerbview/job_file_reader.cpp b/gerbview/job_file_reader.cpp
index 9390b80476..80f54ee385 100644
--- a/gerbview/job_file_reader.cpp
+++ b/gerbview/job_file_reader.cpp
@@ -33,8 +33,8 @@
 #include <gerbview.h>
 #include <richio.h>
 #include <class_drawpanel.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 #include <gerbview_frame.h>
 #include <reporter.h>
 #include <plot_auxiliary_data.h>
diff --git a/gerbview/locate.cpp b/gerbview/locate.cpp
index a4953f8b94..99fe3e3f57 100644
--- a/gerbview/locate.cpp
+++ b/gerbview/locate.cpp
@@ -32,8 +32,8 @@
 
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 
 
 /* locate a gerber item and return a pointer to it.
diff --git a/gerbview/onleftclick.cpp b/gerbview/onleftclick.cpp
index 9855d71730..0191f61f7b 100644
--- a/gerbview/onleftclick.cpp
+++ b/gerbview/onleftclick.cpp
@@ -27,8 +27,8 @@
 
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 #include <dialog_helpers.h>
 
 /* Process the command triggered by the left button of the mouse
diff --git a/gerbview/printout_control.cpp b/gerbview/printout_control.cpp
index 574172daf8..ee261a964a 100644
--- a/gerbview/printout_control.cpp
+++ b/gerbview/printout_control.cpp
@@ -37,8 +37,8 @@
 #include <base_screen.h>
 
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 
 #include <printout_controler.h>
 
diff --git a/gerbview/readgerb.cpp b/gerbview/readgerb.cpp
index ee97816e06..293c4a40e1 100644
--- a/gerbview/readgerb.cpp
+++ b/gerbview/readgerb.cpp
@@ -28,8 +28,8 @@
 #include <kicad_string.h>
 #include <gerbview.h>
 #include <gerbview_frame.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 #include <view/view.h>
 
 #include <html_messagebox.h>
diff --git a/gerbview/rs274_read_XY_and_IJ_coordinates.cpp b/gerbview/rs274_read_XY_and_IJ_coordinates.cpp
index 8e6289b6b5..2c39687524 100644
--- a/gerbview/rs274_read_XY_and_IJ_coordinates.cpp
+++ b/gerbview/rs274_read_XY_and_IJ_coordinates.cpp
@@ -25,7 +25,7 @@
 #include <fctsys.h>
 #include <common.h>
 
-#include <class_gerber_file_image.h>
+#include <gerber_file_image.h>
 #include <base_units.h>
 
 
diff --git a/gerbview/rs274d.cpp b/gerbview/rs274d.cpp
index 8b79c92f39..ccf5225e20 100644
--- a/gerbview/rs274d.cpp
+++ b/gerbview/rs274d.cpp
@@ -32,8 +32,8 @@
 #include <gerbview.h>
 #include <gerbview_frame.h>
 #include <trigo.h>
-#include <class_gerber_file_image.h>
-#include <class_X2_gerber_attributes.h>
+#include <gerber_file_image.h>
+#include <X2_gerber_attributes.h>
 
 #include <cmath>
 
diff --git a/gerbview/rs274x.cpp b/gerbview/rs274x.cpp
index 06251432c6..a6e0564b66 100644
--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
@@ -32,8 +32,8 @@
 #include <base_units.h>
 
 #include <gerbview.h>
-#include <class_gerber_file_image.h>
-#include <class_X2_gerber_attributes.h>
+#include <gerber_file_image.h>
+#include <X2_gerber_attributes.h>
 
 extern int ReadInt( char*& text, bool aSkipSeparator = true );
 extern double ReadDouble( char*& text, bool aSkipSeparator = true );
diff --git a/gerbview/select_layers_to_pcb.cpp b/gerbview/select_layers_to_pcb.cpp
index 2b76dafacb..f6a8588b11 100644
--- a/gerbview/select_layers_to_pcb.cpp
+++ b/gerbview/select_layers_to_pcb.cpp
@@ -31,8 +31,8 @@
 #include <gerbview.h>
 #include <gerbview_frame.h>
 #include <gerbview_id.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
 
 #include <select_layers_to_pcb.h>
 
diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp
index 2c0d48b20c..5cdcab2510 100644
--- a/gerbview/toolbars_gerber.cpp
+++ b/gerbview/toolbars_gerber.cpp
@@ -32,10 +32,10 @@
 #include <bitmaps.h>
 #include <gerbview_id.h>
 #include <hotkeys.h>
-#include <class_gerber_file_image.h>
-#include <class_gerber_file_image_list.h>
-#include <class_gbr_layer_box_selector.h>
-#include <class_DCodeSelectionbox.h>
+#include <gerber_file_image.h>
+#include <gerber_file_image_list.h>
+#include <gbr_layer_box_selector.h>
+#include <DCodeSelectionbox.h>
 #include <dialog_helpers.h>
 #include <bitmaps.h>