=== modified file 'include/menus_helpers.h'
--- include/menus_helpers.h	2016-01-12 16:33:33 +0000
+++ include/menus_helpers.h	2016-01-19 00:06:39 +0000
@@ -30,8 +30,13 @@
  * in menubars or popup menus
  */
 
+
+#include <wx/menu.h>
+#include <wx/menuitem.h>
+
 #include <bitmaps.h>
 
+
 /**
  * Definition SETBITMAPS
  * is a macro use to add a bitmaps to check menu item.

=== modified file 'kicad/class_treeproject_item.cpp'
--- kicad/class_treeproject_item.cpp	2015-12-22 11:58:26 +0000
+++ kicad/class_treeproject_item.cpp	2016-01-18 23:45:15 +0000
@@ -1,10 +1,3 @@
-/**
- * @file class_treeproject_item.cpp
- *
- * @brief Class TREEPROJECT_ITEM is a derived  class from wxTreeItemData and
- * store info about a file or directory shown in the KiCad tree project files
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -28,21 +21,24 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
-#include <fctsys.h>
+/**
+ * @file class_treeproject_item.cpp
+ *
+ * @brief Class TREEPROJECT_ITEM is a derived  class from wxTreeItemData and
+ * store info about a file or directory shown in the KiCad tree project files
+ */
+
+
+#include <wx/regex.h>
+
 #include <gestfich.h>
-#include <macros.h>
-
-#include <kicad.h>
-#include <project.h>
-#include <pgm_base.h>
-#include <tree_project_frame.h>
-#include <class_treeprojectfiles.h>
-#include <class_treeproject_item.h>
-#include <wx/imaglist.h>
-
-#include <wx/regex.h>
-#include <wx/dir.h>
+
+#include "class_treeprojectfiles.h"
+#include "pgm_kicad.h"
+#include "tree_project_frame.h"
+
+#include "class_treeproject_item.h"
+
 
 TREEPROJECT_ITEM::TREEPROJECT_ITEM( enum TreeFileType type, const wxString& data,
                                     wxTreeCtrl* parent ) :

=== modified file 'kicad/class_treeproject_item.h'
--- kicad/class_treeproject_item.h	2014-10-23 17:53:38 +0000
+++ kicad/class_treeproject_item.h	2016-01-18 23:45:15 +0000
@@ -25,6 +25,12 @@
 #ifndef TREEPROJECT_ITEM_H_
 #define TREEPROJECT_ITEM_H_
 
+
+#include <wx/treebase.h>
+
+#include "kicad.h"
+
+
 /**
  * Class TREEPROJECT_ITEM
  * handles one item (a file or a directory name) for the tree file

=== modified file 'kicad/class_treeprojectfiles.cpp'
--- kicad/class_treeprojectfiles.cpp	2015-06-24 19:30:35 +0000
+++ kicad/class_treeprojectfiles.cpp	2016-01-18 23:45:15 +0000
@@ -1,7 +1,3 @@
-/**
- * @file class_treeprojectfiles.cpp
- * this is the wxTreeCtrl that shows a KiCad tree project files
- */
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -26,17 +22,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
-#include <fctsys.h>
-
-#include <kicad.h>
-#include <tree_project_frame.h>
-#include <class_treeprojectfiles.h>
-#include <class_treeproject_item.h>
-
-#include <wx/regex.h>
-#include <wx/imaglist.h>
-#include <menus_helpers.h>
+/**
+ * @file class_treeprojectfiles.cpp
+ * this is the wxTreeCtrl that shows a KiCad tree project files
+ */
+
+
+#include <bitmaps.h>
+
+#include "class_treeproject_item.h"
+#include "tree_project_frame.h"
+
+#include "class_treeprojectfiles.h"
 
 
 IMPLEMENT_ABSTRACT_CLASS( TREEPROJECTFILES, wxTreeCtrl )
@@ -109,4 +106,3 @@
 
     return myitem1->GetFileName().CmpNoCase( myitem2->GetFileName() );
 }
-

=== modified file 'kicad/class_treeprojectfiles.h'
--- kicad/class_treeprojectfiles.h	2014-10-23 17:53:38 +0000
+++ kicad/class_treeprojectfiles.h	2016-01-18 23:45:15 +0000
@@ -29,6 +29,12 @@
 #ifndef CLASS_TREEPROJECTFILES_H
 #define CLASS_TREEPROJECTFILES_H
 
+
+#include <wx/treectrl.h>
+
+#include "kicad.h"
+
+
 /** Class TREEPROJECTFILES
  * This is the class to show (as a tree) the files in the project directory
  */

=== modified file 'kicad/commandframe.cpp'
--- kicad/commandframe.cpp	2015-06-07 18:18:45 +0000
+++ kicad/commandframe.cpp	2016-01-18 23:45:15 +0000
@@ -1,8 +1,3 @@
-/**
- * @file commandframe.cpp
- * @brief Frame showing fast launch buttons and messages box
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -27,12 +22,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
-#include <fctsys.h>
-#include <macros.h>
-
-#include <kicad.h>
-#include <menus_helpers.h>
+/**
+ * @file commandframe.cpp
+ * @brief Frame showing fast launch buttons and messages box
+ */
+
+
+#include <bitmaps.h>
+
+#include "kicad.h"
 
 
 LAUNCHER_PANEL::LAUNCHER_PANEL( wxWindow* parent ) :

=== modified file 'kicad/files-io.cpp'
--- kicad/files-io.cpp	2015-09-25 19:38:09 +0000
+++ kicad/files-io.cpp	2016-01-18 23:45:15 +0000
@@ -1,7 +1,3 @@
-/**
- * @file kicad/files-io.cpp
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -26,21 +22,23 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <pgm_kicad.h>
-#include <kiway.h>
+/**
+ * @file kicad/files-io.cpp
+ */
+
+
+#include <wx/dir.h>
 #include <wx/fs_zip.h>
+#include <wx/wfstream.h>
 #include <wx/zipstrm.h>
-#include <wx/docview.h>
-#include <wx/wfstream.h>
-#include <wx/zstream.h>
-#include <wx/dir.h>
 
 #include <confirm.h>
-#include <gestfich.h>
-#include <macros.h>
-
-#include <kicad.h>
+#include <kiway.h>
+
+#include "pgm_kicad.h"
+
+#include "kicad.h"
+
 
 #define     ZipFileExtension    wxT( "zip" )
 #define     ZipFileWildcard     _( "Zip file (*.zip)|*.zip" )

=== modified file 'kicad/kicad.cpp'
--- kicad/kicad.cpp	2016-01-12 15:35:27 +0000
+++ kicad/kicad.cpp	2016-01-18 23:45:15 +0000
@@ -1,8 +1,3 @@
-/**
- * @file kicad.cpp
- * @brief Main KiCad Project manager file
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -27,19 +22,26 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
-#include <macros.h>
-#include <fctsys.h>
+/**
+ * @file kicad.cpp
+ * @brief Main KiCad Project manager file
+ */
+
+
+#include <wx/filename.h>
+#include <wx/log.h>
 #include <wx/stdpaths.h>
-#include <kicad.h>
+#include <wx/string.h>
+
+#include <common.h>
+#include <hotkeys_basic.h>
 #include <kiway.h>
-#include <pgm_kicad.h>
-#include <tree_project_frame.h>
+#include <richio.h>
 #include <wildcards_and_files_ext.h>
-#include <boost/ptr_container/ptr_vector.hpp>
-#include <hotkeys_basic.h>
-
-#include <build_version.h>
+
+#include "pgm_kicad.h"
+
+#include "kicad.h"
 
 
 /// Extend LIB_ENV_VAR list with the directory from which I came, prepending it.

=== modified file 'kicad/kicad.h'
--- kicad/kicad.h	2015-08-03 20:56:37 +0000
+++ kicad/kicad.h	2016-01-18 23:45:15 +0000
@@ -1,8 +1,3 @@
-/**
- * @file kicad/kicad.h
- * @brief KICAD_MANAGER_FRAME is the KiCad main frame.
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -27,19 +22,21 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+/**
+ * @file kicad/kicad.h
+ * @brief KICAD_MANAGER_FRAME is the KiCad main frame.
+ */
+
 #ifndef KICAD_H
 #define KICAD_H
 
-#include <vector>
 
-#include <wx/treectrl.h>
-#include <wx/dragimag.h>
-#include <wx/filename.h>
 #include <wx/process.h>
 
 #include <id.h>
 #include <wxstruct.h>
 
+
 #define KICAD_MANAGER_FRAME_NAME   wxT( "KicadFrame" )
 
 class LAUNCHER_PANEL;

=== modified file 'kicad/mainframe.cpp'
--- kicad/mainframe.cpp	2015-11-15 18:04:19 +0000
+++ kicad/mainframe.cpp	2016-01-18 23:45:15 +0000
@@ -1,8 +1,3 @@
-/**
- * @file kicad/mainframe.cpp
- * @brief KICAD_MANAGER_FRAME is the KiCad main frame.
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -28,21 +23,22 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <pgm_kicad.h>
+/**
+ * @file kicad/mainframe.cpp
+ * @brief KICAD_MANAGER_FRAME is the KiCad main frame.
+ */
+
+
+#include <dialog_hotkeys_editor.h>
+#include <gestfich.h>
 #include <kiway.h>
 #include <kiway_player.h>
-#include <confirm.h>
-#include <gestfich.h>
-#include <macros.h>
-
-#include <kicad.h>
-#include <tree_project_frame.h>
 #include <wildcards_and_files_ext.h>
-#include <menus_helpers.h>
-#include <dialog_hotkeys_editor.h>
-
-#include <wx/filefn.h>
+
+#include "pgm_kicad.h"
+#include "tree_project_frame.h"
+
+#include "kicad.h"
 
 
 #define TREE_FRAME_WIDTH_ENTRY     wxT( "LeftWinWidth" )
@@ -474,7 +470,6 @@
 void KICAD_MANAGER_FRAME::language_change( wxCommandEvent& event )
 {
     int id = event.GetId();
-
     Kiway.SetLanguage( id );
 }
 

=== modified file 'kicad/menubar.cpp'
--- kicad/menubar.cpp	2015-10-08 13:52:03 +0000
+++ kicad/menubar.cpp	2016-01-18 23:45:15 +0000
@@ -27,12 +27,15 @@
  * @file kicad/menubar.cpp
  * @brief (Re)Create the project manager menubar for KiCad
  */
-#include <fctsys.h>
-#include <pgm_kicad.h>
-#include <kicad.h>
+
+
+#include <bitmaps.h>
+#include <hotkeys_basic.h>
 #include <menus_helpers.h>
-#include <tree_project_frame.h>
-#include <hotkeys_basic.h>
+
+#include "kicad.h"
+#include "pgm_kicad.h"
+
 
 // Menubar and toolbar event table
 BEGIN_EVENT_TABLE( KICAD_MANAGER_FRAME, EDA_BASE_FRAME )

=== modified file 'kicad/pgm_kicad.h'
--- kicad/pgm_kicad.h	2014-04-16 09:26:41 +0000
+++ kicad/pgm_kicad.h	2016-01-18 23:45:15 +0000
@@ -1,5 +1,3 @@
-#ifndef PGM_KICAD_H_
-#define PGM_KICAD_H_
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -24,6 +22,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#ifndef PGM_KICAD_H_
+#define PGM_KICAD_H_
+
 
 #include <pgm_base.h>
 #include <bin_mod.h>

=== modified file 'kicad/preferences.cpp'
--- kicad/preferences.cpp	2014-10-27 09:32:24 +0000
+++ kicad/preferences.cpp	2016-01-18 23:45:15 +0000
@@ -27,14 +27,11 @@
  * @file preferences.cpp
  */
 
-#include <fctsys.h>
-#include <pgm_kicad.h>
+
 #include <confirm.h>
-#include <gestfich.h>
-
-#include <kicad.h>
-
-#include <wx/fontdlg.h>
+
+#include "kicad.h"
+#include "pgm_kicad.h"
 
 
 void KICAD_MANAGER_FRAME::OnUpdateDefaultPdfBrowser( wxUpdateUIEvent& event )
@@ -93,4 +90,3 @@
     Pgm().ForceSystemPdfBrowser( false );
     Pgm().WritePdfBrowserInfos();
 }
-

=== modified file 'kicad/prjconfig.cpp'
--- kicad/prjconfig.cpp	2015-09-25 19:38:09 +0000
+++ kicad/prjconfig.cpp	2016-01-18 23:45:15 +0000
@@ -1,8 +1,3 @@
-/**
- * @file prjconfig.cpp
- * Load and save project configuration files (*.pro)
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -27,28 +22,30 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <pgm_kicad.h>
+/**
+ * @file prjconfig.cpp
+ * Load and save project configuration files (*.pro)
+ */
+
+
+#include <wx/dir.h>
+#include <wx/filename.h>
+#include <wx/stdpaths.h>
+
+#include <build_version.h>
+#include <config_params.h>
+#include <confirm.h>
 #include <kiway.h>
 #include <project.h>
-#include <confirm.h>
-#include <gestfich.h>
-#include <kicad.h>
-#include <config_params.h>
-#include <project_template.h>
-#include <tree_project_frame.h>
 #include <wildcards_and_files_ext.h>
-#include <vector>
-#include <build_version.h>
-#include <macros.h>
-#include <common.h>
-
-#include <wx/dir.h>
-#include <wx/filename.h>
-#include <wx/stdpaths.h>
 
 #include "dialogs/dialog_template_selector.h"
 
+#include "kicad.h"
+#include "pgm_kicad.h"
+#include "tree_project_frame.h"
+
+
 #define SEP()   wxFileName::GetPathSeparator()
 
 // Not really useful, provided to save/restore params in project config file,

=== modified file 'kicad/project_template.cpp'
--- kicad/project_template.cpp	2014-09-07 16:56:55 +0000
+++ kicad/project_template.cpp	2016-01-18 23:45:15 +0000
@@ -22,18 +22,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include "project_template.h"
-
-#include <vector>
-
-#include <wx/wx.h>
-#include <wx/arrstr.h>
+
+#include <wx/bitmap.h>
 #include <wx/dir.h>
-#include <wx/filename.h>
 #include <wx/txtstrm.h>
 #include <wx/wfstream.h>
 
-#include <macros.h>
+#include "project_template.h"
 
 
 #define SEP()   wxFileName::GetPathSeparator()

=== modified file 'kicad/project_template.h'
--- kicad/project_template.h	2014-09-06 19:55:20 +0000
+++ kicad/project_template.h	2016-01-18 23:45:15 +0000
@@ -104,11 +104,14 @@
 #ifndef PROJECT_TEMPLATE_H
 #define PROJECT_TEMPLATE_H
 
+
 #include <vector>
 
-#include <wx/wx.h>
-#include <wx/image.h>
 #include <wx/filename.h>
+#include <wx/intl.h>
+
+
+class wxBitmap;
 
 /**
  * @brief A directory which contains information about the project template and does not get

=== modified file 'kicad/tree_project_frame.cpp'
--- kicad/tree_project_frame.cpp	2015-09-25 19:38:09 +0000
+++ kicad/tree_project_frame.cpp	2016-01-18 23:45:15 +0000
@@ -1,8 +1,3 @@
-/**
- * @file tree_project_frame.cpp
- * @brief Function to build the tree of files in the current project directory
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -28,23 +23,28 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <confirm.h>
-#include <gestfich.h>
-#include <pgm_base.h>
-#include <macros.h>
-
-#include <tree_project_frame.h>
-#include <class_treeprojectfiles.h>
-#include <class_treeproject_item.h>
-#include <wildcards_and_files_ext.h>
+/**
+ * @file tree_project_frame.cpp
+ * @brief Function to build the tree of files in the current project directory
+ */
+
+
+#include <stack>
 
 #include <wx/regex.h>
-#include <wx/dir.h>
-#include <wx/imaglist.h>
 #include <wx/stdpaths.h>
+#include <wx/string.h>
+
+#include <bitmaps.h>
+#include <gestfich.h>
 #include <menus_helpers.h>
-#include <stack>
+#include <wildcards_and_files_ext.h>
+
+#include "class_treeproject_item.h"
+#include "class_treeprojectfiles.h"
+#include "pgm_kicad.h"
+
+#include "tree_project_frame.h"
 
 
 /* Note about the tree project build process:

=== modified file 'kicad/tree_project_frame.h'
--- kicad/tree_project_frame.h	2015-07-29 18:06:45 +0000
+++ kicad/tree_project_frame.h	2016-01-18 23:45:15 +0000
@@ -1,7 +1,3 @@
-/**
- * @file tree_project_frame.h
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -26,14 +22,24 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+/**
+ * @file tree_project_frame.h
+ */
+
+
 #ifndef TREEPRJ_FRAME_H
 #define TREEPRJ_FRAME_H
 
-#include <kicad.h>
 #include <wx/fswatcher.h>
-
-
+#include <wx/laywin.h>
+#include <wx/treebase.h>
+
+#include "kicad.h"
+
+
+class KICAD_MANAGER_FRAME;
 class TREEPROJECT_ITEM;
+class TREEPROJECTFILES;
 
 /** class TREE_PROJECT_FRAME
  * Window to display the tree files