diff --git a/3d-viewer/3d_canvas.cpp b/3d-viewer/3d_canvas.cpp
index fa03cf8d45..dc8299dca6 100644
--- a/3d-viewer/3d_canvas.cpp
+++ b/3d-viewer/3d_canvas.cpp
@@ -22,8 +22,8 @@
 #include "wx/clipbrd.h"
 
 #include "fctsys.h"
-#include "common.h"
 #include "id.h"
+#include "gestfich.h"
 
 #include "3d_viewer.h"
 #include "trackball.h"
diff --git a/3d-viewer/3d_class.cpp b/3d-viewer/3d_class.cpp
index b826d7e711..e3aa0ff0ac 100644
--- a/3d-viewer/3d_class.cpp
+++ b/3d-viewer/3d_class.cpp
@@ -11,8 +11,6 @@
 
 #include "fctsys.h"
 
-#include "common.h"
-
 #include "3d_struct.h"
 #include "3d_viewer.h"
 
diff --git a/3d-viewer/3d_draw.cpp b/3d-viewer/3d_draw.cpp
index 2c4d863a41..71d5fd5d18 100644
--- a/3d-viewer/3d_draw.cpp
+++ b/3d-viewer/3d_draw.cpp
@@ -17,9 +17,10 @@
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
 #endif
 
-#include "common.h"
 #include "pcbstruct.h"
 #include "macros.h"
+#include "drawtxt.h"
+#include "confirm.h"
 
 #include "3d_viewer.h"
 #include "trackball.h"
@@ -460,7 +461,8 @@ static void Draw3dTextSegm( int x0, int y0, int xf, int yf )
     double endx   = xf * g_Parm_3D_Visu.m_BoardScale;
     double endy   = yf * g_Parm_3D_Visu.m_BoardScale;
 
-    Draw3D_FilledSegment( startx, -starty, endx, -endy, s_Text3DWidth, s_Text3DZPos );
+    Draw3D_FilledSegment( startx, -starty, endx, -endy,
+                          s_Text3DWidth, s_Text3DZPos );
 }
 
 
@@ -480,11 +482,9 @@ void Pcb3D_GLCanvas::Draw3D_DrawText( TEXTE_PCB* text )
     s_Text3DZPos  = g_Parm_3D_Visu.m_LayerZcoord[layer];
     s_Text3DWidth = text->m_Width * g_Parm_3D_Visu.m_BoardScale;
     glNormal3f( 0.0, 0.0, Get3DLayerSide( layer ) );
-    DrawGraphicText( NULL, NULL,
-                     text->m_Pos, (EDA_Colors) color, text->m_Text,
-                     text->m_Orient, text->m_Size,
-                     text->m_HJustify,
-                     text->m_VJustify,
+    DrawGraphicText( NULL, NULL, text->m_Pos, (EDA_Colors) color,
+                     text->m_Text, text->m_Orient, text->m_Size,
+                     text->m_HJustify, text->m_VJustify,
                      text->m_Width, text->m_Italic,
                      Draw3dTextSegm );
 }
@@ -668,7 +668,8 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
     if( holeX && holeY )
     {
         SetGLColor( DARKGRAY );
-        Draw3D_FilledCylinder( drillx, -drilly, hole, g_Parm_3D_Visu.m_LayerZcoord[CMP_N], 0.0 );
+        Draw3D_FilledCylinder( drillx, -drilly, hole,
+                               g_Parm_3D_Visu.m_LayerZcoord[CMP_N], 0.0 );
     }
 
     glNormal3f( 0.0, 0.0, 1.0 ); // Normal is Z axis
diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp
index a2e02faabe..4152f96478 100644
--- a/3d-viewer/3d_frame.cpp
+++ b/3d-viewer/3d_frame.cpp
@@ -11,8 +11,7 @@
 
 
 #include "fctsys.h"
-
-#include <wx/colordlg.h>
+#include "appl_wxstruct.h"
 
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
@@ -25,6 +24,8 @@
 #include "3d_viewer.h"
 #include "trackball.h"
 
+#include <wx/colordlg.h>
+
 
 BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame )
     EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom )
diff --git a/3d-viewer/3d_read_mesh.cpp b/3d-viewer/3d_read_mesh.cpp
index bddf9c0af2..7cbccbd3fe 100644
--- a/3d-viewer/3d_read_mesh.cpp
+++ b/3d-viewer/3d_read_mesh.cpp
@@ -10,10 +10,9 @@
 #endif
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "macros.h"
-
+#include "kicad_string.h"
 
 #include "3d_struct.h"
 #include "3d_viewer.h"
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 84a6001692..f0ef9ae9ac 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,14 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2009-Feb-04 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
+================================================================================
+++All
+  * Refactor header files to reduce the number of files that need recompiled
+    when making changes to base classes.
+  * Move sine and cosine look up tables from trigo.h to trigo.cpp to avoid
+    multiple recompiles.
+
 2009-feb-01 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================
 ++All:
diff --git a/CMakeModules/FindSubversion.cmake b/CMakeModules/FindSubversion.cmake
index 65858fa56e..31f20c29dd 100644
--- a/CMakeModules/FindSubversion.cmake
+++ b/CMakeModules/FindSubversion.cmake
@@ -85,7 +85,7 @@ IF(Subversion_SVN_EXECUTABLE)
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     IF(NOT ${Subversion_svn_info_result} EQUAL 0)
-      MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}")
+      MESSAGE(STATUS "Command \"${Subversion_SVN_EXECUTABLE} info ${dir}\" failed with output:\n${Subversion_svn_info_error}")
     ELSE(NOT ${Subversion_svn_info_result} EQUAL 0)
 
       STRING(REGEX REPLACE "^(.*\n)?svn, version ([.0-9]+).*"
@@ -121,7 +121,7 @@ IF(Subversion_SVN_EXECUTABLE)
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     IF(NOT ${Subversion_svn_log_result} EQUAL 0)
-      MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
+      MESSAGE(STATUS "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")
     ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)
   ENDMACRO(Subversion_WC_LOG)
 
diff --git a/common/about_kicad.cpp b/common/about_kicad.cpp
index e1732a8d90..719d1e9d34 100644
--- a/common/about_kicad.cpp
+++ b/common/about_kicad.cpp
@@ -9,8 +9,7 @@
 extern wxString g_Main_Title; // Import program title
 
 /**********************************/
-wxString
-SetMsg( const wxString& msg )
+wxString SetMsg( const wxString& msg )
 /**********************************/
 /* add \n at the beginning of msg under Windows, and do nothing under other version of wxWidgets
  * Needed under wxWidgets 2.8 because wxGTK and wxMSW do not have the same behavior
@@ -30,8 +29,7 @@ SetMsg( const wxString& msg )
 
 
 /**************************************************/
-void
-InitKiCadAbout( wxAboutDialogInfo& info )
+void InitKiCadAbout( wxAboutDialogInfo& info )
 /**************************************************/
 {
 	/* Set name and title */
diff --git a/common/base_screen.cpp b/common/base_screen.cpp
index f4ee4a61f3..f3342b9ab5 100644
--- a/common/base_screen.cpp
+++ b/common/base_screen.cpp
@@ -8,8 +8,9 @@
 
 #include "fctsys.h"
 #include "common.h"
-
+#include "base_struct.h"
 #include "sch_item_struct.h"
+#include "class_base_screen.h"
 
 /* Implement wxSize array for grid list implementation. */
 #include <wx/arrimpl.cpp>
diff --git a/common/base_struct.cpp b/common/base_struct.cpp
index 98e8928b84..387230788a 100644
--- a/common/base_struct.cpp
+++ b/common/base_struct.cpp
@@ -10,10 +10,13 @@
 #include "gr_basic.h"
 #include "trigo.h"
 #include "common.h"
-#include "wxstruct.h"
-#include "base_struct.h"
 #include "grfonte.h"
 #include "macros.h"
+#include "wxstruct.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "drawtxt.h"
+
 
 enum textbox {
     ID_TEXTBOX_LIST = 8010
diff --git a/common/basicframe.cpp b/common/basicframe.cpp
index 019a50d678..bf509ed12d 100644
--- a/common/basicframe.cpp
+++ b/common/basicframe.cpp
@@ -10,12 +10,16 @@
 #include <wx/aboutdlg.h>
 #include "wx/statline.h"
 #include "wx/generic/aboutdlgg.h"
+#include <wx/fontdlg.h>
 
 #include "fctsys.h"
-#include <wx/fontdlg.h>
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "online_help.h"
 #include "id.h"
+#include "confirm.h"
+#include "eda_doc.h"
+#include "wxstruct.h"
 
 
 /*******************************************************/
diff --git a/common/block_commande.cpp b/common/block_commande.cpp
index 79d479584b..00c8987315 100644
--- a/common/block_commande.cpp
+++ b/common/block_commande.cpp
@@ -9,8 +9,13 @@
 #include "gr_basic.h"
 #include "wxstruct.h"
 #include "common.h"
-#include "sch_item_struct.h"
 #include "macros.h"
+#include "base_struct.h"
+#include "sch_item_struct.h"
+#include "class_base_screen.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "block_commande.h"
 
 
 /*******************/
diff --git a/common/class_drawpickedstruct.cpp b/common/class_drawpickedstruct.cpp
index 1057733d57..a55426bfa4 100644
--- a/common/class_drawpickedstruct.cpp
+++ b/common/class_drawpickedstruct.cpp
@@ -4,6 +4,7 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "base_struct.h"
 #include "sch_item_struct.h"
 
 
diff --git a/common/common.cpp b/common/common.cpp
index 79cedf866b..6952f89707 100644
--- a/common/common.cpp
+++ b/common/common.cpp
@@ -12,6 +12,7 @@
 #include "common.h"
 #include "macros.h"
 #include "build_version.h"
+#include "confirm.h"
 #include <wx/process.h>
 
 /*****************************/
diff --git a/common/common_plotGERBER_functions.cpp b/common/common_plotGERBER_functions.cpp
index d1129dc059..5bc309ffe3 100644
--- a/common/common_plotGERBER_functions.cpp
+++ b/common/common_plotGERBER_functions.cpp
@@ -10,6 +10,7 @@
 #include "common.h"
 #include "plot_common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 
 /***************************************************************************/
diff --git a/common/common_plotHPGL_functions.cpp b/common/common_plotHPGL_functions.cpp
index cc4da80259..2007c350b2 100644
--- a/common/common_plotHPGL_functions.cpp
+++ b/common/common_plotHPGL_functions.cpp
@@ -7,9 +7,9 @@
 #include "trigo.h"
 #include "wxstruct.h"
 #include "base_struct.h"
-#include "common.h"
 #include "plot_common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 /* parametre HPGL pour trace de cercle: */
 #define CHORD_ANGLE 10
diff --git a/common/common_plotPS_functions.cpp b/common/common_plotPS_functions.cpp
index b19645828f..aed18dc49a 100644
--- a/common/common_plotPS_functions.cpp
+++ b/common/common_plotPS_functions.cpp
@@ -9,6 +9,7 @@
 #include "common.h"
 #include "plot_common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 // Locales
 static Ki_PageDescr* SheetPS;
diff --git a/common/common_plot_functions.cpp b/common/common_plot_functions.cpp
index 7808a0761f..bfdf9d8f0f 100644
--- a/common/common_plot_functions.cpp
+++ b/common/common_plot_functions.cpp
@@ -11,6 +11,8 @@
 #include "plot_common.h"
 #include "worksheet.h"
 #include "macros.h"
+#include "class_base_screen.h"
+#include "drawtxt.h"
 
 
 // Variables partagees avec Common plot Postscript et HPLG Routines
diff --git a/common/copy_to_clipboard.cpp b/common/copy_to_clipboard.cpp
index 02a2a7c29d..130e1c0cf0 100644
--- a/common/copy_to_clipboard.cpp
+++ b/common/copy_to_clipboard.cpp
@@ -5,12 +5,17 @@
 // Created:     18 aug 2006
 // Licence:   License GNU
 /////////////////////////////////////////////////////////////////////////////
+
 #include "wx/metafile.h"
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "id.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "confirm.h"
+#include "wxstruct.h"
+
 
 extern BASE_SCREEN* ActiveScreen;
 
diff --git a/common/displlst.cpp b/common/displlst.cpp
index bb6462d904..19b1dc6395 100644
--- a/common/displlst.cpp
+++ b/common/displlst.cpp
@@ -3,11 +3,11 @@
 /********************************/
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 
 /***********************/
diff --git a/common/drawframe.cpp b/common/drawframe.cpp
index 94a2eddcf1..92a4f2135b 100644
--- a/common/drawframe.cpp
+++ b/common/drawframe.cpp
@@ -7,11 +7,16 @@
 #endif
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
 #include "bitmaps.h"
 #include "macros.h"
 #include "id.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "wxstruct.h"
+#include "confirm.h"
 
 #include <wx/fontdlg.h>
 
diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp
index 9b2e2f16e6..50844aabfa 100644
--- a/common/drawpanel.cpp
+++ b/common/drawpanel.cpp
@@ -1,12 +1,17 @@
 /******************************************/
 /* drawpanel.cpp - WinEDA_DrawPanel class */
 /******************************************/
+
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
-
 #include "macros.h"
 #include "id.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "wxstruct.h"
+
 
 // Local defines
 #define CURSOR_SIZE 12           // Cursor size in pixels
diff --git a/common/drawtxt.cpp b/common/drawtxt.cpp
index 0e247e98bb..2889503603 100644
--- a/common/drawtxt.cpp
+++ b/common/drawtxt.cpp
@@ -10,6 +10,8 @@
 
 #include "trigo.h"
 #include "macros.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
 
 #ifndef DEFAULT_SIZE_TEXT
 #define DEFAULT_SIZE_TEXT 50
diff --git a/common/eda_doc.cpp b/common/eda_doc.cpp
index c6f9f089d2..57c2f047fb 100644
--- a/common/eda_doc.cpp
+++ b/common/eda_doc.cpp
@@ -2,24 +2,16 @@
 /* eda_doc.cpp */
 /***************/
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
+#include "fctsys.h"
+#include "appl_wxstruct.h"
+#include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-// for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
-#ifndef WX_PRECOMP
-#include <wx/wx.h>
-#endif
 #include <wx/mimetype.h>
 #include <wx/tokenzr.h>
+#include <wx/filename.h>
 
-#include "fctsys.h"
-#include "wxstruct.h"
-#include "common.h"
 
 /*****************************************/
 void WinEDA_App::ReadPdfBrowserInfos()
diff --git a/common/edaappl.cpp b/common/edaappl.cpp
index c92975b68d..99445ea213 100644
--- a/common/edaappl.cpp
+++ b/common/edaappl.cpp
@@ -22,7 +22,9 @@
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
 #include <wx/apptrait.h>
+#include <wx/snglinst.h>
 
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "worksheet.h"
 #include "id.h"
@@ -31,6 +33,7 @@
 #include "macros.h"
 #include "online_help.h"
 #include "bitmaps.h"
+#include "gestfich.h"
 
 
 #ifdef __UNIX__
diff --git a/common/gestfich.cpp b/common/gestfich.cpp
index f00a5e1ef6..41acbdb1d2 100644
--- a/common/gestfich.cpp
+++ b/common/gestfich.cpp
@@ -5,8 +5,8 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "fctsys.h"
-
-#include "wx/mimetype.h"
+#include "appl_wxstruct.h"
+#include "confirm.h"
 
 #ifdef  __WINDOWS__
 #ifndef _MSC_VER
@@ -16,6 +16,11 @@
 
 #include "common.h"
 #include "macros.h"
+#include "gestfich.h"
+
+#include "wx/mimetype.h"
+#include "wx/filename.h"
+
 
 /* List of default paths used to locate help files and kicad library files.
  *
diff --git a/common/get_component_dialog.cpp b/common/get_component_dialog.cpp
index 47636748de..7d455fbac0 100644
--- a/common/get_component_dialog.cpp
+++ b/common/get_component_dialog.cpp
@@ -4,9 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "macros.h"
+#include "wxstruct.h"
+
 
 /****************************************************************************/
 /* Show a dialog frame to choose a name from an history list, or a new name */
diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp
index 5bf9d3506f..f8d25a1ba5 100644
--- a/common/gr_basic.cpp
+++ b/common/gr_basic.cpp
@@ -8,6 +8,8 @@
 #include "common.h"
 #include "trigo.h"
 #include "macros.h"
+#include "base_struct.h"
+#include "class_base_screen.h"
 
 #ifndef FILLED
 #define FILLED 1
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index f3ff839178..d6a96bb749 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -6,12 +6,16 @@
  */
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
-#include "wxstruct.h"
 #include "hotkeys_basic.h"
 #include "macros.h"
 #include "bitmaps.h"
 #include "id.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+#include "wxstruct.h"
 
 
 /* Class to handle hotkey commnands. hotkeys have a default value
diff --git a/common/msgpanel.cpp b/common/msgpanel.cpp
index 8f1b70c93e..ab5cdcefbb 100644
--- a/common/msgpanel.cpp
+++ b/common/msgpanel.cpp
@@ -7,13 +7,14 @@
 #endif
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
+#include "colors.h"
+
 
 /* table des evenements captes par un WinEDA_MsgPanel */
 BEGIN_EVENT_TABLE( WinEDA_MsgPanel, wxPanel )
-EVT_PAINT( WinEDA_MsgPanel::OnPaint )
+    EVT_PAINT( WinEDA_MsgPanel::OnPaint )
 END_EVENT_TABLE()
 
 
diff --git a/common/projet_config.cpp b/common/projet_config.cpp
index 7a68f48876..9ba39a435e 100644
--- a/common/projet_config.cpp
+++ b/common/projet_config.cpp
@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 
 #define CONFIG_VERSION 1
 
diff --git a/common/string.cpp b/common/string.cpp
index 70bb09860a..5ecf9a147e 100644
--- a/common/string.cpp
+++ b/common/string.cpp
@@ -5,8 +5,8 @@
 
 #include "fctsys.h"
 #include <time.h>
-#include "common.h"
 #include "macros.h"
+#include "kicad_string.h"
 
 
 /*********************************************************************/
diff --git a/common/toolbars.cpp b/common/toolbars.cpp
index 7cabbd3e7a..c9e14d6163 100644
--- a/common/toolbars.cpp
+++ b/common/toolbars.cpp
@@ -1,36 +1,31 @@
-	/******************************************************************/
-	/* toolbars.cpp - fonctions des classes du type WinEDA_ttolbar */
-	/******************************************************************/
+/******************************************************************/
+/* toolbars.cpp - fonctions des classes du type WinEDA_ttolbar */
+/******************************************************************/
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "fctsys.h"
-#include "common.h"
+#include "wxstruct.h"
 
+/*************************/
+/* class WinEDA_HToolbar */
+/*************************/
 
-#include "id.h"
-
-	/*************************/
-	/* class WinEDA_HToolbar */
-	/*************************/
-
-WinEDA_Toolbar::WinEDA_Toolbar(id_toolbar type, wxWindow * parent,
-				wxWindowID id, bool horizontal):
-			wxToolBar(parent,id, wxPoint(-1,-1), wxSize(-1,-1),
-						horizontal ? wxTB_HORIZONTAL : wxTB_VERTICAL)
+WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent,
+                                wxWindowID id, bool horizontal ):
+    wxToolBar( parent, id, wxPoint( -1,-1 ), wxSize( -1,-1 ),
+               horizontal ? wxTB_HORIZONTAL : wxTB_VERTICAL )
 {
-	m_Parent = parent;
-	Pnext = NULL;
-	m_Ident = type;
-	m_Horizontal = horizontal;
-	m_Size = 24;
+    m_Parent = parent;
+    Pnext = NULL;
+    m_Ident = type;
+    m_Horizontal = horizontal;
+    m_Size = 24;
 
-	SetToolBitmapSize(wxSize(16,16));
-	SetMargins(0,0);
-	SetToolSeparation(1);
-	SetToolPacking(1);
+    SetToolBitmapSize(wxSize(16,16));
+    SetMargins(0,0);
+    SetToolSeparation(1);
+    SetToolPacking(1);
 }
-
-
diff --git a/common/trigo.cpp b/common/trigo.cpp
index f02519b913..c36b4c7c3f 100644
--- a/common/trigo.cpp
+++ b/common/trigo.cpp
@@ -8,8 +8,6 @@
 #include "trigo.h"
 
 
-
-
 /************************************************************************/
 bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY )
 /************************************************************************/
@@ -36,16 +34,21 @@ bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY )
     int pointX, pointY; /* coord point a tester dans repere modifie dans lequel
                          * segX et segY sont >=0 */
 
-    segX = dx; segY = dy; pointX = spot_cX; pointY = spot_cY;
+    segX   = dx;
+    segY   = dy;
+    pointX = spot_cX;
+    pointY = spot_cY;
 
     /*Recalcul coord pour que le segment soit dans 1er quadrant (coord >= 0)*/
     if( segX < 0 )   /* mise en >0 par symetrie par rapport a l'axe Y */
     {
-        segX = -segX; pointX = -pointX;
+        segX   = -segX;
+        pointX = -pointX;
     }
     if( segY < 0 )   /* mise en > 0 par symetrie par rapport a l'axe X */
     {
-        segY = -segY; pointY = -pointY;
+        segY   = -segY;
+        pointY = -pointY;
     }
 
 
@@ -63,8 +66,7 @@ bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY )
             }
             if( (pointX > segX) && ( pointX <= (segX + seuil) ) )
             {
-                if( ( ( (pointX - segX) * (pointX - segX) ) + (pointY * pointY) ) <=
-                   (seuil * seuil) )
+                if( ( ( (pointX - segX) * (pointX - segX) ) + (pointY * pointY) ) <= (seuil * seuil) )
                     return true;
             }
         }
@@ -82,8 +84,7 @@ bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY )
             }
             if( (pointY > segY) && ( pointY <= (segY + seuil) ) )
             {
-                if( ( ( (pointY - segY) * (pointY - segY) ) + (pointX * pointX) ) <=
-                   (seuil * seuil) )
+                if( ( ( (pointY - segY) * (pointY - segY) ) + (pointX * pointX) ) <= (seuil * seuil) )
                     return true;
             }
         }
@@ -108,7 +109,9 @@ bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY )
          *  et est en fait 1,414 plus grand , et dy45 = 0 */
 
         // seuil doit etre * .707 pour tenir compte du coeff de reduction sur dx,dy
-        seuil *= 7; seuil /= 10;
+        seuil *= 7;
+        seuil /= 10;
+
         if( abs( cYrot ) <= seuil ) /* ok sur axe vertical) */
         {
             if( (cXrot >= 0) && (cXrot <= segX) )
@@ -133,8 +136,9 @@ bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY )
          * de piste soit horizontal dans le nouveau repere */
         int angle;
 
-        angle = (int) ( atan2( (double) segY, (double) segX ) * 1800 / M_PI);
-        cXrot = pointX; cYrot = pointY;
+        angle = (int) ( atan2( (double) segY, (double) segX ) * 1800 / M_PI );
+        cXrot = pointX;
+        cYrot = pointY;
 
         RotatePoint( &cXrot, &cYrot, angle );   /* Rotation du point a tester */
         RotatePoint( &segX, &segY, angle );     /* Rotation du segment */
@@ -164,7 +168,6 @@ bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY )
 }
 
 
-
 /***********************************/
 int ArcTangente( int dy, int dx )
 /***********************************/
@@ -225,7 +228,7 @@ void RotatePoint( int* pX, int* pY, int angle )
  */
 {
     double fpx, fpy;
-    int   tmp;
+    int    tmp;
 
     while( angle < 0 )
         angle += 3600;
@@ -259,7 +262,7 @@ void RotatePoint( int* pX, int* pY, int angle )
     }
     else
     {
-        fpx = (*pY * fsinus[angle])   + (*pX * fcosinus[angle]);
+        fpx = (*pY * fsinus[angle]) + (*pX * fcosinus[angle]);
         fpy = (*pY * fcosinus[angle]) - (*pX * fsinus[angle]);
 
         *pX = (int) round( fpx );
@@ -332,7 +335,6 @@ void RotatePoint( wxPoint* point, const wxPoint& centre, int angle )
 }
 
 
-
 /*************************************************************************/
 void RotatePoint( double* pX, double* pY, double cx, double cy, int angle )
 /*************************************************************************/
@@ -388,7 +390,7 @@ void RotatePoint( double* pX, double* pY, int angle )
     }
     else
     {
-        double fpx = (*pY * fsinus[angle])   + (*pX * fcosinus[angle]);
+        double fpx = (*pY * fsinus[angle]) + (*pX * fcosinus[angle]);
         double fpy = (*pY * fcosinus[angle]) - (*pX * fsinus[angle]);
 
         *pX = fpx;
@@ -397,3 +399,1452 @@ void RotatePoint( double* pX, double* pY, int angle )
 }
 
 
+float fsinus[3600] =
+{
+    0.0000000000,  0.0017453284,  0.0034906514,   0.0052359638,
+    0.0069812603,  0.0087265355,  0.0104717841,   0.0122170008,  0.0139621803,
+    0.0157073173,  0.0174524064,  0.0191974424,   0.0209424199,  0.0226873336,
+    0.0244321782,  0.0261769483,  0.0279216387,   0.0296662441,  0.0314107591,
+    0.0331551784,  0.0348994967,  0.0366437087,   0.0383878091,  0.0401317925,
+    0.0418756537,  0.0436193874,  0.0453629881,   0.0471064507,  0.0488497698,
+    0.0505929401,  0.0523359562,  0.0540788130,   0.0558215050,  0.0575640270,
+    0.0593063736,  0.0610485395,  0.0627905195,   0.0645323083,  0.0662739004,
+    0.0680152907,  0.0697564737,  0.0714974443,   0.0732381971,  0.0749787268,
+    0.0767190281,  0.0784590957,  0.0801989243,   0.0819385086,  0.0836778433,
+    0.0854169231,  0.0871557427,  0.0888942969,   0.0906325802,  0.0923705874,
+    0.0941083133,  0.0958457525,  0.0975828998,   0.0993197497,  0.1010562972,
+    0.1027925368,  0.1045284633,  0.1062640713,   0.1079993557,  0.1097343111,
+    0.1114689322,  0.1132032138,  0.1149371505,   0.1166707371,  0.1184039683,
+    0.1201368388,  0.1218693434,  0.1236014767,   0.1253332336,  0.1270646086,
+    0.1287955966,  0.1305261922,  0.1322563903,   0.1339861854,  0.1357155724,
+    0.1374445460,  0.1391731010,  0.1409012319,   0.1426289337,  0.1443562010,
+    0.1460830286,  0.1478094111,  0.1495353434,   0.1512608202,  0.1529858363,
+    0.1547103863,  0.1564344650,  0.1581580673,   0.1598811877,  0.1616038211,
+    0.1633259622,  0.1650476059,  0.1667687467,   0.1684893796,  0.1702094992,
+    0.1719291003,  0.1736481777,  0.1753667261,   0.1770847403,  0.1788022151,
+    0.1805191453,  0.1822355255,  0.1839513506,   0.1856666154,  0.1873813146,
+    0.1890954430,  0.1908089954,  0.1925219665,   0.1942343512,  0.1959461442,
+    0.1976573404,  0.1993679344,  0.2010779211,   0.2027872954,  0.2044960518,
+    0.2062041854,  0.2079116908,  0.2096185629,   0.2113247965,  0.2130303863,
+    0.2147353272,  0.2164396139,  0.2181432414,   0.2198462044,  0.2215484976,
+    0.2232501160,  0.2249510543,  0.2266513074,   0.2283508701,  0.2300497372,
+    0.2317479035,  0.2334453639,  0.2351421131,   0.2368381461,  0.2385334576,
+    0.2402280425,  0.2419218956,  0.2436150118,   0.2453073859,  0.2469990127,
+    0.2486898872,  0.2503800041,  0.2520693582,   0.2537579446,  0.2554457579,
+    0.2571327932,  0.2588190451,  0.2605045086,   0.2621891786,  0.2638730500,
+    0.2655561175,  0.2672383761,  0.2689198206,   0.2706004460,  0.2722802470,
+    0.2739592187,  0.2756373558,  0.2773146533,   0.2789911060,  0.2806667089,
+    0.2823414568,  0.2840153447,  0.2856883674,   0.2873605198,  0.2890317969,
+    0.2907021936,  0.2923717047,  0.2940403252,   0.2957080500,  0.2973748741,
+    0.2990407923,  0.3007057995,  0.3023698908,   0.3040330609,  0.3056953050,
+    0.3073566178,  0.3090169944,  0.3106764296,   0.3123349185,  0.3139924560,
+    0.3156490369,  0.3173046564,  0.3189593093,   0.3206129906,  0.3222656952,
+    0.3239174182,  0.3255681545,  0.3272178990,   0.3288666467,  0.3305143927,
+    0.3321611319,  0.3338068592,  0.3354515698,   0.3370952584,  0.3387379202,
+    0.3403795502,  0.3420201433,  0.3436596946,   0.3452981990,  0.3469356516,
+    0.3485720473,  0.3502073813,  0.3518416484,   0.3534748438,  0.3551069624,
+    0.3567379993,  0.3583679495,  0.3599968081,   0.3616245701,  0.3632512305,
+    0.3648767843,  0.3665012267,  0.3681245527,   0.3697467573,  0.3713678356,
+    0.3729877826,  0.3746065934,  0.3762242631,   0.3778407868,  0.3794561595,
+    0.3810703764,  0.3826834324,  0.3842953227,   0.3859060423,  0.3875155865,
+    0.3891239501,  0.3907311285,  0.3923371166,   0.3939419096,  0.3955455026,
+    0.3971478906,  0.3987490689,  0.4003490326,   0.4019477767,  0.4035452964,
+    0.4051415868,  0.4067366431,  0.4083304604,   0.4099230338,  0.4115143586,
+    0.4131044298,  0.4146932427,  0.4162807923,   0.4178670738,  0.4194520824,
+    0.4210358134,  0.4226182617,  0.4241994227,   0.4257792916,  0.4273578634,
+    0.4289351334,  0.4305110968,  0.4320857488,   0.4336590846,  0.4352310994,
+    0.4368017884,  0.4383711468,  0.4399391699,   0.4415058528,  0.4430711908,
+    0.4446351792,  0.4461978131,  0.4477590878,   0.4493189986,  0.4508775407,
+    0.4524347093,  0.4539904997,  0.4555449072,   0.4570979271,  0.4586495545,
+    0.4601997848,  0.4617486132,  0.4632960351,   0.4648420457,  0.4663866403,
+    0.4679298143,  0.4694715628,  0.4710118812,   0.4725507649,  0.4740882090,
+    0.4756242091,  0.4771587603,  0.4786918579,   0.4802234974,  0.4817536741,
+    0.4832823833,  0.4848096202,  0.4863353804,   0.4878596591,  0.4893824517,
+    0.4909037536,  0.4924235601,  0.4939418666,   0.4954586684,  0.4969739610,
+    0.4984877398,  0.5000000000,  0.5015107372,   0.5030199466,  0.5045276238,
+    0.5060337641,  0.5075383630,  0.5090414158,   0.5105429179,  0.5120428649,
+    0.5135412521,  0.5150380749,  0.5165333289,   0.5180270094,  0.5195191119,
+    0.5210096318,  0.5224985647,  0.5239859060,   0.5254716511,  0.5269557955,
+    0.5284383347,  0.5299192642,  0.5313985795,   0.5328762761,  0.5343523494,
+    0.5358267950,  0.5372996083,  0.5387707850,   0.5402403205,  0.5417082103,
+    0.5431744500,  0.5446390350,  0.5461019610,   0.5475632235,  0.5490228180,
+    0.5504807401,  0.5519369853,  0.5533915492,   0.5548444274,  0.5562956155,
+    0.5577451090,  0.5591929035,  0.5606389946,   0.5620833779,  0.5635260489,
+    0.5649670034,  0.5664062369,  0.5678437451,   0.5692795234,  0.5707135677,
+    0.5721458734,  0.5735764364,  0.5750052520,   0.5764323162,  0.5778576244,
+    0.5792811723,  0.5807029557,  0.5821229702,   0.5835412114,  0.5849576750,
+    0.5863723567,  0.5877852523,  0.5891963574,   0.5906056676,  0.5920131788,
+    0.5934188866,  0.5948227868,  0.5962248750,   0.5976251470,  0.5990235985,
+    0.6004202253,  0.6018150232,  0.6032079877,   0.6045991149,  0.6059884003,
+    0.6073758397,  0.6087614290,  0.6101451639,   0.6115270402,  0.6129070537,
+    0.6142852001,  0.6156614753,  0.6170358751,   0.6184083954,  0.6197790318,
+    0.6211477803,  0.6225146366,  0.6238795967,   0.6252426563,  0.6266038114,
+    0.6279630576,  0.6293203910,  0.6306758074,   0.6320293027,  0.6333808726,
+    0.6347305132,  0.6360782203,  0.6374239897,   0.6387678175,  0.6401096995,
+    0.6414496316,  0.6427876097,  0.6441236298,   0.6454576877,  0.6467897795,
+    0.6481199011,  0.6494480483,  0.6507742173,   0.6520984038,  0.6534206040,
+    0.6547408137,  0.6560590290,  0.6573752458,   0.6586894601,  0.6600016680,
+    0.6613118653,  0.6626200482,  0.6639262127,   0.6652303547,  0.6665324702,
+    0.6678325555,  0.6691306064,  0.6704266190,   0.6717205893,  0.6730125135,
+    0.6743023876,  0.6755902076,  0.6768759697,   0.6781596699,  0.6794413043,
+    0.6807208690,  0.6819983601,  0.6832737737,   0.6845471059,  0.6858183529,
+    0.6870875108,  0.6883545757,  0.6896195437,   0.6908824111,  0.6921431739,
+    0.6934018283,  0.6946583705,  0.6959127966,   0.6971651029,  0.6984152854,
+    0.6996633405,  0.7009092643,  0.7021530530,   0.7033947028,  0.7046342100,
+    0.7058715707,  0.7071067812,  0.7083398377,   0.7095707365,  0.7107994739,
+    0.7120260460,  0.7132504492,  0.7144726796,   0.7156927337,  0.7169106077,
+    0.7181262978,  0.7193398003,  0.7205511117,   0.7217602281,  0.7229671459,
+    0.7241718614,  0.7253743710,  0.7265746710,   0.7277727577,  0.7289686274,
+    0.7301622766,  0.7313537016,  0.7325428988,   0.7337298645,  0.7349145951,
+    0.7360970871,  0.7372773368,  0.7384553406,   0.7396310950,  0.7408045963,
+    0.7419758410,  0.7431448255,  0.7443115462,   0.7454759997,  0.7466381823,
+    0.7477980905,  0.7489557208,  0.7501110696,   0.7512641335,  0.7524149089,
+    0.7535633923,  0.7547095802,  0.7558534692,   0.7569950557,  0.7581343362,
+    0.7592713073,  0.7604059656,  0.7615383075,   0.7626683297,  0.7637960286,
+    0.7649214009,  0.7660444431,  0.7671651518,   0.7682835236,  0.7693995550,
+    0.7705132428,  0.7716245834,  0.7727335735,   0.7738402097,  0.7749444887,
+    0.7760464071,  0.7771459615,  0.7782431485,   0.7793379649,  0.7804304073,
+    0.7815204724,  0.7826081569,  0.7836934573,   0.7847763705,  0.7858568932,
+    0.7869350220,  0.7880107536,  0.7890840848,   0.7901550124,  0.7912235330,
+    0.7922896434,  0.7933533403,  0.7944146205,   0.7954734809,  0.7965299180,
+    0.7975839288,  0.7986355100,  0.7996846585,   0.8007313709,  0.8017756442,
+    0.8028174752,  0.8038568606,  0.8048937974,   0.8059282822,  0.8069603121,
+    0.8079898839,  0.8090169944,  0.8100416404,   0.8110638190,  0.8120835269,
+    0.8131007610,  0.8141155184,  0.8151277957,   0.8161375901,  0.8171448983,
+    0.8181497174,  0.8191520443,  0.8201518759,   0.8211492091,  0.8221440410,
+    0.8231363685,  0.8241261886,  0.8251134983,   0.8260982945,  0.8270805743,
+    0.8280603346,  0.8290375726,  0.8300122851,   0.8309844693,  0.8319541221,
+    0.8329212407,  0.8338858221,  0.8348478633,   0.8358073614,  0.8367643135,
+    0.8377187166,  0.8386705679,  0.8396198645,   0.8405666035,  0.8415107819,
+    0.8424523970,  0.8433914458,  0.8443279255,   0.8452618332,  0.8461931661,
+    0.8471219214,  0.8480480962,  0.8489716876,   0.8498926930,  0.8508111094,
+    0.8517269341,  0.8526401644,  0.8535507973,   0.8544588301,  0.8553642602,
+    0.8562670846,  0.8571673007,  0.8580649057,   0.8589598969,  0.8598522716,
+    0.8607420270,  0.8616291604,  0.8625136692,   0.8633955506,  0.8642748020,
+    0.8651514206,  0.8660254038,  0.8668967489,   0.8677654534,  0.8686315144,
+    0.8694949295,  0.8703556959,  0.8712138111,   0.8720692724,  0.8729220773,
+    0.8737722230,  0.8746197071,  0.8754645270,   0.8763066800,  0.8771461637,
+    0.8779829754,  0.8788171127,  0.8796485729,   0.8804773535,  0.8813034521,
+    0.8821268660,  0.8829475929,  0.8837656301,   0.8845809752,  0.8853936258,
+    0.8862035792,  0.8870108332,  0.8878153851,   0.8886172327,  0.8894163733,
+    0.8902128046,  0.8910065242,  0.8917975296,   0.8925858185,  0.8933713883,
+    0.8941542368,  0.8949343616,  0.8957117602,   0.8964864304,  0.8972583697,
+    0.8980275758,  0.8987940463,  0.8995577790,   0.9003187714,  0.9010770213,
+    0.9018325264,  0.9025852843,  0.9033352929,   0.9040825497,  0.9048270525,
+    0.9055687990,  0.9063077870,  0.9070440143,   0.9077774785,  0.9085081775,
+    0.9092361090,  0.9099612709,  0.9106836608,   0.9114032766,  0.9121201162,
+    0.9128341772,  0.9135454576,  0.9142539552,   0.9149596678,  0.9156625933,
+    0.9163627296,  0.9170600744,  0.9177546257,   0.9184463813,  0.9191353393,
+    0.9198214973,  0.9205048535,  0.9211854056,   0.9218631516,  0.9225380895,
+    0.9232102171,  0.9238795325,  0.9245460336,   0.9252097184,  0.9258705848,
+    0.9265286309,  0.9271838546,  0.9278362539,   0.9284858269,  0.9291325715,
+    0.9297764859,  0.9304175680,  0.9310558159,   0.9316912276,  0.9323238012,
+    0.9329535348,  0.9335804265,  0.9342044743,   0.9348256764,  0.9354440308,
+    0.9360595357,  0.9366721892,  0.9372819895,   0.9378889346,  0.9384930228,
+    0.9390942521,  0.9396926208,  0.9402881270,   0.9408807690,  0.9414705448,
+    0.9420574528,  0.9426414911,  0.9432226579,   0.9438009516,  0.9443763702,
+    0.9449489122,  0.9455185756,  0.9460853588,   0.9466492601,  0.9472102777,
+    0.9477684100,  0.9483236552,  0.9488760116,   0.9494254776,  0.9499720515,
+    0.9505157316,  0.9510565163,  0.9515944039,   0.9521293927,  0.9526614813,
+    0.9531906678,  0.9537169507,  0.9542403285,   0.9547607995,  0.9552783621,
+    0.9557930148,  0.9563047560,  0.9568135841,   0.9573194975,  0.9578224948,
+    0.9583225745,  0.9588197349,  0.9593139745,   0.9598052920,  0.9602936857,
+    0.9607791542,  0.9612616959,  0.9617413095,   0.9622179935,  0.9626917464,
+    0.9631625668,  0.9636304532,  0.9640954042,   0.9645574185,  0.9650164945,
+    0.9654726309,  0.9659258263,  0.9663760793,   0.9668233886,  0.9672677528,
+    0.9677091705,  0.9681476404,  0.9685831611,   0.9690157314,  0.9694453499,
+    0.9698720153,  0.9702957263,  0.9707164816,   0.9711342799,  0.9715491200,
+    0.9719610006,  0.9723699204,  0.9727758782,   0.9731788728,  0.9735789029,
+    0.9739759673,  0.9743700648,  0.9747611942,   0.9751493543,  0.9755345439,
+    0.9759167619,  0.9762960071,  0.9766722783,   0.9770455744,  0.9774158943,
+    0.9777832368,  0.9781476007,  0.9785089851,   0.9788673888,  0.9792228106,
+    0.9795752496,  0.9799247046,  0.9802711746,   0.9806146585,  0.9809551553,
+    0.9812926640,  0.9816271834,  0.9819587127,   0.9822872507,  0.9826127965,
+    0.9829353491,  0.9832549076,  0.9835714708,   0.9838850379,  0.9841956080,
+    0.9845031800,  0.9848077530,  0.9851093262,   0.9854078985,  0.9857034691,
+    0.9859960371,  0.9862856015,  0.9865721616,   0.9868557164,  0.9871362651,
+    0.9874138068,  0.9876883406,  0.9879598658,   0.9882283814,  0.9884938868,
+    0.9887563810,  0.9890158634,  0.9892723330,   0.9895257891,  0.9897762309,
+    0.9900236577,  0.9902680687,  0.9905094632,   0.9907478405,  0.9909831997,
+    0.9912155403,  0.9914448614,  0.9916711624,   0.9918944426,  0.9921147013,
+    0.9923319379,  0.9925461516,  0.9927573419,   0.9929655081,  0.9931706495,
+    0.9933727656,  0.9935718557,  0.9937679192,   0.9939609555,  0.9941509640,
+    0.9943379441,  0.9945218954,  0.9947028171,   0.9948807088,  0.9950555700,
+    0.9952274000,  0.9953961984,  0.9955619646,   0.9957246982,  0.9958843986,
+    0.9960410654,  0.9961946981,  0.9963452962,   0.9964928592,  0.9966373868,
+    0.9967788785,  0.9969173337,  0.9970527522,   0.9971851335,  0.9973144772,
+    0.9974407829,  0.9975640503,  0.9976842788,   0.9978014683,  0.9979156183,
+    0.9980267284,  0.9981347984,  0.9982398279,   0.9983418166,  0.9984407642,
+    0.9985366703,  0.9986295348,  0.9987193572,   0.9988061373,  0.9988898750,
+    0.9989705698,  0.9990482216,  0.9991228301,   0.9991943951,  0.9992629164,
+    0.9993283938,  0.9993908270,  0.9994502159,   0.9995065604,  0.9995598601,
+    0.9996101150,  0.9996573250,  0.9997014898,   0.9997426093,  0.9997806835,
+    0.9998157121,  0.9998476952,  0.9998766325,   0.9999025240,  0.9999253697,
+    0.9999451694,  0.9999619231,  0.9999756307,   0.9999862922,  0.9999939077,
+    0.9999984769,  1.0000000000,  0.9999984769,   0.9999939077,  0.9999862922,
+    0.9999756307,  0.9999619231,  0.9999451694,   0.9999253697,  0.9999025240,
+    0.9998766325,  0.9998476952,  0.9998157121,   0.9997806835,  0.9997426093,
+    0.9997014898,  0.9996573250,  0.9996101150,   0.9995598601,  0.9995065604,
+    0.9994502159,  0.9993908270,  0.9993283938,   0.9992629164,  0.9991943951,
+    0.9991228301,  0.9990482216,  0.9989705698,   0.9988898750,  0.9988061373,
+    0.9987193572,  0.9986295348,  0.9985366703,   0.9984407642,  0.9983418166,
+    0.9982398279,  0.9981347984,  0.9980267284,   0.9979156183,  0.9978014683,
+    0.9976842788,  0.9975640503,  0.9974407829,   0.9973144772,  0.9971851335,
+    0.9970527522,  0.9969173337,  0.9967788785,   0.9966373868,  0.9964928592,
+    0.9963452962,  0.9961946981,  0.9960410654,   0.9958843986,  0.9957246982,
+    0.9955619646,  0.9953961984,  0.9952274000,   0.9950555700,  0.9948807088,
+    0.9947028171,  0.9945218954,  0.9943379441,   0.9941509640,  0.9939609555,
+    0.9937679192,  0.9935718557,  0.9933727656,   0.9931706495,  0.9929655081,
+    0.9927573419,  0.9925461516,  0.9923319379,   0.9921147013,  0.9918944426,
+    0.9916711624,  0.9914448614,  0.9912155403,   0.9909831997,  0.9907478405,
+    0.9905094632,  0.9902680687,  0.9900236577,   0.9897762309,  0.9895257891,
+    0.9892723330,  0.9890158634,  0.9887563810,   0.9884938868,  0.9882283814,
+    0.9879598658,  0.9876883406,  0.9874138068,   0.9871362651,  0.9868557164,
+    0.9865721616,  0.9862856015,  0.9859960371,   0.9857034691,  0.9854078985,
+    0.9851093262,  0.9848077530,  0.9845031800,   0.9841956080,  0.9838850379,
+    0.9835714708,  0.9832549076,  0.9829353491,   0.9826127965,  0.9822872507,
+    0.9819587127,  0.9816271834,  0.9812926640,   0.9809551553,  0.9806146585,
+    0.9802711746,  0.9799247046,  0.9795752496,   0.9792228106,  0.9788673888,
+    0.9785089851,  0.9781476007,  0.9777832368,   0.9774158943,  0.9770455744,
+    0.9766722783,  0.9762960071,  0.9759167619,   0.9755345439,  0.9751493543,
+    0.9747611942,  0.9743700648,  0.9739759673,   0.9735789029,  0.9731788728,
+    0.9727758782,  0.9723699204,  0.9719610006,   0.9715491200,  0.9711342799,
+    0.9707164816,  0.9702957263,  0.9698720153,   0.9694453499,  0.9690157314,
+    0.9685831611,  0.9681476404,  0.9677091705,   0.9672677528,  0.9668233886,
+    0.9663760793,  0.9659258263,  0.9654726309,   0.9650164945,  0.9645574185,
+    0.9640954042,  0.9636304532,  0.9631625668,   0.9626917464,  0.9622179935,
+    0.9617413095,  0.9612616959,  0.9607791542,   0.9602936857,  0.9598052920,
+    0.9593139745,  0.9588197349,  0.9583225745,   0.9578224948,  0.9573194975,
+    0.9568135841,  0.9563047560,  0.9557930148,   0.9552783621,  0.9547607995,
+    0.9542403285,  0.9537169507,  0.9531906678,   0.9526614813,  0.9521293927,
+    0.9515944039,  0.9510565163,  0.9505157316,   0.9499720515,  0.9494254776,
+    0.9488760116,  0.9483236552,  0.9477684100,   0.9472102777,  0.9466492601,
+    0.9460853588,  0.9455185756,  0.9449489122,   0.9443763702,  0.9438009516,
+    0.9432226579,  0.9426414911,  0.9420574528,   0.9414705448,  0.9408807690,
+    0.9402881270,  0.9396926208,  0.9390942521,   0.9384930228,  0.9378889346,
+    0.9372819895,  0.9366721892,  0.9360595357,   0.9354440308,  0.9348256764,
+    0.9342044743,  0.9335804265,  0.9329535348,   0.9323238012,  0.9316912276,
+    0.9310558159,  0.9304175680,  0.9297764859,   0.9291325715,  0.9284858269,
+    0.9278362539,  0.9271838546,  0.9265286309,   0.9258705848,  0.9252097184,
+    0.9245460336,  0.9238795325,  0.9232102171,   0.9225380895,  0.9218631516,
+    0.9211854056,  0.9205048535,  0.9198214973,   0.9191353393,  0.9184463813,
+    0.9177546257,  0.9170600744,  0.9163627296,   0.9156625933,  0.9149596678,
+    0.9142539552,  0.9135454576,  0.9128341772,   0.9121201162,  0.9114032766,
+    0.9106836608,  0.9099612709,  0.9092361090,   0.9085081775,  0.9077774785,
+    0.9070440143,  0.9063077870,  0.9055687990,   0.9048270525,  0.9040825497,
+    0.9033352929,  0.9025852843,  0.9018325264,   0.9010770213,  0.9003187714,
+    0.8995577790,  0.8987940463,  0.8980275758,   0.8972583697,  0.8964864304,
+    0.8957117602,  0.8949343616,  0.8941542368,   0.8933713883,  0.8925858185,
+    0.8917975296,  0.8910065242,  0.8902128046,   0.8894163733,  0.8886172327,
+    0.8878153851,  0.8870108332,  0.8862035792,   0.8853936258,  0.8845809752,
+    0.8837656301,  0.8829475929,  0.8821268660,   0.8813034521,  0.8804773535,
+    0.8796485729,  0.8788171127,  0.8779829754,   0.8771461637,  0.8763066800,
+    0.8754645270,  0.8746197071,  0.8737722230,   0.8729220773,  0.8720692724,
+    0.8712138111,  0.8703556959,  0.8694949295,   0.8686315144,  0.8677654534,
+    0.8668967489,  0.8660254038,  0.8651514206,   0.8642748020,  0.8633955506,
+    0.8625136692,  0.8616291604,  0.8607420270,   0.8598522716,  0.8589598969,
+    0.8580649057,  0.8571673007,  0.8562670846,   0.8553642602,  0.8544588301,
+    0.8535507973,  0.8526401644,  0.8517269341,   0.8508111094,  0.8498926930,
+    0.8489716876,  0.8480480962,  0.8471219214,   0.8461931661,  0.8452618332,
+    0.8443279255,  0.8433914458,  0.8424523970,   0.8415107819,  0.8405666035,
+    0.8396198645,  0.8386705679,  0.8377187166,   0.8367643135,  0.8358073614,
+    0.8348478633,  0.8338858221,  0.8329212407,   0.8319541221,  0.8309844693,
+    0.8300122851,  0.8290375726,  0.8280603346,   0.8270805743,  0.8260982945,
+    0.8251134983,  0.8241261886,  0.8231363685,   0.8221440410,  0.8211492091,
+    0.8201518759,  0.8191520443,  0.8181497174,   0.8171448983,  0.8161375901,
+    0.8151277957,  0.8141155184,  0.8131007610,   0.8120835269,  0.8110638190,
+    0.8100416404,  0.8090169944,  0.8079898839,   0.8069603121,  0.8059282822,
+    0.8048937974,  0.8038568606,  0.8028174752,   0.8017756442,  0.8007313709,
+    0.7996846585,  0.7986355100,  0.7975839288,   0.7965299180,  0.7954734809,
+    0.7944146205,  0.7933533403,  0.7922896434,   0.7912235330,  0.7901550124,
+    0.7890840848,  0.7880107536,  0.7869350220,   0.7858568932,  0.7847763705,
+    0.7836934573,  0.7826081569,  0.7815204724,   0.7804304073,  0.7793379649,
+    0.7782431485,  0.7771459615,  0.7760464071,   0.7749444887,  0.7738402097,
+    0.7727335735,  0.7716245834,  0.7705132428,   0.7693995550,  0.7682835236,
+    0.7671651518,  0.7660444431,  0.7649214009,   0.7637960286,  0.7626683297,
+    0.7615383075,  0.7604059656,  0.7592713073,   0.7581343362,  0.7569950557,
+    0.7558534692,  0.7547095802,  0.7535633923,   0.7524149089,  0.7512641335,
+    0.7501110696,  0.7489557208,  0.7477980905,   0.7466381823,  0.7454759997,
+    0.7443115462,  0.7431448255,  0.7419758410,   0.7408045963,  0.7396310950,
+    0.7384553406,  0.7372773368,  0.7360970871,   0.7349145951,  0.7337298645,
+    0.7325428988,  0.7313537016,  0.7301622766,   0.7289686274,  0.7277727577,
+    0.7265746710,  0.7253743710,  0.7241718614,   0.7229671459,  0.7217602281,
+    0.7205511117,  0.7193398003,  0.7181262978,   0.7169106077,  0.7156927337,
+    0.7144726796,  0.7132504492,  0.7120260460,   0.7107994739,  0.7095707365,
+    0.7083398377,  0.7071067812,  0.7058715707,   0.7046342100,  0.7033947028,
+    0.7021530530,  0.7009092643,  0.6996633405,   0.6984152854,  0.6971651029,
+    0.6959127966,  0.6946583705,  0.6934018283,   0.6921431739,  0.6908824111,
+    0.6896195437,  0.6883545757,  0.6870875108,   0.6858183529,  0.6845471059,
+    0.6832737737,  0.6819983601,  0.6807208690,   0.6794413043,  0.6781596699,
+    0.6768759697,  0.6755902076,  0.6743023876,   0.6730125135,  0.6717205893,
+    0.6704266190,  0.6691306064,  0.6678325555,   0.6665324702,  0.6652303547,
+    0.6639262127,  0.6626200482,  0.6613118653,   0.6600016680,  0.6586894601,
+    0.6573752458,  0.6560590290,  0.6547408137,   0.6534206040,  0.6520984038,
+    0.6507742173,  0.6494480483,  0.6481199011,   0.6467897795,  0.6454576877,
+    0.6441236298,  0.6427876097,  0.6414496316,   0.6401096995,  0.6387678175,
+    0.6374239897,  0.6360782203,  0.6347305132,   0.6333808726,  0.6320293027,
+    0.6306758074,  0.6293203910,  0.6279630576,   0.6266038114,  0.6252426563,
+    0.6238795967,  0.6225146366,  0.6211477803,   0.6197790318,  0.6184083954,
+    0.6170358751,  0.6156614753,  0.6142852001,   0.6129070537,  0.6115270402,
+    0.6101451639,  0.6087614290,  0.6073758397,   0.6059884003,  0.6045991149,
+    0.6032079877,  0.6018150232,  0.6004202253,   0.5990235985,  0.5976251470,
+    0.5962248750,  0.5948227868,  0.5934188866,   0.5920131788,  0.5906056676,
+    0.5891963574,  0.5877852523,  0.5863723567,   0.5849576750,  0.5835412114,
+    0.5821229702,  0.5807029557,  0.5792811723,   0.5778576244,  0.5764323162,
+    0.5750052520,  0.5735764364,  0.5721458734,   0.5707135677,  0.5692795234,
+    0.5678437451,  0.5664062369,  0.5649670034,   0.5635260489,  0.5620833779,
+    0.5606389946,  0.5591929035,  0.5577451090,   0.5562956155,  0.5548444274,
+    0.5533915492,  0.5519369853,  0.5504807401,   0.5490228180,  0.5475632235,
+    0.5461019610,  0.5446390350,  0.5431744500,   0.5417082103,  0.5402403205,
+    0.5387707850,  0.5372996083,  0.5358267950,   0.5343523494,  0.5328762761,
+    0.5313985795,  0.5299192642,  0.5284383347,   0.5269557955,  0.5254716511,
+    0.5239859060,  0.5224985647,  0.5210096318,   0.5195191119,  0.5180270094,
+    0.5165333289,  0.5150380749,  0.5135412521,   0.5120428649,  0.5105429179,
+    0.5090414158,  0.5075383630,  0.5060337641,   0.5045276238,  0.5030199466,
+    0.5015107372,  0.5000000000,  0.4984877398,   0.4969739610,  0.4954586684,
+    0.4939418666,  0.4924235601,  0.4909037536,   0.4893824517,  0.4878596591,
+    0.4863353804,  0.4848096202,  0.4832823833,   0.4817536741,  0.4802234974,
+    0.4786918579,  0.4771587603,  0.4756242091,   0.4740882090,  0.4725507649,
+    0.4710118812,  0.4694715628,  0.4679298143,   0.4663866403,  0.4648420457,
+    0.4632960351,  0.4617486132,  0.4601997848,   0.4586495545,  0.4570979271,
+    0.4555449072,  0.4539904997,  0.4524347093,   0.4508775407,  0.4493189986,
+    0.4477590878,  0.4461978131,  0.4446351792,   0.4430711908,  0.4415058528,
+    0.4399391699,  0.4383711468,  0.4368017884,   0.4352310994,  0.4336590846,
+    0.4320857488,  0.4305110968,  0.4289351334,   0.4273578634,  0.4257792916,
+    0.4241994227,  0.4226182617,  0.4210358134,   0.4194520824,  0.4178670738,
+    0.4162807923,  0.4146932427,  0.4131044298,   0.4115143586,  0.4099230338,
+    0.4083304604,  0.4067366431,  0.4051415868,   0.4035452964,  0.4019477767,
+    0.4003490326,  0.3987490689,  0.3971478906,   0.3955455026,  0.3939419096,
+    0.3923371166,  0.3907311285,  0.3891239501,   0.3875155865,  0.3859060423,
+    0.3842953227,  0.3826834324,  0.3810703764,   0.3794561595,  0.3778407868,
+    0.3762242631,  0.3746065934,  0.3729877826,   0.3713678356,  0.3697467573,
+    0.3681245527,  0.3665012267,  0.3648767843,   0.3632512305,  0.3616245701,
+    0.3599968081,  0.3583679495,  0.3567379993,   0.3551069624,  0.3534748438,
+    0.3518416484,  0.3502073813,  0.3485720473,   0.3469356516,  0.3452981990,
+    0.3436596946,  0.3420201433,  0.3403795502,   0.3387379202,  0.3370952584,
+    0.3354515698,  0.3338068592,  0.3321611319,   0.3305143927,  0.3288666467,
+    0.3272178990,  0.3255681545,  0.3239174182,   0.3222656952,  0.3206129906,
+    0.3189593093,  0.3173046564,  0.3156490369,   0.3139924560,  0.3123349185,
+    0.3106764296,  0.3090169944,  0.3073566178,   0.3056953050,  0.3040330609,
+    0.3023698908,  0.3007057995,  0.2990407923,   0.2973748741,  0.2957080500,
+    0.2940403252,  0.2923717047,  0.2907021936,   0.2890317969,  0.2873605198,
+    0.2856883674,  0.2840153447,  0.2823414568,   0.2806667089,  0.2789911060,
+    0.2773146533,  0.2756373558,  0.2739592187,   0.2722802470,  0.2706004460,
+    0.2689198206,  0.2672383761,  0.2655561175,   0.2638730500,  0.2621891786,
+    0.2605045086,  0.2588190451,  0.2571327932,   0.2554457579,  0.2537579446,
+    0.2520693582,  0.2503800041,  0.2486898872,   0.2469990127,  0.2453073859,
+    0.2436150118,  0.2419218956,  0.2402280425,   0.2385334576,  0.2368381461,
+    0.2351421131,  0.2334453639,  0.2317479035,   0.2300497372,  0.2283508701,
+    0.2266513074,  0.2249510543,  0.2232501160,   0.2215484976,  0.2198462044,
+    0.2181432414,  0.2164396139,  0.2147353272,   0.2130303863,  0.2113247965,
+    0.2096185629,  0.2079116908,  0.2062041854,   0.2044960518,  0.2027872954,
+    0.2010779211,  0.1993679344,  0.1976573404,   0.1959461442,  0.1942343512,
+    0.1925219665,  0.1908089954,  0.1890954430,   0.1873813146,  0.1856666154,
+    0.1839513506,  0.1822355255,  0.1805191453,   0.1788022151,  0.1770847403,
+    0.1753667261,  0.1736481777,  0.1719291003,   0.1702094992,  0.1684893796,
+    0.1667687467,  0.1650476059,  0.1633259622,   0.1616038211,  0.1598811877,
+    0.1581580673,  0.1564344650,  0.1547103863,   0.1529858363,  0.1512608202,
+    0.1495353434,  0.1478094111,  0.1460830286,   0.1443562010,  0.1426289337,
+    0.1409012319,  0.1391731010,  0.1374445460,   0.1357155724,  0.1339861854,
+    0.1322563903,  0.1305261922,  0.1287955966,   0.1270646086,  0.1253332336,
+    0.1236014767,  0.1218693434,  0.1201368388,   0.1184039683,  0.1166707371,
+    0.1149371505,  0.1132032138,  0.1114689322,   0.1097343111,  0.1079993557,
+    0.1062640713,  0.1045284633,  0.1027925368,   0.1010562972,  0.0993197497,
+    0.0975828998,  0.0958457525,  0.0941083133,   0.0923705874,  0.0906325802,
+    0.0888942969,  0.0871557427,  0.0854169231,   0.0836778433,  0.0819385086,
+    0.0801989243,  0.0784590957,  0.0767190281,   0.0749787268,  0.0732381971,
+    0.0714974443,  0.0697564737,  0.0680152907,   0.0662739004,  0.0645323083,
+    0.0627905195,  0.0610485395,  0.0593063736,   0.0575640270,  0.0558215050,
+    0.0540788130,  0.0523359562,  0.0505929401,   0.0488497698,  0.0471064507,
+    0.0453629881,  0.0436193874,  0.0418756537,   0.0401317925,  0.0383878091,
+    0.0366437087,  0.0348994967,  0.0331551784,   0.0314107591,  0.0296662441,
+    0.0279216387,  0.0261769483,  0.0244321782,   0.0226873336,  0.0209424199,
+    0.0191974424,  0.0174524064,  0.0157073173,   0.0139621803,  0.0122170008,
+    0.0104717841,  0.0087265355,  0.0069812603,   0.0052359638,  0.0034906514,
+    0.0017453284,  0.0000000000,  -0.0017453284,  -0.0034906514, -0.0052359638,
+    -0.0069812603, -0.0087265355, -0.0104717841,  -0.0122170008, -0.0139621803,
+    -0.0157073173, -0.0174524064, -0.0191974424,  -0.0209424199, -0.0226873336,
+    -0.0244321782, -0.0261769483, -0.0279216387,  -0.0296662441, -0.0314107591,
+    -0.0331551784, -0.0348994967, -0.0366437087,  -0.0383878091, -0.0401317925,
+    -0.0418756537, -0.0436193874, -0.0453629881,  -0.0471064507, -0.0488497698,
+    -0.0505929401, -0.0523359562, -0.0540788130,  -0.0558215050, -0.0575640270,
+    -0.0593063736, -0.0610485395, -0.0627905195,  -0.0645323083, -0.0662739004,
+    -0.0680152907, -0.0697564737, -0.0714974443,  -0.0732381971, -0.0749787268,
+    -0.0767190281, -0.0784590957, -0.0801989243,  -0.0819385086, -0.0836778433,
+    -0.0854169231, -0.0871557427, -0.0888942969,  -0.0906325802, -0.0923705874,
+    -0.0941083133, -0.0958457525, -0.0975828998,  -0.0993197497, -0.1010562972,
+    -0.1027925368, -0.1045284633, -0.1062640713,  -0.1079993557, -0.1097343111,
+    -0.1114689322, -0.1132032138, -0.1149371505,  -0.1166707371, -0.1184039683,
+    -0.1201368388, -0.1218693434, -0.1236014767,  -0.1253332336, -0.1270646086,
+    -0.1287955966, -0.1305261922, -0.1322563903,  -0.1339861854, -0.1357155724,
+    -0.1374445460, -0.1391731010, -0.1409012319,  -0.1426289337, -0.1443562010,
+    -0.1460830286, -0.1478094111, -0.1495353434,  -0.1512608202, -0.1529858363,
+    -0.1547103863, -0.1564344650, -0.1581580673,  -0.1598811877, -0.1616038211,
+    -0.1633259622, -0.1650476059, -0.1667687467,  -0.1684893796, -0.1702094992,
+    -0.1719291003, -0.1736481777, -0.1753667261,  -0.1770847403, -0.1788022151,
+    -0.1805191453, -0.1822355255, -0.1839513506,  -0.1856666154, -0.1873813146,
+    -0.1890954430, -0.1908089954, -0.1925219665,  -0.1942343512, -0.1959461442,
+    -0.1976573404, -0.1993679344, -0.2010779211,  -0.2027872954, -0.2044960518,
+    -0.2062041854, -0.2079116908, -0.2096185629,  -0.2113247965, -0.2130303863,
+    -0.2147353272, -0.2164396139, -0.2181432414,  -0.2198462044, -0.2215484976,
+    -0.2232501160, -0.2249510543, -0.2266513074,  -0.2283508701, -0.2300497372,
+    -0.2317479035, -0.2334453639, -0.2351421131,  -0.2368381461, -0.2385334576,
+    -0.2402280425, -0.2419218956, -0.2436150118,  -0.2453073859, -0.2469990127,
+    -0.2486898872, -0.2503800041, -0.2520693582,  -0.2537579446, -0.2554457579,
+    -0.2571327932, -0.2588190451, -0.2605045086,  -0.2621891786, -0.2638730500,
+    -0.2655561175, -0.2672383761, -0.2689198206,  -0.2706004460, -0.2722802470,
+    -0.2739592187, -0.2756373558, -0.2773146533,  -0.2789911060, -0.2806667089,
+    -0.2823414568, -0.2840153447, -0.2856883674,  -0.2873605198, -0.2890317969,
+    -0.2907021936, -0.2923717047, -0.2940403252,  -0.2957080500, -0.2973748741,
+    -0.2990407923, -0.3007057995, -0.3023698908,  -0.3040330609, -0.3056953050,
+    -0.3073566178, -0.3090169944, -0.3106764296,  -0.3123349185, -0.3139924560,
+    -0.3156490369, -0.3173046564, -0.3189593093,  -0.3206129906, -0.3222656952,
+    -0.3239174182, -0.3255681545, -0.3272178990,  -0.3288666467, -0.3305143927,
+    -0.3321611319, -0.3338068592, -0.3354515698,  -0.3370952584, -0.3387379202,
+    -0.3403795502, -0.3420201433, -0.3436596946,  -0.3452981990, -0.3469356516,
+    -0.3485720473, -0.3502073813, -0.3518416484,  -0.3534748438, -0.3551069624,
+    -0.3567379993, -0.3583679495, -0.3599968081,  -0.3616245701, -0.3632512305,
+    -0.3648767843, -0.3665012267, -0.3681245527,  -0.3697467573, -0.3713678356,
+    -0.3729877826, -0.3746065934, -0.3762242631,  -0.3778407868, -0.3794561595,
+    -0.3810703764, -0.3826834324, -0.3842953227,  -0.3859060423, -0.3875155865,
+    -0.3891239501, -0.3907311285, -0.3923371166,  -0.3939419096, -0.3955455026,
+    -0.3971478906, -0.3987490689, -0.4003490326,  -0.4019477767, -0.4035452964,
+    -0.4051415868, -0.4067366431, -0.4083304604,  -0.4099230338, -0.4115143586,
+    -0.4131044298, -0.4146932427, -0.4162807923,  -0.4178670738, -0.4194520824,
+    -0.4210358134, -0.4226182617, -0.4241994227,  -0.4257792916, -0.4273578634,
+    -0.4289351334, -0.4305110968, -0.4320857488,  -0.4336590846, -0.4352310994,
+    -0.4368017884, -0.4383711468, -0.4399391699,  -0.4415058528, -0.4430711908,
+    -0.4446351792, -0.4461978131, -0.4477590878,  -0.4493189986, -0.4508775407,
+    -0.4524347093, -0.4539904997, -0.4555449072,  -0.4570979271, -0.4586495545,
+    -0.4601997848, -0.4617486132, -0.4632960351,  -0.4648420457, -0.4663866403,
+    -0.4679298143, -0.4694715628, -0.4710118812,  -0.4725507649, -0.4740882090,
+    -0.4756242091, -0.4771587603, -0.4786918579,  -0.4802234974, -0.4817536741,
+    -0.4832823833, -0.4848096202, -0.4863353804,  -0.4878596591, -0.4893824517,
+    -0.4909037536, -0.4924235601, -0.4939418666,  -0.4954586684, -0.4969739610,
+    -0.4984877398, -0.5000000000, -0.5015107372,  -0.5030199466, -0.5045276238,
+    -0.5060337641, -0.5075383630, -0.5090414158,  -0.5105429179, -0.5120428649,
+    -0.5135412521, -0.5150380749, -0.5165333289,  -0.5180270094, -0.5195191119,
+    -0.5210096318, -0.5224985647, -0.5239859060,  -0.5254716511, -0.5269557955,
+    -0.5284383347, -0.5299192642, -0.5313985795,  -0.5328762761, -0.5343523494,
+    -0.5358267950, -0.5372996083, -0.5387707850,  -0.5402403205, -0.5417082103,
+    -0.5431744500, -0.5446390350, -0.5461019610,  -0.5475632235, -0.5490228180,
+    -0.5504807401, -0.5519369853, -0.5533915492,  -0.5548444274, -0.5562956155,
+    -0.5577451090, -0.5591929035, -0.5606389946,  -0.5620833779, -0.5635260489,
+    -0.5649670034, -0.5664062369, -0.5678437451,  -0.5692795234, -0.5707135677,
+    -0.5721458734, -0.5735764364, -0.5750052520,  -0.5764323162, -0.5778576244,
+    -0.5792811723, -0.5807029557, -0.5821229702,  -0.5835412114, -0.5849576750,
+    -0.5863723567, -0.5877852523, -0.5891963574,  -0.5906056676, -0.5920131788,
+    -0.5934188866, -0.5948227868, -0.5962248750,  -0.5976251470, -0.5990235985,
+    -0.6004202253, -0.6018150232, -0.6032079877,  -0.6045991149, -0.6059884003,
+    -0.6073758397, -0.6087614290, -0.6101451639,  -0.6115270402, -0.6129070537,
+    -0.6142852001, -0.6156614753, -0.6170358751,  -0.6184083954, -0.6197790318,
+    -0.6211477803, -0.6225146366, -0.6238795967,  -0.6252426563, -0.6266038114,
+    -0.6279630576, -0.6293203910, -0.6306758074,  -0.6320293027, -0.6333808726,
+    -0.6347305132, -0.6360782203, -0.6374239897,  -0.6387678175, -0.6401096995,
+    -0.6414496316, -0.6427876097, -0.6441236298,  -0.6454576877, -0.6467897795,
+    -0.6481199011, -0.6494480483, -0.6507742173,  -0.6520984038, -0.6534206040,
+    -0.6547408137, -0.6560590290, -0.6573752458,  -0.6586894601, -0.6600016680,
+    -0.6613118653, -0.6626200482, -0.6639262127,  -0.6652303547, -0.6665324702,
+    -0.6678325555, -0.6691306064, -0.6704266190,  -0.6717205893, -0.6730125135,
+    -0.6743023876, -0.6755902076, -0.6768759697,  -0.6781596699, -0.6794413043,
+    -0.6807208690, -0.6819983601, -0.6832737737,  -0.6845471059, -0.6858183529,
+    -0.6870875108, -0.6883545757, -0.6896195437,  -0.6908824111, -0.6921431739,
+    -0.6934018283, -0.6946583705, -0.6959127966,  -0.6971651029, -0.6984152854,
+    -0.6996633405, -0.7009092643, -0.7021530530,  -0.7033947028, -0.7046342100,
+    -0.7058715707, -0.7071067812, -0.7083398377,  -0.7095707365, -0.7107994739,
+    -0.7120260460, -0.7132504492, -0.7144726796,  -0.7156927337, -0.7169106077,
+    -0.7181262978, -0.7193398003, -0.7205511117,  -0.7217602281, -0.7229671459,
+    -0.7241718614, -0.7253743710, -0.7265746710,  -0.7277727577, -0.7289686274,
+    -0.7301622766, -0.7313537016, -0.7325428988,  -0.7337298645, -0.7349145951,
+    -0.7360970871, -0.7372773368, -0.7384553406,  -0.7396310950, -0.7408045963,
+    -0.7419758410, -0.7431448255, -0.7443115462,  -0.7454759997, -0.7466381823,
+    -0.7477980905, -0.7489557208, -0.7501110696,  -0.7512641335, -0.7524149089,
+    -0.7535633923, -0.7547095802, -0.7558534692,  -0.7569950557, -0.7581343362,
+    -0.7592713073, -0.7604059656, -0.7615383075,  -0.7626683297, -0.7637960286,
+    -0.7649214009, -0.7660444431, -0.7671651518,  -0.7682835236, -0.7693995550,
+    -0.7705132428, -0.7716245834, -0.7727335735,  -0.7738402097, -0.7749444887,
+    -0.7760464071, -0.7771459615, -0.7782431485,  -0.7793379649, -0.7804304073,
+    -0.7815204724, -0.7826081569, -0.7836934573,  -0.7847763705, -0.7858568932,
+    -0.7869350220, -0.7880107536, -0.7890840848,  -0.7901550124, -0.7912235330,
+    -0.7922896434, -0.7933533403, -0.7944146205,  -0.7954734809, -0.7965299180,
+    -0.7975839288, -0.7986355100, -0.7996846585,  -0.8007313709, -0.8017756442,
+    -0.8028174752, -0.8038568606, -0.8048937974,  -0.8059282822, -0.8069603121,
+    -0.8079898839, -0.8090169944, -0.8100416404,  -0.8110638190, -0.8120835269,
+    -0.8131007610, -0.8141155184, -0.8151277957,  -0.8161375901, -0.8171448983,
+    -0.8181497174, -0.8191520443, -0.8201518759,  -0.8211492091, -0.8221440410,
+    -0.8231363685, -0.8241261886, -0.8251134983,  -0.8260982945, -0.8270805743,
+    -0.8280603346, -0.8290375726, -0.8300122851,  -0.8309844693, -0.8319541221,
+    -0.8329212407, -0.8338858221, -0.8348478633,  -0.8358073614, -0.8367643135,
+    -0.8377187166, -0.8386705679, -0.8396198645,  -0.8405666035, -0.8415107819,
+    -0.8424523970, -0.8433914458, -0.8443279255,  -0.8452618332, -0.8461931661,
+    -0.8471219214, -0.8480480962, -0.8489716876,  -0.8498926930, -0.8508111094,
+    -0.8517269341, -0.8526401644, -0.8535507973,  -0.8544588301, -0.8553642602,
+    -0.8562670846, -0.8571673007, -0.8580649057,  -0.8589598969, -0.8598522716,
+    -0.8607420270, -0.8616291604, -0.8625136692,  -0.8633955506, -0.8642748020,
+    -0.8651514206, -0.8660254038, -0.8668967489,  -0.8677654534, -0.8686315144,
+    -0.8694949295, -0.8703556959, -0.8712138111,  -0.8720692724, -0.8729220773,
+    -0.8737722230, -0.8746197071, -0.8754645270,  -0.8763066800, -0.8771461637,
+    -0.8779829754, -0.8788171127, -0.8796485729,  -0.8804773535, -0.8813034521,
+    -0.8821268660, -0.8829475929, -0.8837656301,  -0.8845809752, -0.8853936258,
+    -0.8862035792, -0.8870108332, -0.8878153851,  -0.8886172327, -0.8894163733,
+    -0.8902128046, -0.8910065242, -0.8917975296,  -0.8925858185, -0.8933713883,
+    -0.8941542368, -0.8949343616, -0.8957117602,  -0.8964864304, -0.8972583697,
+    -0.8980275758, -0.8987940463, -0.8995577790,  -0.9003187714, -0.9010770213,
+    -0.9018325264, -0.9025852843, -0.9033352929,  -0.9040825497, -0.9048270525,
+    -0.9055687990, -0.9063077870, -0.9070440143,  -0.9077774785, -0.9085081775,
+    -0.9092361090, -0.9099612709, -0.9106836608,  -0.9114032766, -0.9121201162,
+    -0.9128341772, -0.9135454576, -0.9142539552,  -0.9149596678, -0.9156625933,
+    -0.9163627296, -0.9170600744, -0.9177546257,  -0.9184463813, -0.9191353393,
+    -0.9198214973, -0.9205048535, -0.9211854056,  -0.9218631516, -0.9225380895,
+    -0.9232102171, -0.9238795325, -0.9245460336,  -0.9252097184, -0.9258705848,
+    -0.9265286309, -0.9271838546, -0.9278362539,  -0.9284858269, -0.9291325715,
+    -0.9297764859, -0.9304175680, -0.9310558159,  -0.9316912276, -0.9323238012,
+    -0.9329535348, -0.9335804265, -0.9342044743,  -0.9348256764, -0.9354440308,
+    -0.9360595357, -0.9366721892, -0.9372819895,  -0.9378889346, -0.9384930228,
+    -0.9390942521, -0.9396926208, -0.9402881270,  -0.9408807690, -0.9414705448,
+    -0.9420574528, -0.9426414911, -0.9432226579,  -0.9438009516, -0.9443763702,
+    -0.9449489122, -0.9455185756, -0.9460853588,  -0.9466492601, -0.9472102777,
+    -0.9477684100, -0.9483236552, -0.9488760116,  -0.9494254776, -0.9499720515,
+    -0.9505157316, -0.9510565163, -0.9515944039,  -0.9521293927, -0.9526614813,
+    -0.9531906678, -0.9537169507, -0.9542403285,  -0.9547607995, -0.9552783621,
+    -0.9557930148, -0.9563047560, -0.9568135841,  -0.9573194975, -0.9578224948,
+    -0.9583225745, -0.9588197349, -0.9593139745,  -0.9598052920, -0.9602936857,
+    -0.9607791542, -0.9612616959, -0.9617413095,  -0.9622179935, -0.9626917464,
+    -0.9631625668, -0.9636304532, -0.9640954042,  -0.9645574185, -0.9650164945,
+    -0.9654726309, -0.9659258263, -0.9663760793,  -0.9668233886, -0.9672677528,
+    -0.9677091705, -0.9681476404, -0.9685831611,  -0.9690157314, -0.9694453499,
+    -0.9698720153, -0.9702957263, -0.9707164816,  -0.9711342799, -0.9715491200,
+    -0.9719610006, -0.9723699204, -0.9727758782,  -0.9731788728, -0.9735789029,
+    -0.9739759673, -0.9743700648, -0.9747611942,  -0.9751493543, -0.9755345439,
+    -0.9759167619, -0.9762960071, -0.9766722783,  -0.9770455744, -0.9774158943,
+    -0.9777832368, -0.9781476007, -0.9785089851,  -0.9788673888, -0.9792228106,
+    -0.9795752496, -0.9799247046, -0.9802711746,  -0.9806146585, -0.9809551553,
+    -0.9812926640, -0.9816271834, -0.9819587127,  -0.9822872507, -0.9826127965,
+    -0.9829353491, -0.9832549076, -0.9835714708,  -0.9838850379, -0.9841956080,
+    -0.9845031800, -0.9848077530, -0.9851093262,  -0.9854078985, -0.9857034691,
+    -0.9859960371, -0.9862856015, -0.9865721616,  -0.9868557164, -0.9871362651,
+    -0.9874138068, -0.9876883406, -0.9879598658,  -0.9882283814, -0.9884938868,
+    -0.9887563810, -0.9890158634, -0.9892723330,  -0.9895257891, -0.9897762309,
+    -0.9900236577, -0.9902680687, -0.9905094632,  -0.9907478405, -0.9909831997,
+    -0.9912155403, -0.9914448614, -0.9916711624,  -0.9918944426, -0.9921147013,
+    -0.9923319379, -0.9925461516, -0.9927573419,  -0.9929655081, -0.9931706495,
+    -0.9933727656, -0.9935718557, -0.9937679192,  -0.9939609555, -0.9941509640,
+    -0.9943379441, -0.9945218954, -0.9947028171,  -0.9948807088, -0.9950555700,
+    -0.9952274000, -0.9953961984, -0.9955619646,  -0.9957246982, -0.9958843986,
+    -0.9960410654, -0.9961946981, -0.9963452962,  -0.9964928592, -0.9966373868,
+    -0.9967788785, -0.9969173337, -0.9970527522,  -0.9971851335, -0.9973144772,
+    -0.9974407829, -0.9975640503, -0.9976842788,  -0.9978014683, -0.9979156183,
+    -0.9980267284, -0.9981347984, -0.9982398279,  -0.9983418166, -0.9984407642,
+    -0.9985366703, -0.9986295348, -0.9987193572,  -0.9988061373, -0.9988898750,
+    -0.9989705698, -0.9990482216, -0.9991228301,  -0.9991943951, -0.9992629164,
+    -0.9993283938, -0.9993908270, -0.9994502159,  -0.9995065604, -0.9995598601,
+    -0.9996101150, -0.9996573250, -0.9997014898,  -0.9997426093, -0.9997806835,
+    -0.9998157121, -0.9998476952, -0.9998766325,  -0.9999025240, -0.9999253697,
+    -0.9999451694, -0.9999619231, -0.9999756307,  -0.9999862922, -0.9999939077,
+    -0.9999984769, -1.0000000000, -0.9999984769,  -0.9999939077, -0.9999862922,
+    -0.9999756307, -0.9999619231, -0.9999451694,  -0.9999253697, -0.9999025240,
+    -0.9998766325, -0.9998476952, -0.9998157121,  -0.9997806835, -0.9997426093,
+    -0.9997014898, -0.9996573250, -0.9996101150,  -0.9995598601, -0.9995065604,
+    -0.9994502159, -0.9993908270, -0.9993283938,  -0.9992629164, -0.9991943951,
+    -0.9991228301, -0.9990482216, -0.9989705698,  -0.9988898750, -0.9988061373,
+    -0.9987193572, -0.9986295348, -0.9985366703,  -0.9984407642, -0.9983418166,
+    -0.9982398279, -0.9981347984, -0.9980267284,  -0.9979156183, -0.9978014683,
+    -0.9976842788, -0.9975640503, -0.9974407829,  -0.9973144772, -0.9971851335,
+    -0.9970527522, -0.9969173337, -0.9967788785,  -0.9966373868, -0.9964928592,
+    -0.9963452962, -0.9961946981, -0.9960410654,  -0.9958843986, -0.9957246982,
+    -0.9955619646, -0.9953961984, -0.9952274000,  -0.9950555700, -0.9948807088,
+    -0.9947028171, -0.9945218954, -0.9943379441,  -0.9941509640, -0.9939609555,
+    -0.9937679192, -0.9935718557, -0.9933727656,  -0.9931706495, -0.9929655081,
+    -0.9927573419, -0.9925461516, -0.9923319379,  -0.9921147013, -0.9918944426,
+    -0.9916711624, -0.9914448614, -0.9912155403,  -0.9909831997, -0.9907478405,
+    -0.9905094632, -0.9902680687, -0.9900236577,  -0.9897762309, -0.9895257891,
+    -0.9892723330, -0.9890158634, -0.9887563810,  -0.9884938868, -0.9882283814,
+    -0.9879598658, -0.9876883406, -0.9874138068,  -0.9871362651, -0.9868557164,
+    -0.9865721616, -0.9862856015, -0.9859960371,  -0.9857034691, -0.9854078985,
+    -0.9851093262, -0.9848077530, -0.9845031800,  -0.9841956080, -0.9838850379,
+    -0.9835714708, -0.9832549076, -0.9829353491,  -0.9826127965, -0.9822872507,
+    -0.9819587127, -0.9816271834, -0.9812926640,  -0.9809551553, -0.9806146585,
+    -0.9802711746, -0.9799247046, -0.9795752496,  -0.9792228106, -0.9788673888,
+    -0.9785089851, -0.9781476007, -0.9777832368,  -0.9774158943, -0.9770455744,
+    -0.9766722783, -0.9762960071, -0.9759167619,  -0.9755345439, -0.9751493543,
+    -0.9747611942, -0.9743700648, -0.9739759673,  -0.9735789029, -0.9731788728,
+    -0.9727758782, -0.9723699204, -0.9719610006,  -0.9715491200, -0.9711342799,
+    -0.9707164816, -0.9702957263, -0.9698720153,  -0.9694453499, -0.9690157314,
+    -0.9685831611, -0.9681476404, -0.9677091705,  -0.9672677528, -0.9668233886,
+    -0.9663760793, -0.9659258263, -0.9654726309,  -0.9650164945, -0.9645574185,
+    -0.9640954042, -0.9636304532, -0.9631625668,  -0.9626917464, -0.9622179935,
+    -0.9617413095, -0.9612616959, -0.9607791542,  -0.9602936857, -0.9598052920,
+    -0.9593139745, -0.9588197349, -0.9583225745,  -0.9578224948, -0.9573194975,
+    -0.9568135841, -0.9563047560, -0.9557930148,  -0.9552783621, -0.9547607995,
+    -0.9542403285, -0.9537169507, -0.9531906678,  -0.9526614813, -0.9521293927,
+    -0.9515944039, -0.9510565163, -0.9505157316,  -0.9499720515, -0.9494254776,
+    -0.9488760116, -0.9483236552, -0.9477684100,  -0.9472102777, -0.9466492601,
+    -0.9460853588, -0.9455185756, -0.9449489122,  -0.9443763702, -0.9438009516,
+    -0.9432226579, -0.9426414911, -0.9420574528,  -0.9414705448, -0.9408807690,
+    -0.9402881270, -0.9396926208, -0.9390942521,  -0.9384930228, -0.9378889346,
+    -0.9372819895, -0.9366721892, -0.9360595357,  -0.9354440308, -0.9348256764,
+    -0.9342044743, -0.9335804265, -0.9329535348,  -0.9323238012, -0.9316912276,
+    -0.9310558159, -0.9304175680, -0.9297764859,  -0.9291325715, -0.9284858269,
+    -0.9278362539, -0.9271838546, -0.9265286309,  -0.9258705848, -0.9252097184,
+    -0.9245460336, -0.9238795325, -0.9232102171,  -0.9225380895, -0.9218631516,
+    -0.9211854056, -0.9205048535, -0.9198214973,  -0.9191353393, -0.9184463813,
+    -0.9177546257, -0.9170600744, -0.9163627296,  -0.9156625933, -0.9149596678,
+    -0.9142539552, -0.9135454576, -0.9128341772,  -0.9121201162, -0.9114032766,
+    -0.9106836608, -0.9099612709, -0.9092361090,  -0.9085081775, -0.9077774785,
+    -0.9070440143, -0.9063077870, -0.9055687990,  -0.9048270525, -0.9040825497,
+    -0.9033352929, -0.9025852843, -0.9018325264,  -0.9010770213, -0.9003187714,
+    -0.8995577790, -0.8987940463, -0.8980275758,  -0.8972583697, -0.8964864304,
+    -0.8957117602, -0.8949343616, -0.8941542368,  -0.8933713883, -0.8925858185,
+    -0.8917975296, -0.8910065242, -0.8902128046,  -0.8894163733, -0.8886172327,
+    -0.8878153851, -0.8870108332, -0.8862035792,  -0.8853936258, -0.8845809752,
+    -0.8837656301, -0.8829475929, -0.8821268660,  -0.8813034521, -0.8804773535,
+    -0.8796485729, -0.8788171127, -0.8779829754,  -0.8771461637, -0.8763066800,
+    -0.8754645270, -0.8746197071, -0.8737722230,  -0.8729220773, -0.8720692724,
+    -0.8712138111, -0.8703556959, -0.8694949295,  -0.8686315144, -0.8677654534,
+    -0.8668967489, -0.8660254038, -0.8651514206,  -0.8642748020, -0.8633955506,
+    -0.8625136692, -0.8616291604, -0.8607420270,  -0.8598522716, -0.8589598969,
+    -0.8580649057, -0.8571673007, -0.8562670846,  -0.8553642602, -0.8544588301,
+    -0.8535507973, -0.8526401644, -0.8517269341,  -0.8508111094, -0.8498926930,
+    -0.8489716876, -0.8480480962, -0.8471219214,  -0.8461931661, -0.8452618332,
+    -0.8443279255, -0.8433914458, -0.8424523970,  -0.8415107819, -0.8405666035,
+    -0.8396198645, -0.8386705679, -0.8377187166,  -0.8367643135, -0.8358073614,
+    -0.8348478633, -0.8338858221, -0.8329212407,  -0.8319541221, -0.8309844693,
+    -0.8300122851, -0.8290375726, -0.8280603346,  -0.8270805743, -0.8260982945,
+    -0.8251134983, -0.8241261886, -0.8231363685,  -0.8221440410, -0.8211492091,
+    -0.8201518759, -0.8191520443, -0.8181497174,  -0.8171448983, -0.8161375901,
+    -0.8151277957, -0.8141155184, -0.8131007610,  -0.8120835269, -0.8110638190,
+    -0.8100416404, -0.8090169944, -0.8079898839,  -0.8069603121, -0.8059282822,
+    -0.8048937974, -0.8038568606, -0.8028174752,  -0.8017756442, -0.8007313709,
+    -0.7996846585, -0.7986355100, -0.7975839288,  -0.7965299180, -0.7954734809,
+    -0.7944146205, -0.7933533403, -0.7922896434,  -0.7912235330, -0.7901550124,
+    -0.7890840848, -0.7880107536, -0.7869350220,  -0.7858568932, -0.7847763705,
+    -0.7836934573, -0.7826081569, -0.7815204724,  -0.7804304073, -0.7793379649,
+    -0.7782431485, -0.7771459615, -0.7760464071,  -0.7749444887, -0.7738402097,
+    -0.7727335735, -0.7716245834, -0.7705132428,  -0.7693995550, -0.7682835236,
+    -0.7671651518, -0.7660444431, -0.7649214009,  -0.7637960286, -0.7626683297,
+    -0.7615383075, -0.7604059656, -0.7592713073,  -0.7581343362, -0.7569950557,
+    -0.7558534692, -0.7547095802, -0.7535633923,  -0.7524149089, -0.7512641335,
+    -0.7501110696, -0.7489557208, -0.7477980905,  -0.7466381823, -0.7454759997,
+    -0.7443115462, -0.7431448255, -0.7419758410,  -0.7408045963, -0.7396310950,
+    -0.7384553406, -0.7372773368, -0.7360970871,  -0.7349145951, -0.7337298645,
+    -0.7325428988, -0.7313537016, -0.7301622766,  -0.7289686274, -0.7277727577,
+    -0.7265746710, -0.7253743710, -0.7241718614,  -0.7229671459, -0.7217602281,
+    -0.7205511117, -0.7193398003, -0.7181262978,  -0.7169106077, -0.7156927337,
+    -0.7144726796, -0.7132504492, -0.7120260460,  -0.7107994739, -0.7095707365,
+    -0.7083398377, -0.7071067812, -0.7058715707,  -0.7046342100, -0.7033947028,
+    -0.7021530530, -0.7009092643, -0.6996633405,  -0.6984152854, -0.6971651029,
+    -0.6959127966, -0.6946583705, -0.6934018283,  -0.6921431739, -0.6908824111,
+    -0.6896195437, -0.6883545757, -0.6870875108,  -0.6858183529, -0.6845471059,
+    -0.6832737737, -0.6819983601, -0.6807208690,  -0.6794413043, -0.6781596699,
+    -0.6768759697, -0.6755902076, -0.6743023876,  -0.6730125135, -0.6717205893,
+    -0.6704266190, -0.6691306064, -0.6678325555,  -0.6665324702, -0.6652303547,
+    -0.6639262127, -0.6626200482, -0.6613118653,  -0.6600016680, -0.6586894601,
+    -0.6573752458, -0.6560590290, -0.6547408137,  -0.6534206040, -0.6520984038,
+    -0.6507742173, -0.6494480483, -0.6481199011,  -0.6467897795, -0.6454576877,
+    -0.6441236298, -0.6427876097, -0.6414496316,  -0.6401096995, -0.6387678175,
+    -0.6374239897, -0.6360782203, -0.6347305132,  -0.6333808726, -0.6320293027,
+    -0.6306758074, -0.6293203910, -0.6279630576,  -0.6266038114, -0.6252426563,
+    -0.6238795967, -0.6225146366, -0.6211477803,  -0.6197790318, -0.6184083954,
+    -0.6170358751, -0.6156614753, -0.6142852001,  -0.6129070537, -0.6115270402,
+    -0.6101451639, -0.6087614290, -0.6073758397,  -0.6059884003, -0.6045991149,
+    -0.6032079877, -0.6018150232, -0.6004202253,  -0.5990235985, -0.5976251470,
+    -0.5962248750, -0.5948227868, -0.5934188866,  -0.5920131788, -0.5906056676,
+    -0.5891963574, -0.5877852523, -0.5863723567,  -0.5849576750, -0.5835412114,
+    -0.5821229702, -0.5807029557, -0.5792811723,  -0.5778576244, -0.5764323162,
+    -0.5750052520, -0.5735764364, -0.5721458734,  -0.5707135677, -0.5692795234,
+    -0.5678437451, -0.5664062369, -0.5649670034,  -0.5635260489, -0.5620833779,
+    -0.5606389946, -0.5591929035, -0.5577451090,  -0.5562956155, -0.5548444274,
+    -0.5533915492, -0.5519369853, -0.5504807401,  -0.5490228180, -0.5475632235,
+    -0.5461019610, -0.5446390350, -0.5431744500,  -0.5417082103, -0.5402403205,
+    -0.5387707850, -0.5372996083, -0.5358267950,  -0.5343523494, -0.5328762761,
+    -0.5313985795, -0.5299192642, -0.5284383347,  -0.5269557955, -0.5254716511,
+    -0.5239859060, -0.5224985647, -0.5210096318,  -0.5195191119, -0.5180270094,
+    -0.5165333289, -0.5150380749, -0.5135412521,  -0.5120428649, -0.5105429179,
+    -0.5090414158, -0.5075383630, -0.5060337641,  -0.5045276238, -0.5030199466,
+    -0.5015107372, -0.5000000000, -0.4984877398,  -0.4969739610, -0.4954586684,
+    -0.4939418666, -0.4924235601, -0.4909037536,  -0.4893824517, -0.4878596591,
+    -0.4863353804, -0.4848096202, -0.4832823833,  -0.4817536741, -0.4802234974,
+    -0.4786918579, -0.4771587603, -0.4756242091,  -0.4740882090, -0.4725507649,
+    -0.4710118812, -0.4694715628, -0.4679298143,  -0.4663866403, -0.4648420457,
+    -0.4632960351, -0.4617486132, -0.4601997848,  -0.4586495545, -0.4570979271,
+    -0.4555449072, -0.4539904997, -0.4524347093,  -0.4508775407, -0.4493189986,
+    -0.4477590878, -0.4461978131, -0.4446351792,  -0.4430711908, -0.4415058528,
+    -0.4399391699, -0.4383711468, -0.4368017884,  -0.4352310994, -0.4336590846,
+    -0.4320857488, -0.4305110968, -0.4289351334,  -0.4273578634, -0.4257792916,
+    -0.4241994227, -0.4226182617, -0.4210358134,  -0.4194520824, -0.4178670738,
+    -0.4162807923, -0.4146932427, -0.4131044298,  -0.4115143586, -0.4099230338,
+    -0.4083304604, -0.4067366431, -0.4051415868,  -0.4035452964, -0.4019477767,
+    -0.4003490326, -0.3987490689, -0.3971478906,  -0.3955455026, -0.3939419096,
+    -0.3923371166, -0.3907311285, -0.3891239501,  -0.3875155865, -0.3859060423,
+    -0.3842953227, -0.3826834324, -0.3810703764,  -0.3794561595, -0.3778407868,
+    -0.3762242631, -0.3746065934, -0.3729877826,  -0.3713678356, -0.3697467573,
+    -0.3681245527, -0.3665012267, -0.3648767843,  -0.3632512305, -0.3616245701,
+    -0.3599968081, -0.3583679495, -0.3567379993,  -0.3551069624, -0.3534748438,
+    -0.3518416484, -0.3502073813, -0.3485720473,  -0.3469356516, -0.3452981990,
+    -0.3436596946, -0.3420201433, -0.3403795502,  -0.3387379202, -0.3370952584,
+    -0.3354515698, -0.3338068592, -0.3321611319,  -0.3305143927, -0.3288666467,
+    -0.3272178990, -0.3255681545, -0.3239174182,  -0.3222656952, -0.3206129906,
+    -0.3189593093, -0.3173046564, -0.3156490369,  -0.3139924560, -0.3123349185,
+    -0.3106764296, -0.3090169944, -0.3073566178,  -0.3056953050, -0.3040330609,
+    -0.3023698908, -0.3007057995, -0.2990407923,  -0.2973748741, -0.2957080500,
+    -0.2940403252, -0.2923717047, -0.2907021936,  -0.2890317969, -0.2873605198,
+    -0.2856883674, -0.2840153447, -0.2823414568,  -0.2806667089, -0.2789911060,
+    -0.2773146533, -0.2756373558, -0.2739592187,  -0.2722802470, -0.2706004460,
+    -0.2689198206, -0.2672383761, -0.2655561175,  -0.2638730500, -0.2621891786,
+    -0.2605045086, -0.2588190451, -0.2571327932,  -0.2554457579, -0.2537579446,
+    -0.2520693582, -0.2503800041, -0.2486898872,  -0.2469990127, -0.2453073859,
+    -0.2436150118, -0.2419218956, -0.2402280425,  -0.2385334576, -0.2368381461,
+    -0.2351421131, -0.2334453639, -0.2317479035,  -0.2300497372, -0.2283508701,
+    -0.2266513074, -0.2249510543, -0.2232501160,  -0.2215484976, -0.2198462044,
+    -0.2181432414, -0.2164396139, -0.2147353272,  -0.2130303863, -0.2113247965,
+    -0.2096185629, -0.2079116908, -0.2062041854,  -0.2044960518, -0.2027872954,
+    -0.2010779211, -0.1993679344, -0.1976573404,  -0.1959461442, -0.1942343512,
+    -0.1925219665, -0.1908089954, -0.1890954430,  -0.1873813146, -0.1856666154,
+    -0.1839513506, -0.1822355255, -0.1805191453,  -0.1788022151, -0.1770847403,
+    -0.1753667261, -0.1736481777, -0.1719291003,  -0.1702094992, -0.1684893796,
+    -0.1667687467, -0.1650476059, -0.1633259622,  -0.1616038211, -0.1598811877,
+    -0.1581580673, -0.1564344650, -0.1547103863,  -0.1529858363, -0.1512608202,
+    -0.1495353434, -0.1478094111, -0.1460830286,  -0.1443562010, -0.1426289337,
+    -0.1409012319, -0.1391731010, -0.1374445460,  -0.1357155724, -0.1339861854,
+    -0.1322563903, -0.1305261922, -0.1287955966,  -0.1270646086, -0.1253332336,
+    -0.1236014767, -0.1218693434, -0.1201368388,  -0.1184039683, -0.1166707371,
+    -0.1149371505, -0.1132032138, -0.1114689322,  -0.1097343111, -0.1079993557,
+    -0.1062640713, -0.1045284633, -0.1027925368,  -0.1010562972, -0.0993197497,
+    -0.0975828998, -0.0958457525, -0.0941083133,  -0.0923705874, -0.0906325802,
+    -0.0888942969, -0.0871557427, -0.0854169231,  -0.0836778433, -0.0819385086,
+    -0.0801989243, -0.0784590957, -0.0767190281,  -0.0749787268, -0.0732381971,
+    -0.0714974443, -0.0697564737, -0.0680152907,  -0.0662739004, -0.0645323083,
+    -0.0627905195, -0.0610485395, -0.0593063736,  -0.0575640270, -0.0558215050,
+    -0.0540788130, -0.0523359562, -0.0505929401,  -0.0488497698, -0.0471064507,
+    -0.0453629881, -0.0436193874, -0.0418756537,  -0.0401317925, -0.0383878091,
+    -0.0366437087, -0.0348994967, -0.0331551784,  -0.0314107591, -0.0296662441,
+    -0.0279216387, -0.0261769483, -0.0244321782,  -0.0226873336, -0.0209424199,
+    -0.0191974424, -0.0174524064, -0.0157073173,  -0.0139621803, -0.0122170008,
+    -0.0104717841, -0.0087265355, -0.0069812603,  -0.0052359638, -0.0034906514,
+    -0.0017453284
+};
+
+float fcosinus[3600] =
+{
+    1.0000000000,  0.9999984769,  0.9999939077,   0.9999862922,
+    0.9999756307,  0.9999619231,  0.9999451694,   0.9999253697,  0.9999025240,
+    0.9998766325,  0.9998476952,  0.9998157121,   0.9997806835,  0.9997426093,
+    0.9997014898,  0.9996573250,  0.9996101150,   0.9995598601,  0.9995065604,
+    0.9994502159,  0.9993908270,  0.9993283938,   0.9992629164,  0.9991943951,
+    0.9991228301,  0.9990482216,  0.9989705698,   0.9988898750,  0.9988061373,
+    0.9987193572,  0.9986295348,  0.9985366703,   0.9984407642,  0.9983418166,
+    0.9982398279,  0.9981347984,  0.9980267284,   0.9979156183,  0.9978014683,
+    0.9976842788,  0.9975640503,  0.9974407829,   0.9973144772,  0.9971851335,
+    0.9970527522,  0.9969173337,  0.9967788785,   0.9966373868,  0.9964928592,
+    0.9963452962,  0.9961946981,  0.9960410654,   0.9958843986,  0.9957246982,
+    0.9955619646,  0.9953961984,  0.9952274000,   0.9950555700,  0.9948807088,
+    0.9947028171,  0.9945218954,  0.9943379441,   0.9941509640,  0.9939609555,
+    0.9937679192,  0.9935718557,  0.9933727656,   0.9931706495,  0.9929655081,
+    0.9927573419,  0.9925461516,  0.9923319379,   0.9921147013,  0.9918944426,
+    0.9916711624,  0.9914448614,  0.9912155403,   0.9909831997,  0.9907478405,
+    0.9905094632,  0.9902680687,  0.9900236577,   0.9897762309,  0.9895257891,
+    0.9892723330,  0.9890158634,  0.9887563810,   0.9884938868,  0.9882283814,
+    0.9879598658,  0.9876883406,  0.9874138068,   0.9871362651,  0.9868557164,
+    0.9865721616,  0.9862856015,  0.9859960371,   0.9857034691,  0.9854078985,
+    0.9851093262,  0.9848077530,  0.9845031800,   0.9841956080,  0.9838850379,
+    0.9835714708,  0.9832549076,  0.9829353491,   0.9826127965,  0.9822872507,
+    0.9819587127,  0.9816271834,  0.9812926640,   0.9809551553,  0.9806146585,
+    0.9802711746,  0.9799247046,  0.9795752496,   0.9792228106,  0.9788673888,
+    0.9785089851,  0.9781476007,  0.9777832368,   0.9774158943,  0.9770455744,
+    0.9766722783,  0.9762960071,  0.9759167619,   0.9755345439,  0.9751493543,
+    0.9747611942,  0.9743700648,  0.9739759673,   0.9735789029,  0.9731788728,
+    0.9727758782,  0.9723699204,  0.9719610006,   0.9715491200,  0.9711342799,
+    0.9707164816,  0.9702957263,  0.9698720153,   0.9694453499,  0.9690157314,
+    0.9685831611,  0.9681476404,  0.9677091705,   0.9672677528,  0.9668233886,
+    0.9663760793,  0.9659258263,  0.9654726309,   0.9650164945,  0.9645574185,
+    0.9640954042,  0.9636304532,  0.9631625668,   0.9626917464,  0.9622179935,
+    0.9617413095,  0.9612616959,  0.9607791542,   0.9602936857,  0.9598052920,
+    0.9593139745,  0.9588197349,  0.9583225745,   0.9578224948,  0.9573194975,
+    0.9568135841,  0.9563047560,  0.9557930148,   0.9552783621,  0.9547607995,
+    0.9542403285,  0.9537169507,  0.9531906678,   0.9526614813,  0.9521293927,
+    0.9515944039,  0.9510565163,  0.9505157316,   0.9499720515,  0.9494254776,
+    0.9488760116,  0.9483236552,  0.9477684100,   0.9472102777,  0.9466492601,
+    0.9460853588,  0.9455185756,  0.9449489122,   0.9443763702,  0.9438009516,
+    0.9432226579,  0.9426414911,  0.9420574528,   0.9414705448,  0.9408807690,
+    0.9402881270,  0.9396926208,  0.9390942521,   0.9384930228,  0.9378889346,
+    0.9372819895,  0.9366721892,  0.9360595357,   0.9354440308,  0.9348256764,
+    0.9342044743,  0.9335804265,  0.9329535348,   0.9323238012,  0.9316912276,
+    0.9310558159,  0.9304175680,  0.9297764859,   0.9291325715,  0.9284858269,
+    0.9278362539,  0.9271838546,  0.9265286309,   0.9258705848,  0.9252097184,
+    0.9245460336,  0.9238795325,  0.9232102171,   0.9225380895,  0.9218631516,
+    0.9211854056,  0.9205048535,  0.9198214973,   0.9191353393,  0.9184463813,
+    0.9177546257,  0.9170600744,  0.9163627296,   0.9156625933,  0.9149596678,
+    0.9142539552,  0.9135454576,  0.9128341772,   0.9121201162,  0.9114032766,
+    0.9106836608,  0.9099612709,  0.9092361090,   0.9085081775,  0.9077774785,
+    0.9070440143,  0.9063077870,  0.9055687990,   0.9048270525,  0.9040825497,
+    0.9033352929,  0.9025852843,  0.9018325264,   0.9010770213,  0.9003187714,
+    0.8995577790,  0.8987940463,  0.8980275758,   0.8972583697,  0.8964864304,
+    0.8957117602,  0.8949343616,  0.8941542368,   0.8933713883,  0.8925858185,
+    0.8917975296,  0.8910065242,  0.8902128046,   0.8894163733,  0.8886172327,
+    0.8878153851,  0.8870108332,  0.8862035792,   0.8853936258,  0.8845809752,
+    0.8837656301,  0.8829475929,  0.8821268660,   0.8813034521,  0.8804773535,
+    0.8796485729,  0.8788171127,  0.8779829754,   0.8771461637,  0.8763066800,
+    0.8754645270,  0.8746197071,  0.8737722230,   0.8729220773,  0.8720692724,
+    0.8712138111,  0.8703556959,  0.8694949295,   0.8686315144,  0.8677654534,
+    0.8668967489,  0.8660254038,  0.8651514206,   0.8642748020,  0.8633955506,
+    0.8625136692,  0.8616291604,  0.8607420270,   0.8598522716,  0.8589598969,
+    0.8580649057,  0.8571673007,  0.8562670846,   0.8553642602,  0.8544588301,
+    0.8535507973,  0.8526401644,  0.8517269341,   0.8508111094,  0.8498926930,
+    0.8489716876,  0.8480480962,  0.8471219214,   0.8461931661,  0.8452618332,
+    0.8443279255,  0.8433914458,  0.8424523970,   0.8415107819,  0.8405666035,
+    0.8396198645,  0.8386705679,  0.8377187166,   0.8367643135,  0.8358073614,
+    0.8348478633,  0.8338858221,  0.8329212407,   0.8319541221,  0.8309844693,
+    0.8300122851,  0.8290375726,  0.8280603346,   0.8270805743,  0.8260982945,
+    0.8251134983,  0.8241261886,  0.8231363685,   0.8221440410,  0.8211492091,
+    0.8201518759,  0.8191520443,  0.8181497174,   0.8171448983,  0.8161375901,
+    0.8151277957,  0.8141155184,  0.8131007610,   0.8120835269,  0.8110638190,
+    0.8100416404,  0.8090169944,  0.8079898839,   0.8069603121,  0.8059282822,
+    0.8048937974,  0.8038568606,  0.8028174752,   0.8017756442,  0.8007313709,
+    0.7996846585,  0.7986355100,  0.7975839288,   0.7965299180,  0.7954734809,
+    0.7944146205,  0.7933533403,  0.7922896434,   0.7912235330,  0.7901550124,
+    0.7890840848,  0.7880107536,  0.7869350220,   0.7858568932,  0.7847763705,
+    0.7836934573,  0.7826081569,  0.7815204724,   0.7804304073,  0.7793379649,
+    0.7782431485,  0.7771459615,  0.7760464071,   0.7749444887,  0.7738402097,
+    0.7727335735,  0.7716245834,  0.7705132428,   0.7693995550,  0.7682835236,
+    0.7671651518,  0.7660444431,  0.7649214009,   0.7637960286,  0.7626683297,
+    0.7615383075,  0.7604059656,  0.7592713073,   0.7581343362,  0.7569950557,
+    0.7558534692,  0.7547095802,  0.7535633923,   0.7524149089,  0.7512641335,
+    0.7501110696,  0.7489557208,  0.7477980905,   0.7466381823,  0.7454759997,
+    0.7443115462,  0.7431448255,  0.7419758410,   0.7408045963,  0.7396310950,
+    0.7384553406,  0.7372773368,  0.7360970871,   0.7349145951,  0.7337298645,
+    0.7325428988,  0.7313537016,  0.7301622766,   0.7289686274,  0.7277727577,
+    0.7265746710,  0.7253743710,  0.7241718614,   0.7229671459,  0.7217602281,
+    0.7205511117,  0.7193398003,  0.7181262978,   0.7169106077,  0.7156927337,
+    0.7144726796,  0.7132504492,  0.7120260460,   0.7107994739,  0.7095707365,
+    0.7083398377,  0.7071067812,  0.7058715707,   0.7046342100,  0.7033947028,
+    0.7021530530,  0.7009092643,  0.6996633405,   0.6984152854,  0.6971651029,
+    0.6959127966,  0.6946583705,  0.6934018283,   0.6921431739,  0.6908824111,
+    0.6896195437,  0.6883545757,  0.6870875108,   0.6858183529,  0.6845471059,
+    0.6832737737,  0.6819983601,  0.6807208690,   0.6794413043,  0.6781596699,
+    0.6768759697,  0.6755902076,  0.6743023876,   0.6730125135,  0.6717205893,
+    0.6704266190,  0.6691306064,  0.6678325555,   0.6665324702,  0.6652303547,
+    0.6639262127,  0.6626200482,  0.6613118653,   0.6600016680,  0.6586894601,
+    0.6573752458,  0.6560590290,  0.6547408137,   0.6534206040,  0.6520984038,
+    0.6507742173,  0.6494480483,  0.6481199011,   0.6467897795,  0.6454576877,
+    0.6441236298,  0.6427876097,  0.6414496316,   0.6401096995,  0.6387678175,
+    0.6374239897,  0.6360782203,  0.6347305132,   0.6333808726,  0.6320293027,
+    0.6306758074,  0.6293203910,  0.6279630576,   0.6266038114,  0.6252426563,
+    0.6238795967,  0.6225146366,  0.6211477803,   0.6197790318,  0.6184083954,
+    0.6170358751,  0.6156614753,  0.6142852001,   0.6129070537,  0.6115270402,
+    0.6101451639,  0.6087614290,  0.6073758397,   0.6059884003,  0.6045991149,
+    0.6032079877,  0.6018150232,  0.6004202253,   0.5990235985,  0.5976251470,
+    0.5962248750,  0.5948227868,  0.5934188866,   0.5920131788,  0.5906056676,
+    0.5891963574,  0.5877852523,  0.5863723567,   0.5849576750,  0.5835412114,
+    0.5821229702,  0.5807029557,  0.5792811723,   0.5778576244,  0.5764323162,
+    0.5750052520,  0.5735764364,  0.5721458734,   0.5707135677,  0.5692795234,
+    0.5678437451,  0.5664062369,  0.5649670034,   0.5635260489,  0.5620833779,
+    0.5606389946,  0.5591929035,  0.5577451090,   0.5562956155,  0.5548444274,
+    0.5533915492,  0.5519369853,  0.5504807401,   0.5490228180,  0.5475632235,
+    0.5461019610,  0.5446390350,  0.5431744500,   0.5417082103,  0.5402403205,
+    0.5387707850,  0.5372996083,  0.5358267950,   0.5343523494,  0.5328762761,
+    0.5313985795,  0.5299192642,  0.5284383347,   0.5269557955,  0.5254716511,
+    0.5239859060,  0.5224985647,  0.5210096318,   0.5195191119,  0.5180270094,
+    0.5165333289,  0.5150380749,  0.5135412521,   0.5120428649,  0.5105429179,
+    0.5090414158,  0.5075383630,  0.5060337641,   0.5045276238,  0.5030199466,
+    0.5015107372,  0.5000000000,  0.4984877398,   0.4969739610,  0.4954586684,
+    0.4939418666,  0.4924235601,  0.4909037536,   0.4893824517,  0.4878596591,
+    0.4863353804,  0.4848096202,  0.4832823833,   0.4817536741,  0.4802234974,
+    0.4786918579,  0.4771587603,  0.4756242091,   0.4740882090,  0.4725507649,
+    0.4710118812,  0.4694715628,  0.4679298143,   0.4663866403,  0.4648420457,
+    0.4632960351,  0.4617486132,  0.4601997848,   0.4586495545,  0.4570979271,
+    0.4555449072,  0.4539904997,  0.4524347093,   0.4508775407,  0.4493189986,
+    0.4477590878,  0.4461978131,  0.4446351792,   0.4430711908,  0.4415058528,
+    0.4399391699,  0.4383711468,  0.4368017884,   0.4352310994,  0.4336590846,
+    0.4320857488,  0.4305110968,  0.4289351334,   0.4273578634,  0.4257792916,
+    0.4241994227,  0.4226182617,  0.4210358134,   0.4194520824,  0.4178670738,
+    0.4162807923,  0.4146932427,  0.4131044298,   0.4115143586,  0.4099230338,
+    0.4083304604,  0.4067366431,  0.4051415868,   0.4035452964,  0.4019477767,
+    0.4003490326,  0.3987490689,  0.3971478906,   0.3955455026,  0.3939419096,
+    0.3923371166,  0.3907311285,  0.3891239501,   0.3875155865,  0.3859060423,
+    0.3842953227,  0.3826834324,  0.3810703764,   0.3794561595,  0.3778407868,
+    0.3762242631,  0.3746065934,  0.3729877826,   0.3713678356,  0.3697467573,
+    0.3681245527,  0.3665012267,  0.3648767843,   0.3632512305,  0.3616245701,
+    0.3599968081,  0.3583679495,  0.3567379993,   0.3551069624,  0.3534748438,
+    0.3518416484,  0.3502073813,  0.3485720473,   0.3469356516,  0.3452981990,
+    0.3436596946,  0.3420201433,  0.3403795502,   0.3387379202,  0.3370952584,
+    0.3354515698,  0.3338068592,  0.3321611319,   0.3305143927,  0.3288666467,
+    0.3272178990,  0.3255681545,  0.3239174182,   0.3222656952,  0.3206129906,
+    0.3189593093,  0.3173046564,  0.3156490369,   0.3139924560,  0.3123349185,
+    0.3106764296,  0.3090169944,  0.3073566178,   0.3056953050,  0.3040330609,
+    0.3023698908,  0.3007057995,  0.2990407923,   0.2973748741,  0.2957080500,
+    0.2940403252,  0.2923717047,  0.2907021936,   0.2890317969,  0.2873605198,
+    0.2856883674,  0.2840153447,  0.2823414568,   0.2806667089,  0.2789911060,
+    0.2773146533,  0.2756373558,  0.2739592187,   0.2722802470,  0.2706004460,
+    0.2689198206,  0.2672383761,  0.2655561175,   0.2638730500,  0.2621891786,
+    0.2605045086,  0.2588190451,  0.2571327932,   0.2554457579,  0.2537579446,
+    0.2520693582,  0.2503800041,  0.2486898872,   0.2469990127,  0.2453073859,
+    0.2436150118,  0.2419218956,  0.2402280425,   0.2385334576,  0.2368381461,
+    0.2351421131,  0.2334453639,  0.2317479035,   0.2300497372,  0.2283508701,
+    0.2266513074,  0.2249510543,  0.2232501160,   0.2215484976,  0.2198462044,
+    0.2181432414,  0.2164396139,  0.2147353272,   0.2130303863,  0.2113247965,
+    0.2096185629,  0.2079116908,  0.2062041854,   0.2044960518,  0.2027872954,
+    0.2010779211,  0.1993679344,  0.1976573404,   0.1959461442,  0.1942343512,
+    0.1925219665,  0.1908089954,  0.1890954430,   0.1873813146,  0.1856666154,
+    0.1839513506,  0.1822355255,  0.1805191453,   0.1788022151,  0.1770847403,
+    0.1753667261,  0.1736481777,  0.1719291003,   0.1702094992,  0.1684893796,
+    0.1667687467,  0.1650476059,  0.1633259622,   0.1616038211,  0.1598811877,
+    0.1581580673,  0.1564344650,  0.1547103863,   0.1529858363,  0.1512608202,
+    0.1495353434,  0.1478094111,  0.1460830286,   0.1443562010,  0.1426289337,
+    0.1409012319,  0.1391731010,  0.1374445460,   0.1357155724,  0.1339861854,
+    0.1322563903,  0.1305261922,  0.1287955966,   0.1270646086,  0.1253332336,
+    0.1236014767,  0.1218693434,  0.1201368388,   0.1184039683,  0.1166707371,
+    0.1149371505,  0.1132032138,  0.1114689322,   0.1097343111,  0.1079993557,
+    0.1062640713,  0.1045284633,  0.1027925368,   0.1010562972,  0.0993197497,
+    0.0975828998,  0.0958457525,  0.0941083133,   0.0923705874,  0.0906325802,
+    0.0888942969,  0.0871557427,  0.0854169231,   0.0836778433,  0.0819385086,
+    0.0801989243,  0.0784590957,  0.0767190281,   0.0749787268,  0.0732381971,
+    0.0714974443,  0.0697564737,  0.0680152907,   0.0662739004,  0.0645323083,
+    0.0627905195,  0.0610485395,  0.0593063736,   0.0575640270,  0.0558215050,
+    0.0540788130,  0.0523359562,  0.0505929401,   0.0488497698,  0.0471064507,
+    0.0453629881,  0.0436193874,  0.0418756537,   0.0401317925,  0.0383878091,
+    0.0366437087,  0.0348994967,  0.0331551784,   0.0314107591,  0.0296662441,
+    0.0279216387,  0.0261769483,  0.0244321782,   0.0226873336,  0.0209424199,
+    0.0191974424,  0.0174524064,  0.0157073173,   0.0139621803,  0.0122170008,
+    0.0104717841,  0.0087265355,  0.0069812603,   0.0052359638,  0.0034906514,
+    0.0017453284,  0.0000000000,  -0.0017453284,  -0.0034906514, -0.0052359638,
+    -0.0069812603, -0.0087265355, -0.0104717841,  -0.0122170008, -0.0139621803,
+    -0.0157073173, -0.0174524064, -0.0191974424,  -0.0209424199, -0.0226873336,
+    -0.0244321782, -0.0261769483, -0.0279216387,  -0.0296662441, -0.0314107591,
+    -0.0331551784, -0.0348994967, -0.0366437087,  -0.0383878091, -0.0401317925,
+    -0.0418756537, -0.0436193874, -0.0453629881,  -0.0471064507, -0.0488497698,
+    -0.0505929401, -0.0523359562, -0.0540788130,  -0.0558215050, -0.0575640270,
+    -0.0593063736, -0.0610485395, -0.0627905195,  -0.0645323083, -0.0662739004,
+    -0.0680152907, -0.0697564737, -0.0714974443,  -0.0732381971, -0.0749787268,
+    -0.0767190281, -0.0784590957, -0.0801989243,  -0.0819385086, -0.0836778433,
+    -0.0854169231, -0.0871557427, -0.0888942969,  -0.0906325802, -0.0923705874,
+    -0.0941083133, -0.0958457525, -0.0975828998,  -0.0993197497, -0.1010562972,
+    -0.1027925368, -0.1045284633, -0.1062640713,  -0.1079993557, -0.1097343111,
+    -0.1114689322, -0.1132032138, -0.1149371505,  -0.1166707371, -0.1184039683,
+    -0.1201368388, -0.1218693434, -0.1236014767,  -0.1253332336, -0.1270646086,
+    -0.1287955966, -0.1305261922, -0.1322563903,  -0.1339861854, -0.1357155724,
+    -0.1374445460, -0.1391731010, -0.1409012319,  -0.1426289337, -0.1443562010,
+    -0.1460830286, -0.1478094111, -0.1495353434,  -0.1512608202, -0.1529858363,
+    -0.1547103863, -0.1564344650, -0.1581580673,  -0.1598811877, -0.1616038211,
+    -0.1633259622, -0.1650476059, -0.1667687467,  -0.1684893796, -0.1702094992,
+    -0.1719291003, -0.1736481777, -0.1753667261,  -0.1770847403, -0.1788022151,
+    -0.1805191453, -0.1822355255, -0.1839513506,  -0.1856666154, -0.1873813146,
+    -0.1890954430, -0.1908089954, -0.1925219665,  -0.1942343512, -0.1959461442,
+    -0.1976573404, -0.1993679344, -0.2010779211,  -0.2027872954, -0.2044960518,
+    -0.2062041854, -0.2079116908, -0.2096185629,  -0.2113247965, -0.2130303863,
+    -0.2147353272, -0.2164396139, -0.2181432414,  -0.2198462044, -0.2215484976,
+    -0.2232501160, -0.2249510543, -0.2266513074,  -0.2283508701, -0.2300497372,
+    -0.2317479035, -0.2334453639, -0.2351421131,  -0.2368381461, -0.2385334576,
+    -0.2402280425, -0.2419218956, -0.2436150118,  -0.2453073859, -0.2469990127,
+    -0.2486898872, -0.2503800041, -0.2520693582,  -0.2537579446, -0.2554457579,
+    -0.2571327932, -0.2588190451, -0.2605045086,  -0.2621891786, -0.2638730500,
+    -0.2655561175, -0.2672383761, -0.2689198206,  -0.2706004460, -0.2722802470,
+    -0.2739592187, -0.2756373558, -0.2773146533,  -0.2789911060, -0.2806667089,
+    -0.2823414568, -0.2840153447, -0.2856883674,  -0.2873605198, -0.2890317969,
+    -0.2907021936, -0.2923717047, -0.2940403252,  -0.2957080500, -0.2973748741,
+    -0.2990407923, -0.3007057995, -0.3023698908,  -0.3040330609, -0.3056953050,
+    -0.3073566178, -0.3090169944, -0.3106764296,  -0.3123349185, -0.3139924560,
+    -0.3156490369, -0.3173046564, -0.3189593093,  -0.3206129906, -0.3222656952,
+    -0.3239174182, -0.3255681545, -0.3272178990,  -0.3288666467, -0.3305143927,
+    -0.3321611319, -0.3338068592, -0.3354515698,  -0.3370952584, -0.3387379202,
+    -0.3403795502, -0.3420201433, -0.3436596946,  -0.3452981990, -0.3469356516,
+    -0.3485720473, -0.3502073813, -0.3518416484,  -0.3534748438, -0.3551069624,
+    -0.3567379993, -0.3583679495, -0.3599968081,  -0.3616245701, -0.3632512305,
+    -0.3648767843, -0.3665012267, -0.3681245527,  -0.3697467573, -0.3713678356,
+    -0.3729877826, -0.3746065934, -0.3762242631,  -0.3778407868, -0.3794561595,
+    -0.3810703764, -0.3826834324, -0.3842953227,  -0.3859060423, -0.3875155865,
+    -0.3891239501, -0.3907311285, -0.3923371166,  -0.3939419096, -0.3955455026,
+    -0.3971478906, -0.3987490689, -0.4003490326,  -0.4019477767, -0.4035452964,
+    -0.4051415868, -0.4067366431, -0.4083304604,  -0.4099230338, -0.4115143586,
+    -0.4131044298, -0.4146932427, -0.4162807923,  -0.4178670738, -0.4194520824,
+    -0.4210358134, -0.4226182617, -0.4241994227,  -0.4257792916, -0.4273578634,
+    -0.4289351334, -0.4305110968, -0.4320857488,  -0.4336590846, -0.4352310994,
+    -0.4368017884, -0.4383711468, -0.4399391699,  -0.4415058528, -0.4430711908,
+    -0.4446351792, -0.4461978131, -0.4477590878,  -0.4493189986, -0.4508775407,
+    -0.4524347093, -0.4539904997, -0.4555449072,  -0.4570979271, -0.4586495545,
+    -0.4601997848, -0.4617486132, -0.4632960351,  -0.4648420457, -0.4663866403,
+    -0.4679298143, -0.4694715628, -0.4710118812,  -0.4725507649, -0.4740882090,
+    -0.4756242091, -0.4771587603, -0.4786918579,  -0.4802234974, -0.4817536741,
+    -0.4832823833, -0.4848096202, -0.4863353804,  -0.4878596591, -0.4893824517,
+    -0.4909037536, -0.4924235601, -0.4939418666,  -0.4954586684, -0.4969739610,
+    -0.4984877398, -0.5000000000, -0.5015107372,  -0.5030199466, -0.5045276238,
+    -0.5060337641, -0.5075383630, -0.5090414158,  -0.5105429179, -0.5120428649,
+    -0.5135412521, -0.5150380749, -0.5165333289,  -0.5180270094, -0.5195191119,
+    -0.5210096318, -0.5224985647, -0.5239859060,  -0.5254716511, -0.5269557955,
+    -0.5284383347, -0.5299192642, -0.5313985795,  -0.5328762761, -0.5343523494,
+    -0.5358267950, -0.5372996083, -0.5387707850,  -0.5402403205, -0.5417082103,
+    -0.5431744500, -0.5446390350, -0.5461019610,  -0.5475632235, -0.5490228180,
+    -0.5504807401, -0.5519369853, -0.5533915492,  -0.5548444274, -0.5562956155,
+    -0.5577451090, -0.5591929035, -0.5606389946,  -0.5620833779, -0.5635260489,
+    -0.5649670034, -0.5664062369, -0.5678437451,  -0.5692795234, -0.5707135677,
+    -0.5721458734, -0.5735764364, -0.5750052520,  -0.5764323162, -0.5778576244,
+    -0.5792811723, -0.5807029557, -0.5821229702,  -0.5835412114, -0.5849576750,
+    -0.5863723567, -0.5877852523, -0.5891963574,  -0.5906056676, -0.5920131788,
+    -0.5934188866, -0.5948227868, -0.5962248750,  -0.5976251470, -0.5990235985,
+    -0.6004202253, -0.6018150232, -0.6032079877,  -0.6045991149, -0.6059884003,
+    -0.6073758397, -0.6087614290, -0.6101451639,  -0.6115270402, -0.6129070537,
+    -0.6142852001, -0.6156614753, -0.6170358751,  -0.6184083954, -0.6197790318,
+    -0.6211477803, -0.6225146366, -0.6238795967,  -0.6252426563, -0.6266038114,
+    -0.6279630576, -0.6293203910, -0.6306758074,  -0.6320293027, -0.6333808726,
+    -0.6347305132, -0.6360782203, -0.6374239897,  -0.6387678175, -0.6401096995,
+    -0.6414496316, -0.6427876097, -0.6441236298,  -0.6454576877, -0.6467897795,
+    -0.6481199011, -0.6494480483, -0.6507742173,  -0.6520984038, -0.6534206040,
+    -0.6547408137, -0.6560590290, -0.6573752458,  -0.6586894601, -0.6600016680,
+    -0.6613118653, -0.6626200482, -0.6639262127,  -0.6652303547, -0.6665324702,
+    -0.6678325555, -0.6691306064, -0.6704266190,  -0.6717205893, -0.6730125135,
+    -0.6743023876, -0.6755902076, -0.6768759697,  -0.6781596699, -0.6794413043,
+    -0.6807208690, -0.6819983601, -0.6832737737,  -0.6845471059, -0.6858183529,
+    -0.6870875108, -0.6883545757, -0.6896195437,  -0.6908824111, -0.6921431739,
+    -0.6934018283, -0.6946583705, -0.6959127966,  -0.6971651029, -0.6984152854,
+    -0.6996633405, -0.7009092643, -0.7021530530,  -0.7033947028, -0.7046342100,
+    -0.7058715707, -0.7071067812, -0.7083398377,  -0.7095707365, -0.7107994739,
+    -0.7120260460, -0.7132504492, -0.7144726796,  -0.7156927337, -0.7169106077,
+    -0.7181262978, -0.7193398003, -0.7205511117,  -0.7217602281, -0.7229671459,
+    -0.7241718614, -0.7253743710, -0.7265746710,  -0.7277727577, -0.7289686274,
+    -0.7301622766, -0.7313537016, -0.7325428988,  -0.7337298645, -0.7349145951,
+    -0.7360970871, -0.7372773368, -0.7384553406,  -0.7396310950, -0.7408045963,
+    -0.7419758410, -0.7431448255, -0.7443115462,  -0.7454759997, -0.7466381823,
+    -0.7477980905, -0.7489557208, -0.7501110696,  -0.7512641335, -0.7524149089,
+    -0.7535633923, -0.7547095802, -0.7558534692,  -0.7569950557, -0.7581343362,
+    -0.7592713073, -0.7604059656, -0.7615383075,  -0.7626683297, -0.7637960286,
+    -0.7649214009, -0.7660444431, -0.7671651518,  -0.7682835236, -0.7693995550,
+    -0.7705132428, -0.7716245834, -0.7727335735,  -0.7738402097, -0.7749444887,
+    -0.7760464071, -0.7771459615, -0.7782431485,  -0.7793379649, -0.7804304073,
+    -0.7815204724, -0.7826081569, -0.7836934573,  -0.7847763705, -0.7858568932,
+    -0.7869350220, -0.7880107536, -0.7890840848,  -0.7901550124, -0.7912235330,
+    -0.7922896434, -0.7933533403, -0.7944146205,  -0.7954734809, -0.7965299180,
+    -0.7975839288, -0.7986355100, -0.7996846585,  -0.8007313709, -0.8017756442,
+    -0.8028174752, -0.8038568606, -0.8048937974,  -0.8059282822, -0.8069603121,
+    -0.8079898839, -0.8090169944, -0.8100416404,  -0.8110638190, -0.8120835269,
+    -0.8131007610, -0.8141155184, -0.8151277957,  -0.8161375901, -0.8171448983,
+    -0.8181497174, -0.8191520443, -0.8201518759,  -0.8211492091, -0.8221440410,
+    -0.8231363685, -0.8241261886, -0.8251134983,  -0.8260982945, -0.8270805743,
+    -0.8280603346, -0.8290375726, -0.8300122851,  -0.8309844693, -0.8319541221,
+    -0.8329212407, -0.8338858221, -0.8348478633,  -0.8358073614, -0.8367643135,
+    -0.8377187166, -0.8386705679, -0.8396198645,  -0.8405666035, -0.8415107819,
+    -0.8424523970, -0.8433914458, -0.8443279255,  -0.8452618332, -0.8461931661,
+    -0.8471219214, -0.8480480962, -0.8489716876,  -0.8498926930, -0.8508111094,
+    -0.8517269341, -0.8526401644, -0.8535507973,  -0.8544588301, -0.8553642602,
+    -0.8562670846, -0.8571673007, -0.8580649057,  -0.8589598969, -0.8598522716,
+    -0.8607420270, -0.8616291604, -0.8625136692,  -0.8633955506, -0.8642748020,
+    -0.8651514206, -0.8660254038, -0.8668967489,  -0.8677654534, -0.8686315144,
+    -0.8694949295, -0.8703556959, -0.8712138111,  -0.8720692724, -0.8729220773,
+    -0.8737722230, -0.8746197071, -0.8754645270,  -0.8763066800, -0.8771461637,
+    -0.8779829754, -0.8788171127, -0.8796485729,  -0.8804773535, -0.8813034521,
+    -0.8821268660, -0.8829475929, -0.8837656301,  -0.8845809752, -0.8853936258,
+    -0.8862035792, -0.8870108332, -0.8878153851,  -0.8886172327, -0.8894163733,
+    -0.8902128046, -0.8910065242, -0.8917975296,  -0.8925858185, -0.8933713883,
+    -0.8941542368, -0.8949343616, -0.8957117602,  -0.8964864304, -0.8972583697,
+    -0.8980275758, -0.8987940463, -0.8995577790,  -0.9003187714, -0.9010770213,
+    -0.9018325264, -0.9025852843, -0.9033352929,  -0.9040825497, -0.9048270525,
+    -0.9055687990, -0.9063077870, -0.9070440143,  -0.9077774785, -0.9085081775,
+    -0.9092361090, -0.9099612709, -0.9106836608,  -0.9114032766, -0.9121201162,
+    -0.9128341772, -0.9135454576, -0.9142539552,  -0.9149596678, -0.9156625933,
+    -0.9163627296, -0.9170600744, -0.9177546257,  -0.9184463813, -0.9191353393,
+    -0.9198214973, -0.9205048535, -0.9211854056,  -0.9218631516, -0.9225380895,
+    -0.9232102171, -0.9238795325, -0.9245460336,  -0.9252097184, -0.9258705848,
+    -0.9265286309, -0.9271838546, -0.9278362539,  -0.9284858269, -0.9291325715,
+    -0.9297764859, -0.9304175680, -0.9310558159,  -0.9316912276, -0.9323238012,
+    -0.9329535348, -0.9335804265, -0.9342044743,  -0.9348256764, -0.9354440308,
+    -0.9360595357, -0.9366721892, -0.9372819895,  -0.9378889346, -0.9384930228,
+    -0.9390942521, -0.9396926208, -0.9402881270,  -0.9408807690, -0.9414705448,
+    -0.9420574528, -0.9426414911, -0.9432226579,  -0.9438009516, -0.9443763702,
+    -0.9449489122, -0.9455185756, -0.9460853588,  -0.9466492601, -0.9472102777,
+    -0.9477684100, -0.9483236552, -0.9488760116,  -0.9494254776, -0.9499720515,
+    -0.9505157316, -0.9510565163, -0.9515944039,  -0.9521293927, -0.9526614813,
+    -0.9531906678, -0.9537169507, -0.9542403285,  -0.9547607995, -0.9552783621,
+    -0.9557930148, -0.9563047560, -0.9568135841,  -0.9573194975, -0.9578224948,
+    -0.9583225745, -0.9588197349, -0.9593139745,  -0.9598052920, -0.9602936857,
+    -0.9607791542, -0.9612616959, -0.9617413095,  -0.9622179935, -0.9626917464,
+    -0.9631625668, -0.9636304532, -0.9640954042,  -0.9645574185, -0.9650164945,
+    -0.9654726309, -0.9659258263, -0.9663760793,  -0.9668233886, -0.9672677528,
+    -0.9677091705, -0.9681476404, -0.9685831611,  -0.9690157314, -0.9694453499,
+    -0.9698720153, -0.9702957263, -0.9707164816,  -0.9711342799, -0.9715491200,
+    -0.9719610006, -0.9723699204, -0.9727758782,  -0.9731788728, -0.9735789029,
+    -0.9739759673, -0.9743700648, -0.9747611942,  -0.9751493543, -0.9755345439,
+    -0.9759167619, -0.9762960071, -0.9766722783,  -0.9770455744, -0.9774158943,
+    -0.9777832368, -0.9781476007, -0.9785089851,  -0.9788673888, -0.9792228106,
+    -0.9795752496, -0.9799247046, -0.9802711746,  -0.9806146585, -0.9809551553,
+    -0.9812926640, -0.9816271834, -0.9819587127,  -0.9822872507, -0.9826127965,
+    -0.9829353491, -0.9832549076, -0.9835714708,  -0.9838850379, -0.9841956080,
+    -0.9845031800, -0.9848077530, -0.9851093262,  -0.9854078985, -0.9857034691,
+    -0.9859960371, -0.9862856015, -0.9865721616,  -0.9868557164, -0.9871362651,
+    -0.9874138068, -0.9876883406, -0.9879598658,  -0.9882283814, -0.9884938868,
+    -0.9887563810, -0.9890158634, -0.9892723330,  -0.9895257891, -0.9897762309,
+    -0.9900236577, -0.9902680687, -0.9905094632,  -0.9907478405, -0.9909831997,
+    -0.9912155403, -0.9914448614, -0.9916711624,  -0.9918944426, -0.9921147013,
+    -0.9923319379, -0.9925461516, -0.9927573419,  -0.9929655081, -0.9931706495,
+    -0.9933727656, -0.9935718557, -0.9937679192,  -0.9939609555, -0.9941509640,
+    -0.9943379441, -0.9945218954, -0.9947028171,  -0.9948807088, -0.9950555700,
+    -0.9952274000, -0.9953961984, -0.9955619646,  -0.9957246982, -0.9958843986,
+    -0.9960410654, -0.9961946981, -0.9963452962,  -0.9964928592, -0.9966373868,
+    -0.9967788785, -0.9969173337, -0.9970527522,  -0.9971851335, -0.9973144772,
+    -0.9974407829, -0.9975640503, -0.9976842788,  -0.9978014683, -0.9979156183,
+    -0.9980267284, -0.9981347984, -0.9982398279,  -0.9983418166, -0.9984407642,
+    -0.9985366703, -0.9986295348, -0.9987193572,  -0.9988061373, -0.9988898750,
+    -0.9989705698, -0.9990482216, -0.9991228301,  -0.9991943951, -0.9992629164,
+    -0.9993283938, -0.9993908270, -0.9994502159,  -0.9995065604, -0.9995598601,
+    -0.9996101150, -0.9996573250, -0.9997014898,  -0.9997426093, -0.9997806835,
+    -0.9998157121, -0.9998476952, -0.9998766325,  -0.9999025240, -0.9999253697,
+    -0.9999451694, -0.9999619231, -0.9999756307,  -0.9999862922, -0.9999939077,
+    -0.9999984769, -1.0000000000, -0.9999984769,  -0.9999939077, -0.9999862922,
+    -0.9999756307, -0.9999619231, -0.9999451694,  -0.9999253697, -0.9999025240,
+    -0.9998766325, -0.9998476952, -0.9998157121,  -0.9997806835, -0.9997426093,
+    -0.9997014898, -0.9996573250, -0.9996101150,  -0.9995598601, -0.9995065604,
+    -0.9994502159, -0.9993908270, -0.9993283938,  -0.9992629164, -0.9991943951,
+    -0.9991228301, -0.9990482216, -0.9989705698,  -0.9988898750, -0.9988061373,
+    -0.9987193572, -0.9986295348, -0.9985366703,  -0.9984407642, -0.9983418166,
+    -0.9982398279, -0.9981347984, -0.9980267284,  -0.9979156183, -0.9978014683,
+    -0.9976842788, -0.9975640503, -0.9974407829,  -0.9973144772, -0.9971851335,
+    -0.9970527522, -0.9969173337, -0.9967788785,  -0.9966373868, -0.9964928592,
+    -0.9963452962, -0.9961946981, -0.9960410654,  -0.9958843986, -0.9957246982,
+    -0.9955619646, -0.9953961984, -0.9952274000,  -0.9950555700, -0.9948807088,
+    -0.9947028171, -0.9945218954, -0.9943379441,  -0.9941509640, -0.9939609555,
+    -0.9937679192, -0.9935718557, -0.9933727656,  -0.9931706495, -0.9929655081,
+    -0.9927573419, -0.9925461516, -0.9923319379,  -0.9921147013, -0.9918944426,
+    -0.9916711624, -0.9914448614, -0.9912155403,  -0.9909831997, -0.9907478405,
+    -0.9905094632, -0.9902680687, -0.9900236577,  -0.9897762309, -0.9895257891,
+    -0.9892723330, -0.9890158634, -0.9887563810,  -0.9884938868, -0.9882283814,
+    -0.9879598658, -0.9876883406, -0.9874138068,  -0.9871362651, -0.9868557164,
+    -0.9865721616, -0.9862856015, -0.9859960371,  -0.9857034691, -0.9854078985,
+    -0.9851093262, -0.9848077530, -0.9845031800,  -0.9841956080, -0.9838850379,
+    -0.9835714708, -0.9832549076, -0.9829353491,  -0.9826127965, -0.9822872507,
+    -0.9819587127, -0.9816271834, -0.9812926640,  -0.9809551553, -0.9806146585,
+    -0.9802711746, -0.9799247046, -0.9795752496,  -0.9792228106, -0.9788673888,
+    -0.9785089851, -0.9781476007, -0.9777832368,  -0.9774158943, -0.9770455744,
+    -0.9766722783, -0.9762960071, -0.9759167619,  -0.9755345439, -0.9751493543,
+    -0.9747611942, -0.9743700648, -0.9739759673,  -0.9735789029, -0.9731788728,
+    -0.9727758782, -0.9723699204, -0.9719610006,  -0.9715491200, -0.9711342799,
+    -0.9707164816, -0.9702957263, -0.9698720153,  -0.9694453499, -0.9690157314,
+    -0.9685831611, -0.9681476404, -0.9677091705,  -0.9672677528, -0.9668233886,
+    -0.9663760793, -0.9659258263, -0.9654726309,  -0.9650164945, -0.9645574185,
+    -0.9640954042, -0.9636304532, -0.9631625668,  -0.9626917464, -0.9622179935,
+    -0.9617413095, -0.9612616959, -0.9607791542,  -0.9602936857, -0.9598052920,
+    -0.9593139745, -0.9588197349, -0.9583225745,  -0.9578224948, -0.9573194975,
+    -0.9568135841, -0.9563047560, -0.9557930148,  -0.9552783621, -0.9547607995,
+    -0.9542403285, -0.9537169507, -0.9531906678,  -0.9526614813, -0.9521293927,
+    -0.9515944039, -0.9510565163, -0.9505157316,  -0.9499720515, -0.9494254776,
+    -0.9488760116, -0.9483236552, -0.9477684100,  -0.9472102777, -0.9466492601,
+    -0.9460853588, -0.9455185756, -0.9449489122,  -0.9443763702, -0.9438009516,
+    -0.9432226579, -0.9426414911, -0.9420574528,  -0.9414705448, -0.9408807690,
+    -0.9402881270, -0.9396926208, -0.9390942521,  -0.9384930228, -0.9378889346,
+    -0.9372819895, -0.9366721892, -0.9360595357,  -0.9354440308, -0.9348256764,
+    -0.9342044743, -0.9335804265, -0.9329535348,  -0.9323238012, -0.9316912276,
+    -0.9310558159, -0.9304175680, -0.9297764859,  -0.9291325715, -0.9284858269,
+    -0.9278362539, -0.9271838546, -0.9265286309,  -0.9258705848, -0.9252097184,
+    -0.9245460336, -0.9238795325, -0.9232102171,  -0.9225380895, -0.9218631516,
+    -0.9211854056, -0.9205048535, -0.9198214973,  -0.9191353393, -0.9184463813,
+    -0.9177546257, -0.9170600744, -0.9163627296,  -0.9156625933, -0.9149596678,
+    -0.9142539552, -0.9135454576, -0.9128341772,  -0.9121201162, -0.9114032766,
+    -0.9106836608, -0.9099612709, -0.9092361090,  -0.9085081775, -0.9077774785,
+    -0.9070440143, -0.9063077870, -0.9055687990,  -0.9048270525, -0.9040825497,
+    -0.9033352929, -0.9025852843, -0.9018325264,  -0.9010770213, -0.9003187714,
+    -0.8995577790, -0.8987940463, -0.8980275758,  -0.8972583697, -0.8964864304,
+    -0.8957117602, -0.8949343616, -0.8941542368,  -0.8933713883, -0.8925858185,
+    -0.8917975296, -0.8910065242, -0.8902128046,  -0.8894163733, -0.8886172327,
+    -0.8878153851, -0.8870108332, -0.8862035792,  -0.8853936258, -0.8845809752,
+    -0.8837656301, -0.8829475929, -0.8821268660,  -0.8813034521, -0.8804773535,
+    -0.8796485729, -0.8788171127, -0.8779829754,  -0.8771461637, -0.8763066800,
+    -0.8754645270, -0.8746197071, -0.8737722230,  -0.8729220773, -0.8720692724,
+    -0.8712138111, -0.8703556959, -0.8694949295,  -0.8686315144, -0.8677654534,
+    -0.8668967489, -0.8660254038, -0.8651514206,  -0.8642748020, -0.8633955506,
+    -0.8625136692, -0.8616291604, -0.8607420270,  -0.8598522716, -0.8589598969,
+    -0.8580649057, -0.8571673007, -0.8562670846,  -0.8553642602, -0.8544588301,
+    -0.8535507973, -0.8526401644, -0.8517269341,  -0.8508111094, -0.8498926930,
+    -0.8489716876, -0.8480480962, -0.8471219214,  -0.8461931661, -0.8452618332,
+    -0.8443279255, -0.8433914458, -0.8424523970,  -0.8415107819, -0.8405666035,
+    -0.8396198645, -0.8386705679, -0.8377187166,  -0.8367643135, -0.8358073614,
+    -0.8348478633, -0.8338858221, -0.8329212407,  -0.8319541221, -0.8309844693,
+    -0.8300122851, -0.8290375726, -0.8280603346,  -0.8270805743, -0.8260982945,
+    -0.8251134983, -0.8241261886, -0.8231363685,  -0.8221440410, -0.8211492091,
+    -0.8201518759, -0.8191520443, -0.8181497174,  -0.8171448983, -0.8161375901,
+    -0.8151277957, -0.8141155184, -0.8131007610,  -0.8120835269, -0.8110638190,
+    -0.8100416404, -0.8090169944, -0.8079898839,  -0.8069603121, -0.8059282822,
+    -0.8048937974, -0.8038568606, -0.8028174752,  -0.8017756442, -0.8007313709,
+    -0.7996846585, -0.7986355100, -0.7975839288,  -0.7965299180, -0.7954734809,
+    -0.7944146205, -0.7933533403, -0.7922896434,  -0.7912235330, -0.7901550124,
+    -0.7890840848, -0.7880107536, -0.7869350220,  -0.7858568932, -0.7847763705,
+    -0.7836934573, -0.7826081569, -0.7815204724,  -0.7804304073, -0.7793379649,
+    -0.7782431485, -0.7771459615, -0.7760464071,  -0.7749444887, -0.7738402097,
+    -0.7727335735, -0.7716245834, -0.7705132428,  -0.7693995550, -0.7682835236,
+    -0.7671651518, -0.7660444431, -0.7649214009,  -0.7637960286, -0.7626683297,
+    -0.7615383075, -0.7604059656, -0.7592713073,  -0.7581343362, -0.7569950557,
+    -0.7558534692, -0.7547095802, -0.7535633923,  -0.7524149089, -0.7512641335,
+    -0.7501110696, -0.7489557208, -0.7477980905,  -0.7466381823, -0.7454759997,
+    -0.7443115462, -0.7431448255, -0.7419758410,  -0.7408045963, -0.7396310950,
+    -0.7384553406, -0.7372773368, -0.7360970871,  -0.7349145951, -0.7337298645,
+    -0.7325428988, -0.7313537016, -0.7301622766,  -0.7289686274, -0.7277727577,
+    -0.7265746710, -0.7253743710, -0.7241718614,  -0.7229671459, -0.7217602281,
+    -0.7205511117, -0.7193398003, -0.7181262978,  -0.7169106077, -0.7156927337,
+    -0.7144726796, -0.7132504492, -0.7120260460,  -0.7107994739, -0.7095707365,
+    -0.7083398377, -0.7071067812, -0.7058715707,  -0.7046342100, -0.7033947028,
+    -0.7021530530, -0.7009092643, -0.6996633405,  -0.6984152854, -0.6971651029,
+    -0.6959127966, -0.6946583705, -0.6934018283,  -0.6921431739, -0.6908824111,
+    -0.6896195437, -0.6883545757, -0.6870875108,  -0.6858183529, -0.6845471059,
+    -0.6832737737, -0.6819983601, -0.6807208690,  -0.6794413043, -0.6781596699,
+    -0.6768759697, -0.6755902076, -0.6743023876,  -0.6730125135, -0.6717205893,
+    -0.6704266190, -0.6691306064, -0.6678325555,  -0.6665324702, -0.6652303547,
+    -0.6639262127, -0.6626200482, -0.6613118653,  -0.6600016680, -0.6586894601,
+    -0.6573752458, -0.6560590290, -0.6547408137,  -0.6534206040, -0.6520984038,
+    -0.6507742173, -0.6494480483, -0.6481199011,  -0.6467897795, -0.6454576877,
+    -0.6441236298, -0.6427876097, -0.6414496316,  -0.6401096995, -0.6387678175,
+    -0.6374239897, -0.6360782203, -0.6347305132,  -0.6333808726, -0.6320293027,
+    -0.6306758074, -0.6293203910, -0.6279630576,  -0.6266038114, -0.6252426563,
+    -0.6238795967, -0.6225146366, -0.6211477803,  -0.6197790318, -0.6184083954,
+    -0.6170358751, -0.6156614753, -0.6142852001,  -0.6129070537, -0.6115270402,
+    -0.6101451639, -0.6087614290, -0.6073758397,  -0.6059884003, -0.6045991149,
+    -0.6032079877, -0.6018150232, -0.6004202253,  -0.5990235985, -0.5976251470,
+    -0.5962248750, -0.5948227868, -0.5934188866,  -0.5920131788, -0.5906056676,
+    -0.5891963574, -0.5877852523, -0.5863723567,  -0.5849576750, -0.5835412114,
+    -0.5821229702, -0.5807029557, -0.5792811723,  -0.5778576244, -0.5764323162,
+    -0.5750052520, -0.5735764364, -0.5721458734,  -0.5707135677, -0.5692795234,
+    -0.5678437451, -0.5664062369, -0.5649670034,  -0.5635260489, -0.5620833779,
+    -0.5606389946, -0.5591929035, -0.5577451090,  -0.5562956155, -0.5548444274,
+    -0.5533915492, -0.5519369853, -0.5504807401,  -0.5490228180, -0.5475632235,
+    -0.5461019610, -0.5446390350, -0.5431744500,  -0.5417082103, -0.5402403205,
+    -0.5387707850, -0.5372996083, -0.5358267950,  -0.5343523494, -0.5328762761,
+    -0.5313985795, -0.5299192642, -0.5284383347,  -0.5269557955, -0.5254716511,
+    -0.5239859060, -0.5224985647, -0.5210096318,  -0.5195191119, -0.5180270094,
+    -0.5165333289, -0.5150380749, -0.5135412521,  -0.5120428649, -0.5105429179,
+    -0.5090414158, -0.5075383630, -0.5060337641,  -0.5045276238, -0.5030199466,
+    -0.5015107372, -0.5000000000, -0.4984877398,  -0.4969739610, -0.4954586684,
+    -0.4939418666, -0.4924235601, -0.4909037536,  -0.4893824517, -0.4878596591,
+    -0.4863353804, -0.4848096202, -0.4832823833,  -0.4817536741, -0.4802234974,
+    -0.4786918579, -0.4771587603, -0.4756242091,  -0.4740882090, -0.4725507649,
+    -0.4710118812, -0.4694715628, -0.4679298143,  -0.4663866403, -0.4648420457,
+    -0.4632960351, -0.4617486132, -0.4601997848,  -0.4586495545, -0.4570979271,
+    -0.4555449072, -0.4539904997, -0.4524347093,  -0.4508775407, -0.4493189986,
+    -0.4477590878, -0.4461978131, -0.4446351792,  -0.4430711908, -0.4415058528,
+    -0.4399391699, -0.4383711468, -0.4368017884,  -0.4352310994, -0.4336590846,
+    -0.4320857488, -0.4305110968, -0.4289351334,  -0.4273578634, -0.4257792916,
+    -0.4241994227, -0.4226182617, -0.4210358134,  -0.4194520824, -0.4178670738,
+    -0.4162807923, -0.4146932427, -0.4131044298,  -0.4115143586, -0.4099230338,
+    -0.4083304604, -0.4067366431, -0.4051415868,  -0.4035452964, -0.4019477767,
+    -0.4003490326, -0.3987490689, -0.3971478906,  -0.3955455026, -0.3939419096,
+    -0.3923371166, -0.3907311285, -0.3891239501,  -0.3875155865, -0.3859060423,
+    -0.3842953227, -0.3826834324, -0.3810703764,  -0.3794561595, -0.3778407868,
+    -0.3762242631, -0.3746065934, -0.3729877826,  -0.3713678356, -0.3697467573,
+    -0.3681245527, -0.3665012267, -0.3648767843,  -0.3632512305, -0.3616245701,
+    -0.3599968081, -0.3583679495, -0.3567379993,  -0.3551069624, -0.3534748438,
+    -0.3518416484, -0.3502073813, -0.3485720473,  -0.3469356516, -0.3452981990,
+    -0.3436596946, -0.3420201433, -0.3403795502,  -0.3387379202, -0.3370952584,
+    -0.3354515698, -0.3338068592, -0.3321611319,  -0.3305143927, -0.3288666467,
+    -0.3272178990, -0.3255681545, -0.3239174182,  -0.3222656952, -0.3206129906,
+    -0.3189593093, -0.3173046564, -0.3156490369,  -0.3139924560, -0.3123349185,
+    -0.3106764296, -0.3090169944, -0.3073566178,  -0.3056953050, -0.3040330609,
+    -0.3023698908, -0.3007057995, -0.2990407923,  -0.2973748741, -0.2957080500,
+    -0.2940403252, -0.2923717047, -0.2907021936,  -0.2890317969, -0.2873605198,
+    -0.2856883674, -0.2840153447, -0.2823414568,  -0.2806667089, -0.2789911060,
+    -0.2773146533, -0.2756373558, -0.2739592187,  -0.2722802470, -0.2706004460,
+    -0.2689198206, -0.2672383761, -0.2655561175,  -0.2638730500, -0.2621891786,
+    -0.2605045086, -0.2588190451, -0.2571327932,  -0.2554457579, -0.2537579446,
+    -0.2520693582, -0.2503800041, -0.2486898872,  -0.2469990127, -0.2453073859,
+    -0.2436150118, -0.2419218956, -0.2402280425,  -0.2385334576, -0.2368381461,
+    -0.2351421131, -0.2334453639, -0.2317479035,  -0.2300497372, -0.2283508701,
+    -0.2266513074, -0.2249510543, -0.2232501160,  -0.2215484976, -0.2198462044,
+    -0.2181432414, -0.2164396139, -0.2147353272,  -0.2130303863, -0.2113247965,
+    -0.2096185629, -0.2079116908, -0.2062041854,  -0.2044960518, -0.2027872954,
+    -0.2010779211, -0.1993679344, -0.1976573404,  -0.1959461442, -0.1942343512,
+    -0.1925219665, -0.1908089954, -0.1890954430,  -0.1873813146, -0.1856666154,
+    -0.1839513506, -0.1822355255, -0.1805191453,  -0.1788022151, -0.1770847403,
+    -0.1753667261, -0.1736481777, -0.1719291003,  -0.1702094992, -0.1684893796,
+    -0.1667687467, -0.1650476059, -0.1633259622,  -0.1616038211, -0.1598811877,
+    -0.1581580673, -0.1564344650, -0.1547103863,  -0.1529858363, -0.1512608202,
+    -0.1495353434, -0.1478094111, -0.1460830286,  -0.1443562010, -0.1426289337,
+    -0.1409012319, -0.1391731010, -0.1374445460,  -0.1357155724, -0.1339861854,
+    -0.1322563903, -0.1305261922, -0.1287955966,  -0.1270646086, -0.1253332336,
+    -0.1236014767, -0.1218693434, -0.1201368388,  -0.1184039683, -0.1166707371,
+    -0.1149371505, -0.1132032138, -0.1114689322,  -0.1097343111, -0.1079993557,
+    -0.1062640713, -0.1045284633, -0.1027925368,  -0.1010562972, -0.0993197497,
+    -0.0975828998, -0.0958457525, -0.0941083133,  -0.0923705874, -0.0906325802,
+    -0.0888942969, -0.0871557427, -0.0854169231,  -0.0836778433, -0.0819385086,
+    -0.0801989243, -0.0784590957, -0.0767190281,  -0.0749787268, -0.0732381971,
+    -0.0714974443, -0.0697564737, -0.0680152907,  -0.0662739004, -0.0645323083,
+    -0.0627905195, -0.0610485395, -0.0593063736,  -0.0575640270, -0.0558215050,
+    -0.0540788130, -0.0523359562, -0.0505929401,  -0.0488497698, -0.0471064507,
+    -0.0453629881, -0.0436193874, -0.0418756537,  -0.0401317925, -0.0383878091,
+    -0.0366437087, -0.0348994967, -0.0331551784,  -0.0314107591, -0.0296662441,
+    -0.0279216387, -0.0261769483, -0.0244321782,  -0.0226873336, -0.0209424199,
+    -0.0191974424, -0.0174524064, -0.0157073173,  -0.0139621803, -0.0122170008,
+    -0.0104717841, -0.0087265355, -0.0069812603,  -0.0052359638, -0.0034906514,
+    -0.0017453284, -0.0000000000, 0.0017453284,   0.0034906514,  0.0052359638,
+    0.0069812603,  0.0087265355,  0.0104717841,   0.0122170008,  0.0139621803,
+    0.0157073173,  0.0174524064,  0.0191974424,   0.0209424199,  0.0226873336,
+    0.0244321782,  0.0261769483,  0.0279216387,   0.0296662441,  0.0314107591,
+    0.0331551784,  0.0348994967,  0.0366437087,   0.0383878091,  0.0401317925,
+    0.0418756537,  0.0436193874,  0.0453629881,   0.0471064507,  0.0488497698,
+    0.0505929401,  0.0523359562,  0.0540788130,   0.0558215050,  0.0575640270,
+    0.0593063736,  0.0610485395,  0.0627905195,   0.0645323083,  0.0662739004,
+    0.0680152907,  0.0697564737,  0.0714974443,   0.0732381971,  0.0749787268,
+    0.0767190281,  0.0784590957,  0.0801989243,   0.0819385086,  0.0836778433,
+    0.0854169231,  0.0871557427,  0.0888942969,   0.0906325802,  0.0923705874,
+    0.0941083133,  0.0958457525,  0.0975828998,   0.0993197497,  0.1010562972,
+    0.1027925368,  0.1045284633,  0.1062640713,   0.1079993557,  0.1097343111,
+    0.1114689322,  0.1132032138,  0.1149371505,   0.1166707371,  0.1184039683,
+    0.1201368388,  0.1218693434,  0.1236014767,   0.1253332336,  0.1270646086,
+    0.1287955966,  0.1305261922,  0.1322563903,   0.1339861854,  0.1357155724,
+    0.1374445460,  0.1391731010,  0.1409012319,   0.1426289337,  0.1443562010,
+    0.1460830286,  0.1478094111,  0.1495353434,   0.1512608202,  0.1529858363,
+    0.1547103863,  0.1564344650,  0.1581580673,   0.1598811877,  0.1616038211,
+    0.1633259622,  0.1650476059,  0.1667687467,   0.1684893796,  0.1702094992,
+    0.1719291003,  0.1736481777,  0.1753667261,   0.1770847403,  0.1788022151,
+    0.1805191453,  0.1822355255,  0.1839513506,   0.1856666154,  0.1873813146,
+    0.1890954430,  0.1908089954,  0.1925219665,   0.1942343512,  0.1959461442,
+    0.1976573404,  0.1993679344,  0.2010779211,   0.2027872954,  0.2044960518,
+    0.2062041854,  0.2079116908,  0.2096185629,   0.2113247965,  0.2130303863,
+    0.2147353272,  0.2164396139,  0.2181432414,   0.2198462044,  0.2215484976,
+    0.2232501160,  0.2249510543,  0.2266513074,   0.2283508701,  0.2300497372,
+    0.2317479035,  0.2334453639,  0.2351421131,   0.2368381461,  0.2385334576,
+    0.2402280425,  0.2419218956,  0.2436150118,   0.2453073859,  0.2469990127,
+    0.2486898872,  0.2503800041,  0.2520693582,   0.2537579446,  0.2554457579,
+    0.2571327932,  0.2588190451,  0.2605045086,   0.2621891786,  0.2638730500,
+    0.2655561175,  0.2672383761,  0.2689198206,   0.2706004460,  0.2722802470,
+    0.2739592187,  0.2756373558,  0.2773146533,   0.2789911060,  0.2806667089,
+    0.2823414568,  0.2840153447,  0.2856883674,   0.2873605198,  0.2890317969,
+    0.2907021936,  0.2923717047,  0.2940403252,   0.2957080500,  0.2973748741,
+    0.2990407923,  0.3007057995,  0.3023698908,   0.3040330609,  0.3056953050,
+    0.3073566178,  0.3090169944,  0.3106764296,   0.3123349185,  0.3139924560,
+    0.3156490369,  0.3173046564,  0.3189593093,   0.3206129906,  0.3222656952,
+    0.3239174182,  0.3255681545,  0.3272178990,   0.3288666467,  0.3305143927,
+    0.3321611319,  0.3338068592,  0.3354515698,   0.3370952584,  0.3387379202,
+    0.3403795502,  0.3420201433,  0.3436596946,   0.3452981990,  0.3469356516,
+    0.3485720473,  0.3502073813,  0.3518416484,   0.3534748438,  0.3551069624,
+    0.3567379993,  0.3583679495,  0.3599968081,   0.3616245701,  0.3632512305,
+    0.3648767843,  0.3665012267,  0.3681245527,   0.3697467573,  0.3713678356,
+    0.3729877826,  0.3746065934,  0.3762242631,   0.3778407868,  0.3794561595,
+    0.3810703764,  0.3826834324,  0.3842953227,   0.3859060423,  0.3875155865,
+    0.3891239501,  0.3907311285,  0.3923371166,   0.3939419096,  0.3955455026,
+    0.3971478906,  0.3987490689,  0.4003490326,   0.4019477767,  0.4035452964,
+    0.4051415868,  0.4067366431,  0.4083304604,   0.4099230338,  0.4115143586,
+    0.4131044298,  0.4146932427,  0.4162807923,   0.4178670738,  0.4194520824,
+    0.4210358134,  0.4226182617,  0.4241994227,   0.4257792916,  0.4273578634,
+    0.4289351334,  0.4305110968,  0.4320857488,   0.4336590846,  0.4352310994,
+    0.4368017884,  0.4383711468,  0.4399391699,   0.4415058528,  0.4430711908,
+    0.4446351792,  0.4461978131,  0.4477590878,   0.4493189986,  0.4508775407,
+    0.4524347093,  0.4539904997,  0.4555449072,   0.4570979271,  0.4586495545,
+    0.4601997848,  0.4617486132,  0.4632960351,   0.4648420457,  0.4663866403,
+    0.4679298143,  0.4694715628,  0.4710118812,   0.4725507649,  0.4740882090,
+    0.4756242091,  0.4771587603,  0.4786918579,   0.4802234974,  0.4817536741,
+    0.4832823833,  0.4848096202,  0.4863353804,   0.4878596591,  0.4893824517,
+    0.4909037536,  0.4924235601,  0.4939418666,   0.4954586684,  0.4969739610,
+    0.4984877398,  0.5000000000,  0.5015107372,   0.5030199466,  0.5045276238,
+    0.5060337641,  0.5075383630,  0.5090414158,   0.5105429179,  0.5120428649,
+    0.5135412521,  0.5150380749,  0.5165333289,   0.5180270094,  0.5195191119,
+    0.5210096318,  0.5224985647,  0.5239859060,   0.5254716511,  0.5269557955,
+    0.5284383347,  0.5299192642,  0.5313985795,   0.5328762761,  0.5343523494,
+    0.5358267950,  0.5372996083,  0.5387707850,   0.5402403205,  0.5417082103,
+    0.5431744500,  0.5446390350,  0.5461019610,   0.5475632235,  0.5490228180,
+    0.5504807401,  0.5519369853,  0.5533915492,   0.5548444274,  0.5562956155,
+    0.5577451090,  0.5591929035,  0.5606389946,   0.5620833779,  0.5635260489,
+    0.5649670034,  0.5664062369,  0.5678437451,   0.5692795234,  0.5707135677,
+    0.5721458734,  0.5735764364,  0.5750052520,   0.5764323162,  0.5778576244,
+    0.5792811723,  0.5807029557,  0.5821229702,   0.5835412114,  0.5849576750,
+    0.5863723567,  0.5877852523,  0.5891963574,   0.5906056676,  0.5920131788,
+    0.5934188866,  0.5948227868,  0.5962248750,   0.5976251470,  0.5990235985,
+    0.6004202253,  0.6018150232,  0.6032079877,   0.6045991149,  0.6059884003,
+    0.6073758397,  0.6087614290,  0.6101451639,   0.6115270402,  0.6129070537,
+    0.6142852001,  0.6156614753,  0.6170358751,   0.6184083954,  0.6197790318,
+    0.6211477803,  0.6225146366,  0.6238795967,   0.6252426563,  0.6266038114,
+    0.6279630576,  0.6293203910,  0.6306758074,   0.6320293027,  0.6333808726,
+    0.6347305132,  0.6360782203,  0.6374239897,   0.6387678175,  0.6401096995,
+    0.6414496316,  0.6427876097,  0.6441236298,   0.6454576877,  0.6467897795,
+    0.6481199011,  0.6494480483,  0.6507742173,   0.6520984038,  0.6534206040,
+    0.6547408137,  0.6560590290,  0.6573752458,   0.6586894601,  0.6600016680,
+    0.6613118653,  0.6626200482,  0.6639262127,   0.6652303547,  0.6665324702,
+    0.6678325555,  0.6691306064,  0.6704266190,   0.6717205893,  0.6730125135,
+    0.6743023876,  0.6755902076,  0.6768759697,   0.6781596699,  0.6794413043,
+    0.6807208690,  0.6819983601,  0.6832737737,   0.6845471059,  0.6858183529,
+    0.6870875108,  0.6883545757,  0.6896195437,   0.6908824111,  0.6921431739,
+    0.6934018283,  0.6946583705,  0.6959127966,   0.6971651029,  0.6984152854,
+    0.6996633405,  0.7009092643,  0.7021530530,   0.7033947028,  0.7046342100,
+    0.7058715707,  0.7071067812,  0.7083398377,   0.7095707365,  0.7107994739,
+    0.7120260460,  0.7132504492,  0.7144726796,   0.7156927337,  0.7169106077,
+    0.7181262978,  0.7193398003,  0.7205511117,   0.7217602281,  0.7229671459,
+    0.7241718614,  0.7253743710,  0.7265746710,   0.7277727577,  0.7289686274,
+    0.7301622766,  0.7313537016,  0.7325428988,   0.7337298645,  0.7349145951,
+    0.7360970871,  0.7372773368,  0.7384553406,   0.7396310950,  0.7408045963,
+    0.7419758410,  0.7431448255,  0.7443115462,   0.7454759997,  0.7466381823,
+    0.7477980905,  0.7489557208,  0.7501110696,   0.7512641335,  0.7524149089,
+    0.7535633923,  0.7547095802,  0.7558534692,   0.7569950557,  0.7581343362,
+    0.7592713073,  0.7604059656,  0.7615383075,   0.7626683297,  0.7637960286,
+    0.7649214009,  0.7660444431,  0.7671651518,   0.7682835236,  0.7693995550,
+    0.7705132428,  0.7716245834,  0.7727335735,   0.7738402097,  0.7749444887,
+    0.7760464071,  0.7771459615,  0.7782431485,   0.7793379649,  0.7804304073,
+    0.7815204724,  0.7826081569,  0.7836934573,   0.7847763705,  0.7858568932,
+    0.7869350220,  0.7880107536,  0.7890840848,   0.7901550124,  0.7912235330,
+    0.7922896434,  0.7933533403,  0.7944146205,   0.7954734809,  0.7965299180,
+    0.7975839288,  0.7986355100,  0.7996846585,   0.8007313709,  0.8017756442,
+    0.8028174752,  0.8038568606,  0.8048937974,   0.8059282822,  0.8069603121,
+    0.8079898839,  0.8090169944,  0.8100416404,   0.8110638190,  0.8120835269,
+    0.8131007610,  0.8141155184,  0.8151277957,   0.8161375901,  0.8171448983,
+    0.8181497174,  0.8191520443,  0.8201518759,   0.8211492091,  0.8221440410,
+    0.8231363685,  0.8241261886,  0.8251134983,   0.8260982945,  0.8270805743,
+    0.8280603346,  0.8290375726,  0.8300122851,   0.8309844693,  0.8319541221,
+    0.8329212407,  0.8338858221,  0.8348478633,   0.8358073614,  0.8367643135,
+    0.8377187166,  0.8386705679,  0.8396198645,   0.8405666035,  0.8415107819,
+    0.8424523970,  0.8433914458,  0.8443279255,   0.8452618332,  0.8461931661,
+    0.8471219214,  0.8480480962,  0.8489716876,   0.8498926930,  0.8508111094,
+    0.8517269341,  0.8526401644,  0.8535507973,   0.8544588301,  0.8553642602,
+    0.8562670846,  0.8571673007,  0.8580649057,   0.8589598969,  0.8598522716,
+    0.8607420270,  0.8616291604,  0.8625136692,   0.8633955506,  0.8642748020,
+    0.8651514206,  0.8660254038,  0.8668967489,   0.8677654534,  0.8686315144,
+    0.8694949295,  0.8703556959,  0.8712138111,   0.8720692724,  0.8729220773,
+    0.8737722230,  0.8746197071,  0.8754645270,   0.8763066800,  0.8771461637,
+    0.8779829754,  0.8788171127,  0.8796485729,   0.8804773535,  0.8813034521,
+    0.8821268660,  0.8829475929,  0.8837656301,   0.8845809752,  0.8853936258,
+    0.8862035792,  0.8870108332,  0.8878153851,   0.8886172327,  0.8894163733,
+    0.8902128046,  0.8910065242,  0.8917975296,   0.8925858185,  0.8933713883,
+    0.8941542368,  0.8949343616,  0.8957117602,   0.8964864304,  0.8972583697,
+    0.8980275758,  0.8987940463,  0.8995577790,   0.9003187714,  0.9010770213,
+    0.9018325264,  0.9025852843,  0.9033352929,   0.9040825497,  0.9048270525,
+    0.9055687990,  0.9063077870,  0.9070440143,   0.9077774785,  0.9085081775,
+    0.9092361090,  0.9099612709,  0.9106836608,   0.9114032766,  0.9121201162,
+    0.9128341772,  0.9135454576,  0.9142539552,   0.9149596678,  0.9156625933,
+    0.9163627296,  0.9170600744,  0.9177546257,   0.9184463813,  0.9191353393,
+    0.9198214973,  0.9205048535,  0.9211854056,   0.9218631516,  0.9225380895,
+    0.9232102171,  0.9238795325,  0.9245460336,   0.9252097184,  0.9258705848,
+    0.9265286309,  0.9271838546,  0.9278362539,   0.9284858269,  0.9291325715,
+    0.9297764859,  0.9304175680,  0.9310558159,   0.9316912276,  0.9323238012,
+    0.9329535348,  0.9335804265,  0.9342044743,   0.9348256764,  0.9354440308,
+    0.9360595357,  0.9366721892,  0.9372819895,   0.9378889346,  0.9384930228,
+    0.9390942521,  0.9396926208,  0.9402881270,   0.9408807690,  0.9414705448,
+    0.9420574528,  0.9426414911,  0.9432226579,   0.9438009516,  0.9443763702,
+    0.9449489122,  0.9455185756,  0.9460853588,   0.9466492601,  0.9472102777,
+    0.9477684100,  0.9483236552,  0.9488760116,   0.9494254776,  0.9499720515,
+    0.9505157316,  0.9510565163,  0.9515944039,   0.9521293927,  0.9526614813,
+    0.9531906678,  0.9537169507,  0.9542403285,   0.9547607995,  0.9552783621,
+    0.9557930148,  0.9563047560,  0.9568135841,   0.9573194975,  0.9578224948,
+    0.9583225745,  0.9588197349,  0.9593139745,   0.9598052920,  0.9602936857,
+    0.9607791542,  0.9612616959,  0.9617413095,   0.9622179935,  0.9626917464,
+    0.9631625668,  0.9636304532,  0.9640954042,   0.9645574185,  0.9650164945,
+    0.9654726309,  0.9659258263,  0.9663760793,   0.9668233886,  0.9672677528,
+    0.9677091705,  0.9681476404,  0.9685831611,   0.9690157314,  0.9694453499,
+    0.9698720153,  0.9702957263,  0.9707164816,   0.9711342799,  0.9715491200,
+    0.9719610006,  0.9723699204,  0.9727758782,   0.9731788728,  0.9735789029,
+    0.9739759673,  0.9743700648,  0.9747611942,   0.9751493543,  0.9755345439,
+    0.9759167619,  0.9762960071,  0.9766722783,   0.9770455744,  0.9774158943,
+    0.9777832368,  0.9781476007,  0.9785089851,   0.9788673888,  0.9792228106,
+    0.9795752496,  0.9799247046,  0.9802711746,   0.9806146585,  0.9809551553,
+    0.9812926640,  0.9816271834,  0.9819587127,   0.9822872507,  0.9826127965,
+    0.9829353491,  0.9832549076,  0.9835714708,   0.9838850379,  0.9841956080,
+    0.9845031800,  0.9848077530,  0.9851093262,   0.9854078985,  0.9857034691,
+    0.9859960371,  0.9862856015,  0.9865721616,   0.9868557164,  0.9871362651,
+    0.9874138068,  0.9876883406,  0.9879598658,   0.9882283814,  0.9884938868,
+    0.9887563810,  0.9890158634,  0.9892723330,   0.9895257891,  0.9897762309,
+    0.9900236577,  0.9902680687,  0.9905094632,   0.9907478405,  0.9909831997,
+    0.9912155403,  0.9914448614,  0.9916711624,   0.9918944426,  0.9921147013,
+    0.9923319379,  0.9925461516,  0.9927573419,   0.9929655081,  0.9931706495,
+    0.9933727656,  0.9935718557,  0.9937679192,   0.9939609555,  0.9941509640,
+    0.9943379441,  0.9945218954,  0.9947028171,   0.9948807088,  0.9950555700,
+    0.9952274000,  0.9953961984,  0.9955619646,   0.9957246982,  0.9958843986,
+    0.9960410654,  0.9961946981,  0.9963452962,   0.9964928592,  0.9966373868,
+    0.9967788785,  0.9969173337,  0.9970527522,   0.9971851335,  0.9973144772,
+    0.9974407829,  0.9975640503,  0.9976842788,   0.9978014683,  0.9979156183,
+    0.9980267284,  0.9981347984,  0.9982398279,   0.9983418166,  0.9984407642,
+    0.9985366703,  0.9986295348,  0.9987193572,   0.9988061373,  0.9988898750,
+    0.9989705698,  0.9990482216,  0.9991228301,   0.9991943951,  0.9992629164,
+    0.9993283938,  0.9993908270,  0.9994502159,   0.9995065604,  0.9995598601,
+    0.9996101150,  0.9996573250,  0.9997014898,   0.9997426093,  0.9997806835,
+    0.9998157121,  0.9998476952,  0.9998766325,   0.9999025240,  0.9999253697,
+    0.9999451694,  0.9999619231,  0.9999756307,   0.9999862922,  0.9999939077,
+    0.9999984769
+};
diff --git a/common/worksheet.cpp b/common/worksheet.cpp
index c6cb1dd202..23a2fab7c3 100644
--- a/common/worksheet.cpp
+++ b/common/worksheet.cpp
@@ -4,12 +4,16 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "macros.h"
-
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "drawtxt.h"
+#include "confirm.h"
+#include "wxstruct.h"
 #include "worksheet.h"
 
+
 /* Must be defined in main applications: */
 extern wxString g_Main_Title;
 
diff --git a/common/wxwineda.cpp b/common/wxwineda.cpp
index 94e588c6ad..0ed3429a86 100644
--- a/common/wxwineda.cpp
+++ b/common/wxwineda.cpp
@@ -8,6 +8,7 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "wxstruct.h"
 
 
 /**********************************************************************************/
@@ -23,7 +24,7 @@ WinEDA_EnterText::WinEDA_EnterText( wxWindow* parent,
     if( TextToEdit )
         m_NewText = TextToEdit;
 
-    m_Title = new       wxStaticText( parent, -1, Title );
+    m_Title = new wxStaticText( parent, -1, Title );
 
     m_Title->SetForegroundColour( wxColour( 200, 0, 0 ) );
     BoxSizer->Add( m_Title, 0, wxGROW | wxLEFT | wxRIGHT | wxTOP | wxADJUST_MINSIZE, 5 );
diff --git a/common/zoom.cpp b/common/zoom.cpp
index 170571be0b..abb5307f34 100644
--- a/common/zoom.cpp
+++ b/common/zoom.cpp
@@ -8,14 +8,13 @@
  */
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "macros.h"
-
 #include "bitmaps.h"
-
 #include "id.h"
-
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "wxstruct.h"
 
 /**************************************************/
 void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse )
diff --git a/cvpcb/autosel.cpp b/cvpcb/autosel.cpp
index f8343d2dc9..a6694d0e7b 100644
--- a/cvpcb/autosel.cpp
+++ b/cvpcb/autosel.cpp
@@ -5,11 +5,13 @@
 /* Routines de selection automatique des modules */
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "cvpcb.h"
+#include "confirm.h"
+#include "gestfich.h"
 
+#include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
 
 #define QUOTE '\''
 
diff --git a/cvpcb/cfg.cpp b/cvpcb/cfg.cpp
index 71f7d729ad..93c629b939 100644
--- a/cvpcb/cfg.cpp
+++ b/cvpcb/cfg.cpp
@@ -5,11 +5,12 @@
 /* lit ou met a jour la configuration de CVPCB */
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "gestfich.h"
 #include "cvpcb.h"
 #include "protos.h"
-
+#include "cvstruct.h"
 #include "cfg.h"
 
 /* Routines Locales */
diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp
index 712532d04d..59a8b34df0 100644
--- a/cvpcb/cvframe.cpp
+++ b/cvpcb/cvframe.cpp
@@ -2,17 +2,21 @@
 /* File: cvframe.cpp */
 /*********************/
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "eda_doc.h"
+#include "gestfich.h"
+#include "id.h"
+
 #include <wx/fontdlg.h>
 
 #include "cvpcb.h"
 #include "pcbnew.h"
-
 #include "bitmaps.h"
-
 #include "protos.h"
+#include "cvstruct.h"
 
-#include "id.h"
 
 #define FRAME_MIN_SIZE_X 450
 #define FRAME_MIN_SIZE_Y 300
diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp
index c325575f36..1183b0b8cd 100644
--- a/cvpcb/cvpcb.cpp
+++ b/cvpcb/cvpcb.cpp
@@ -5,17 +5,19 @@
 #define eda_global
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
+#include "id.h"
 
 #include "cvpcb.h"
-#include "trigo.h"
 #include "zones.h"
-
 #include "bitmaps.h"
-
 #include "protos.h"
+#include "cvstruct.h"
 
-#include "id.h"
+#include <wx/snglinst.h>
 
 wxString g_Main_Title = wxT( "CVpcb" );
 
diff --git a/cvpcb/cvpcb.h b/cvpcb/cvpcb.h
index 6abf1bd8cd..1f1911e02e 100644
--- a/cvpcb/cvpcb.h
+++ b/cvpcb/cvpcb.h
@@ -7,12 +7,7 @@
 #define eda_global extern
 #endif
 
-#include "wxstruct.h"
 #include "pcbnew.h"
-#include "cvstruct.h"
-
-#include "gr_basic.h"
-#include "colors.h"
 
 // config for footprints doc file acces
 #define DOC_FOOTPRINTS_LIST_KEY wxT("footprints_doc_file")
diff --git a/cvpcb/dialog_display_options.cpp b/cvpcb/dialog_display_options.cpp
index 1375f50453..81dc039ee1 100644
--- a/cvpcb/dialog_display_options.cpp
+++ b/cvpcb/dialog_display_options.cpp
@@ -15,17 +15,6 @@
 #pragma implementation "dialog_display_options.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 #include "fctsys.h"
@@ -34,6 +23,8 @@
 #include "common.h"
 #include "cvpcb.h"
 #include "protos.h"
+#include "class_drawpanel.h"
+#include "cvstruct.h"
 
 #include "dialog_display_options.h"
 
diff --git a/cvpcb/displayframe.cpp b/cvpcb/displayframe.cpp
index 11a00e8632..1e44c07d6e 100644
--- a/cvpcb/displayframe.cpp
+++ b/cvpcb/displayframe.cpp
@@ -3,13 +3,15 @@
 /*********************************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "id.h"
 
 #include "cvpcb.h"
-#include "id.h"
 #include "bitmaps.h"
-
 #include "protos.h"
+#include "cvstruct.h"
 
 
 /*****************************************************************/
diff --git a/cvpcb/genequiv.cpp b/cvpcb/genequiv.cpp
index 77e1be26c5..9a3fa9f0e6 100644
--- a/cvpcb/genequiv.cpp
+++ b/cvpcb/genequiv.cpp
@@ -1,59 +1,62 @@
-	/***************/
-	/* genstf()  */
-	/***************/
+/***************/
+/* genstf()  */
+/***************/
 
 /* genere le fichier STF type 'ref' 'nom_empreinte' pour DRAFT */
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
-#include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "cvpcb.h"
-
 #include "protos.h"
+#include "cvstruct.h"
 
-void WinEDA_CvpcbFrame::WriteStuffList(wxCommandEvent & event)
+
+void WinEDA_CvpcbFrame::WriteStuffList( wxCommandEvent& event )
 {
-FILE * FileEquiv;
-STORECMP * Cmp;
-wxString Line, FullFileName, Mask;
+    FILE*     FileEquiv;
+    STORECMP* Cmp;
+    wxString  Line, FullFileName, Mask;
 
-	if( nbcomp <= 0 ) return;
+    if( nbcomp <= 0 )
+        return;
 
-	/* calcul du nom du fichier */
-	Mask = wxT("*") + ExtRetroBuffer;
-	FullFileName = FFileName;
-	ChangeFileNameExt(FullFileName, ExtRetroBuffer);
+    /* calcul du nom du fichier */
+    Mask = wxT( "*" ) + ExtRetroBuffer;
+    FullFileName = FFileName;
+    ChangeFileNameExt( FullFileName, ExtRetroBuffer );
 
-	FullFileName = EDA_FileSelector( wxT("Create Stuff File"),
-					wxGetCwd(),					/* Chemin par defaut */
-					FullFileName,		/* nom fichier par defaut */
-					ExtRetroBuffer,		/* extension par defaut */
-					Mask,				/* Masque d'affichage */
-					this,
-					wxFD_SAVE,
-					TRUE
-					);
-	if ( FullFileName.IsEmpty() ) return;
+    FullFileName = EDA_FileSelector( wxT( "Create Stuff File" ),
+                                     wxGetCwd(),    /* Chemin par defaut */
+                                     FullFileName,  /* nom fichier par defaut */
+                                     ExtRetroBuffer, /* extension par defaut */
+                                     Mask,          /* Masque d'affichage */
+                                     this,
+                                     wxFD_SAVE,
+                                     TRUE  );
+    if( FullFileName.IsEmpty() )
+        return;
 
-	FileEquiv = wxFopen(FullFileName, wxT("wt") );
-	if (FileEquiv == 0 )
-	{
-		Line = _("Unable to create ") + FullFileName;
-		DisplayError(this, Line,30);
-		return;
-	}
+    FileEquiv = wxFopen( FullFileName, wxT( "wt" ) );
+    if( FileEquiv == 0 )
+    {
+        Line = _( "Unable to create " ) + FullFileName;
+        DisplayError( this, Line, 30 );
+        return;
+    }
 
-	/* Generation de la liste */
-	for (Cmp = g_BaseListeCmp ; Cmp != NULL ; Cmp = Cmp->Pnext )
-	{
-		/* génération du composant si son empreinte est définie */
-		if ( Cmp->m_Module.IsEmpty() ) continue;
-		fprintf(FileEquiv, "comp = \"%s\" module = \"%s\"\n",
-				CONV_TO_UTF8(Cmp->m_Reference),
-				CONV_TO_UTF8(Cmp->m_Module));
-	}
+    /* Generation de la liste */
+    for( Cmp = g_BaseListeCmp; Cmp != NULL; Cmp = Cmp->Pnext )
+    {
+        /* génération du composant si son empreinte est définie */
+        if( Cmp->m_Module.IsEmpty() )
+            continue;
+        fprintf( FileEquiv, "comp = \"%s\" module = \"%s\"\n",
+                 CONV_TO_UTF8( Cmp->m_Reference ),
+                 CONV_TO_UTF8( Cmp->m_Module ) );
+    }
 
-	fclose(FileEquiv);
+    fclose( FileEquiv );
 }
-
diff --git a/cvpcb/init.cpp b/cvpcb/init.cpp
index c947bafe1d..1324cc7820 100644
--- a/cvpcb/init.cpp
+++ b/cvpcb/init.cpp
@@ -1,214 +1,237 @@
-	/*******************************************************************/
-	/*  CVPCB: Routines de base :										  */
-	/* lecture Netliste et creation des fenetres composants et modules */
-	/*******************************************************************/
+/*******************************************************************/
+/*  CVPCB: Routines de base :										  */
+/* lecture Netliste et creation des fenetres composants et modules */
+/*******************************************************************/
 
 #include "fctsys.h"
 #include "common.h"
+#include "confirm.h"
+#include "gr_basic.h"
+#include "gestfich.h"
+#include "id.h"
 
 #include "cvpcb.h"
-#include "gr_basic.h"
-
 #include "protos.h"
-#include "id.h"
+#include "cvstruct.h"
 
 
 /* routines locales : */
 
 
 /**********************************************************/
-void WinEDA_CvpcbFrame::SetNewPkg(const wxString & package)
+void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
 /*********************************************************/
+
 /*
-	- Affecte un module au composant selectionne
-	- Selectionne le composant suivant
-*/
+ *   - Affecte un module au composant selectionne
+ *   - Selectionne le composant suivant
+ */
 {
-STORECMP * Composant;
-int ii, NumCmp, IsNew = 1;
-wxString Line;
+    STORECMP* Composant;
+    int       ii, NumCmp, IsNew = 1;
+    wxString  Line;
 
-	if ( g_BaseListeCmp == NULL ) return;
+    if( g_BaseListeCmp == NULL )
+        return;
 
-	NumCmp = m_ListCmp->GetSelection();
-	if( NumCmp < 0 )
-	{
-		NumCmp = 0;
-		m_ListCmp->SetSelection(NumCmp, TRUE);
-	}
+    NumCmp = m_ListCmp->GetSelection();
+    if( NumCmp < 0 )
+    {
+        NumCmp = 0;
+        m_ListCmp->SetSelection( NumCmp, TRUE );
+    }
 
-	Composant = g_BaseListeCmp;
-	for ( ii = 0; Composant != NULL; Composant = Composant->Pnext, ii++ )
-	{
-		if ( NumCmp == ii ) break;
-	}
+    Composant = g_BaseListeCmp;
+    for( ii = 0; Composant != NULL; Composant = Composant->Pnext, ii++ )
+    {
+        if( NumCmp == ii )
+            break;
+    }
 
-	if ( Composant == NULL ) return;
-	if ( ! Composant->m_Module.IsEmpty() ) IsNew = 0;
+    if( Composant == NULL )
+        return;
+    if( !Composant->m_Module.IsEmpty() )
+        IsNew = 0;
 
-	Composant->m_Module = package;
+    Composant->m_Module = package;
 
-	Line.Printf( CMP_FORMAT ,ii+1,
-			Composant->m_Reference.GetData(), Composant->m_Valeur.GetData(),
-			Composant->m_Module.GetData());
-	modified = 1;
-	if ( IsNew ) composants_non_affectes -= 1;
+    Line.Printf( CMP_FORMAT, ii + 1,
+                 Composant->m_Reference.GetData(), Composant->m_Valeur.GetData(),
+                 Composant->m_Module.GetData() );
+    modified = 1;
+    if( IsNew )
+        composants_non_affectes -= 1;
 
-	m_ListCmp->SetString(NumCmp, Line);
-	m_ListCmp->SetSelection(NumCmp, FALSE);
+    m_ListCmp->SetString( NumCmp, Line );
+    m_ListCmp->SetSelection( NumCmp, FALSE );
 
-	// We activate next component:
-	if ( NumCmp < (m_ListCmp->GetCount() - 1) ) NumCmp++;
-	m_ListCmp->SetSelection(NumCmp, TRUE);
+    // We activate next component:
+    if( NumCmp < (m_ListCmp->GetCount() - 1) )
+        NumCmp++;
+    m_ListCmp->SetSelection( NumCmp, TRUE );
 
-	Line.Printf( _("Components: %d (free: %d)"),
-					nbcomp, composants_non_affectes);
-	SetStatusText(Line,1);
+    Line.Printf( _( "Components: %d (free: %d)" ),
+                 nbcomp, composants_non_affectes );
+    SetStatusText( Line, 1 );
 }
 
+
 /********************************************/
 void WinEDA_CvpcbFrame::ReadNetListe()
 /*******************************************/
+
 /* Lecture de la netliste selon format, ainsi que du fichier des composants
-*/
+ */
 {
-STORECMP * Composant;
-wxString msg;
-int ii;
-int error_level;
+    STORECMP* Composant;
+    wxString  msg;
+    int       ii;
+    int       error_level;
 
-	error_level = ReadSchematicNetlist();
+    error_level = ReadSchematicNetlist();
 
-	if ( error_level < 0 ) return;
+    if( error_level < 0 )
+        return;
 
-	/* lecture des correspondances */
-	loadcmp();
+    /* lecture des correspondances */
+    loadcmp();
 
-	if (m_ListCmp == NULL ) return;
+    if( m_ListCmp == NULL )
+        return;
 
-	if ( ! NetInNameBuffer.IsEmpty() )
-		wxSetWorkingDirectory( wxPathOnly(NetInNameBuffer) );
+    if( !NetInNameBuffer.IsEmpty() )
+        wxSetWorkingDirectory( wxPathOnly( NetInNameBuffer ) );
 
-	Read_Config(NetInNameBuffer);	// relecture de la config (elle peut etre modifiée)
+    Read_Config( NetInNameBuffer );   // relecture de la config (elle peut etre modifiée)
 
-	listlib();
-	BuildFootprintListBox();
+    listlib();
+    BuildFootprintListBox();
 
-	m_ListCmp->Clear();
-	Composant = g_BaseListeCmp;
+    m_ListCmp->Clear();
+    Composant = g_BaseListeCmp;
 
-	composants_non_affectes = 0;
-	for ( ii = 1;Composant != NULL; Composant = Composant->Pnext, ii++ )
-		{
-		msg.Printf(CMP_FORMAT ,ii,
-				Composant->m_Reference.GetData(), Composant->m_Valeur.GetData(),
-				Composant->m_Module.GetData());
-		m_ListCmp->AppendLine(msg);
-		if( Composant->m_Module.IsEmpty() ) composants_non_affectes += 1;
-		}
-	if ( g_BaseListeCmp )
-		m_ListCmp->SetSelection(0, TRUE);
+    composants_non_affectes = 0;
+    for( ii = 1; Composant != NULL; Composant = Composant->Pnext, ii++ )
+    {
+        msg.Printf( CMP_FORMAT, ii,
+                    Composant->m_Reference.GetData(),
+                    Composant->m_Valeur.GetData(),
+                    Composant->m_Module.GetData() );
+        m_ListCmp->AppendLine( msg );
+        if( Composant->m_Module.IsEmpty() )
+            composants_non_affectes += 1;
+    }
 
-	msg.Printf(_("Componants: %d (free: %d)"), nbcomp, composants_non_affectes);
-	SetStatusText(msg,1);
+    if( g_BaseListeCmp )
+        m_ListCmp->SetSelection( 0, TRUE );
 
-	/* Mise a jour du titre de la fenetre principale */
-	wxString Title = g_Main_Title + wxT(" ") + GetBuildVersion();
-	msg.Printf( wxT("%s [%s]"), Title.GetData(), FFileName.GetData());
-	SetTitle(msg);
+    msg.Printf( _( "Componants: %d (free: %d)" ), nbcomp,
+                composants_non_affectes );
+    SetStatusText( msg, 1 );
 
+    /* Mise a jour du titre de la fenetre principale */
+    wxString Title = g_Main_Title + wxT( " " ) + GetBuildVersion();
+    msg.Printf( wxT( "%s [%s]" ), Title.GetData(), FFileName.GetData() );
+    SetTitle( msg );
 }
 
 
 /*****************************************************************/
-int WinEDA_CvpcbFrame::SaveNetList(const wxString & FullFilename)
+int WinEDA_CvpcbFrame::SaveNetList( const wxString& FullFilename )
 /*****************************************************************/
+
 /* Sauvegarde des fichiers netliste et cmp
-	Le nom complet du fichier Netliste doit etre dans FFileName.
-	Le nom du fichier cmp en est deduit
-*/
+ *   Le nom complet du fichier Netliste doit etre dans FFileName.
+ *   Le nom du fichier cmp en est deduit
+ */
 {
-wxString NetlistFullFileName = FullFilename;
+    wxString NetlistFullFileName = FullFilename;
 
-	if ( NetlistFullFileName.IsEmpty() )
-	{
-	wxString Mask = wxT("*") + NetExtBuffer;
-		if ( ! NetNameBuffer.IsEmpty() )
-		{
-			NetlistFullFileName = NetNameBuffer;
-			ChangeFileNameExt(NetlistFullFileName, NetExtBuffer);
-		}
+    if( NetlistFullFileName.IsEmpty() )
+    {
+        wxString Mask = wxT( "*" ) + NetExtBuffer;
+        if( !NetNameBuffer.IsEmpty() )
+        {
+            NetlistFullFileName = NetNameBuffer;
+            ChangeFileNameExt( NetlistFullFileName, NetExtBuffer );
+        }
 
-		NetlistFullFileName = EDA_FileSelector( _("Save NetList and Components List files"),
-						NetDirBuffer,		/* Chemin par defaut */
-						NetlistFullFileName,			/* nom fichier par defaut */
-						NetExtBuffer,		/* extension par defaut */
-						Mask,				/* Masque d'affichage */
-						this,
-						wxFD_SAVE,
-						TRUE
-						);
-	}
-	if ( NetlistFullFileName.IsEmpty() ) return -1;
+        NetlistFullFileName =
+            EDA_FileSelector( _( "Save NetList and Components List files" ),
+                              NetDirBuffer,         /* Chemin par defaut */
+                              NetlistFullFileName,  /* nom fichier par defaut */
+                              NetExtBuffer,         /* extension par defaut */
+                              Mask,                 /* Masque d'affichage */
+                              this,
+                              wxFD_SAVE,
+                              TRUE
+                              );
+    }
+    if( NetlistFullFileName.IsEmpty() )
+        return -1;
 
-	FFileName = NetlistFullFileName;
-	NetNameBuffer = NetlistFullFileName;
-	if( SaveComponentList(NetlistFullFileName) == 0 )
-	{
-		DisplayError(this, _("Unable to create component file (.cmp)") );
-		return 0;
-	}
+    FFileName     = NetlistFullFileName;
+    NetNameBuffer = NetlistFullFileName;
+    if( SaveComponentList( NetlistFullFileName ) == 0 )
+    {
+        DisplayError( this, _( "Unable to create component file (.cmp)" ) );
+        return 0;
+    }
 
-	dest = wxFopen(NetlistFullFileName, wxT("wt") );
-	if( dest == 0 )
-	{
-		DisplayError(this, _("Unable to create netlist file") );
-		return 0;
-	}
+    dest = wxFopen( NetlistFullFileName, wxT( "wt" ) );
+    if( dest == 0 )
+    {
+        DisplayError( this, _( "Unable to create netlist file" ) );
+        return 0;
+    }
 
-	GenNetlistPcbnew() ;
+    GenNetlistPcbnew();
 
-	return 1;
+    return 1;
 }
 
 
 /**********************************************************************/
-bool WinEDA_CvpcbFrame::ReadInputNetList(const wxString & FullFileName)
+bool WinEDA_CvpcbFrame::ReadInputNetList( const wxString& FullFileName )
 /**********************************************************************/
+
 /* Routine de selection du nom de la netliste d'entree, et de lecure de
-celle-ci
-*/
+ *  celle-ci
+ */
 {
-wxString Mask, Line;
+    wxString Mask, Line;
 
-	if ( FullFileName.IsEmpty()  )
-		{
-		if( ! NetInExtBuffer.IsEmpty() ) Mask = wxT("*") + NetInExtBuffer;
-		else Mask = wxT("*.net");
-		Line = EDA_FileSelector(_("Load Net List"),
-					NetDirBuffer,		/* Chemin par defaut */
-					NetInNameBuffer,	/* nom fichier par defaut */
-					NetInExtBuffer,		/* extension par defaut */
-					Mask,				/* Masque d'affichage */
-					this,
-					0,
-					FALSE
-					);
-		if ( Line.IsEmpty()) return(FALSE);
-		}
-	else Line = FullFileName;
+    if( FullFileName.IsEmpty() )
+    {
+        if( !NetInExtBuffer.IsEmpty() )
+            Mask = wxT( "*" ) + NetInExtBuffer;
+        else
+            Mask = wxT( "*.net" );
+        Line = EDA_FileSelector( _( "Load Net List" ),
+                                 NetDirBuffer,      /* Chemin par defaut */
+                                 NetInNameBuffer,   /* nom fichier par defaut */
+                                 NetInExtBuffer,    /* extension par defaut */
+                                 Mask,              /* Masque d'affichage */
+                                 this,
+                                 0,
+                                 FALSE
+                                 );
+        if( Line.IsEmpty() )
+            return FALSE;
+    }
+    else
+        Line = FullFileName;
 
-	NetInNameBuffer = Line;
-	NetNameBuffer = Line;
-	FFileName = NetInNameBuffer;
+    NetInNameBuffer = Line;
+    NetNameBuffer   = Line;
+    FFileName = NetInNameBuffer;
 
-	/* Mise a jour du titre de la fenetre principale */
-	Line = g_Main_Title + wxT(" ") + GetBuildVersion();
-	Line += wxT(" ") + NetInNameBuffer;
-	SetTitle(Line);
+    /* Mise a jour du titre de la fenetre principale */
+    Line  = g_Main_Title + wxT( " " ) + GetBuildVersion();
+    Line += wxT( " " ) + NetInNameBuffer;
+    SetTitle( Line );
 
-	ReadNetListe();
+    ReadNetListe();
 
-	return(TRUE);
+    return TRUE;
 }
-
diff --git a/cvpcb/listboxes.cpp b/cvpcb/listboxes.cpp
index fee8d692e8..ce84467438 100644
--- a/cvpcb/listboxes.cpp
+++ b/cvpcb/listboxes.cpp
@@ -3,14 +3,14 @@
 /*************************************************************************/
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
-#include "cvpcb.h"
-
 #include "id.h"
 
+#include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
+
 
 /******************************************************************************/
 /* Basic class (from wxListView) for displaying component and footprint lists */
diff --git a/cvpcb/listlib.cpp b/cvpcb/listlib.cpp
index f35f48c56f..99ace64287 100644
--- a/cvpcb/listlib.cpp
+++ b/cvpcb/listlib.cpp
@@ -1,250 +1,277 @@
-	/**************/
-	/* listlib.cpp */
-	/**************/
+/**************/
+/* listlib.cpp */
+/**************/
 
 /*
-cherche toutes les ref <chemin lib>*.??? si nom fichier pr‚sent,
-ou examine <chemin lib>[MODULE.LIB]
-*/
+ *  cherche toutes les ref <chemin lib>*.??? si nom fichier pr‚sent,
+ *  ou examine <chemin lib>[MODULE.LIB]
+ */
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
-
 #include "common.h"
-#include "cvpcb.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 
+#include "cvpcb.h"
 #include "protos.h"
 
-FILE *name_libmodules ;	 /* pour lecture librairie */
+FILE* name_libmodules;   /* pour lecture librairie */
 
 /* routines locales : */
-static void ReadDocLib(const wxString & ModLibName );
-static int LibCompare(void * mod1, void * mod2);
-static STOREMOD * TriListeModules(STOREMOD * BaseListe, int nbitems);
+static void      ReadDocLib( const wxString& ModLibName );
+static int       LibCompare( void* mod1, void* mod2 );
+static STOREMOD* TriListeModules( STOREMOD* BaseListe, int nbitems );
+
 /**/
 
 /*********************/
 int listlib()
 /*********************/
+
 /* Routine lisant la liste des librairies, et generant la liste chainee
- des modules disponibles
-
-Module descr format:
-$MODULE c64acmd
-Li c64acmd
-Cd Connecteur DIN Europe 96 Contacts AC male droit
-Kw PAD_CONN DIN
-$EndMODULE
-
-*/
+ *  des modules disponibles
+ *
+ *  Module descr format:
+ *  $MODULE c64acmd
+ *  Li c64acmd
+ *  Cd Connecteur DIN Europe 96 Contacts AC male droit
+ *  Kw PAD_CONN DIN
+ *  $EndMODULE
+ *
+ */
 {
-char buffer[1024];
-wxString FullLibName;
-int errorlevel = 0, end;
-int flag_librairie;
-STOREMOD * ItemLib;
-unsigned ii;
-wxString msg;
-	
-	if( g_BaseListePkg )	/* Liste Deja existante, a supprimer */
-	{
-		FreeMemoryModules(); g_BaseListePkg = NULL;
-	}
+    char      buffer[1024];
+    wxString  FullLibName;
+    int       errorlevel = 0, end;
+    int       flag_librairie;
+    STOREMOD* ItemLib;
+    unsigned  ii;
+    wxString  msg;
 
-	if ( g_LibName_List.GetCount() == 0 ) return -4;
+    if( g_BaseListePkg )    /* Liste Deja existante, a supprimer */
+    {
+        FreeMemoryModules();
+        g_BaseListePkg = NULL;
+    }
 
-	/* init recherche */
-	SetRealLibraryPath( wxT("modules"));
-	nblib = 0;
+    if( g_LibName_List.GetCount() == 0 )
+        return -4;
 
-	/* Lecture des Librairies */
-	for( ii= 0 ; ii < g_LibName_List.GetCount(); ii++)
-	{
-		/* Calcul du nom complet de la librairie */
-		FullLibName = MakeFileName(g_RealLibDirBuffer, g_LibName_List[ii], LibExtBuffer);
-		/* acces a une librairie */
-		if ((name_libmodules = wxFopen(FullLibName, wxT("rt")))  == NULL )
-		{
-			msg.Printf( _("Library file <%s> not found"),FullLibName.GetData());
-			DisplayError(NULL, msg, 20);
-			continue;
-		}
+    /* init recherche */
+    SetRealLibraryPath( wxT( "modules" ) );
+    nblib = 0;
 
-		/* Controle du type de la librairie : */
-		flag_librairie = 0;
-		fgets(buffer,32,name_libmodules) ;
-		if( strncmp(buffer,ENTETE_LIBRAIRIE,L_ENTETE_LIB) != 0 )
-			{
-			msg.Printf(_("Library file <%s> is not a module library"),
-					FullLibName.GetData());
-			DisplayError(NULL, msg, 20);
-			fclose(name_libmodules); continue;
-			}
+    /* Lecture des Librairies */
+    for( ii = 0; ii < g_LibName_List.GetCount(); ii++ )
+    {
+        /* Calcul du nom complet de la librairie */
+        FullLibName = MakeFileName( g_RealLibDirBuffer,
+                                    g_LibName_List[ii],
+                                    LibExtBuffer );
+        /* acces a une librairie */
+        if( ( name_libmodules = wxFopen( FullLibName, wxT( "rt" ) ) )  == NULL )
+        {
+            msg.Printf( _( "Library file <%s> not found" ),
+                        FullLibName.GetData() );
+            DisplayError( NULL, msg, 20 );
+            continue;
+        }
 
-		/* Lecture du nombre de composants */
-		fseek(name_libmodules,0,0) ;
+        /* Controle du type de la librairie : */
+        flag_librairie = 0;
+        fgets( buffer, 32, name_libmodules );
+        if( strncmp( buffer, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 )
+        {
+            msg.Printf( _( "Library file <%s> is not a module library" ),
+                        FullLibName.GetData() );
+            DisplayError( NULL, msg, 20 );
+            fclose( name_libmodules );
+            continue;
+        }
 
-		 /* lecture nom des composants : */
-		end = 0;
-		while( !end && fgets(buffer,255,name_libmodules) != NULL )
-		{
-			if(strnicmp(buffer,"$INDEX",6) == 0 )
-			{
-				while( fgets(buffer,255,name_libmodules) != NULL )
-				{
-					if(strnicmp(buffer,"$EndINDEX",6) == 0 )
-						{ end = 1; break; }
-				
-					ItemLib = new STOREMOD();
-					ItemLib->Pnext = g_BaseListePkg;
-					g_BaseListePkg = ItemLib;
-					ItemLib->m_Module = CONV_FROM_UTF8(StrPurge(buffer));
-					ItemLib->m_LibName = FullLibName;
+        /* Lecture du nombre de composants */
+        fseek( name_libmodules, 0, 0 );
 
-					nblib++;
-				}
-				if( !end ) errorlevel = -3;
-			}
-		}
-		fclose(name_libmodules);
-		ReadDocLib(FullLibName );
-	}
+        /* lecture nom des composants : */
+        end = 0;
+        while( !end && fgets( buffer, 255, name_libmodules ) != NULL )
+        {
+            if( strnicmp( buffer, "$INDEX", 6 ) == 0 )
+            {
+                while( fgets( buffer, 255, name_libmodules ) != NULL )
+                {
+                    if( strnicmp( buffer, "$EndINDEX", 6 ) == 0 )
+                    {
+                        end = 1;
+                        break;
+                    }
 
-	/* classement alphabetique: */
-	if( g_BaseListePkg )
-		g_BaseListePkg = TriListeModules(g_BaseListePkg, nblib);
+                    ItemLib = new STOREMOD();
+                    ItemLib->Pnext     = g_BaseListePkg;
+                    g_BaseListePkg     = ItemLib;
+                    ItemLib->m_Module  = CONV_FROM_UTF8( StrPurge( buffer ) );
+                    ItemLib->m_LibName = FullLibName;
 
-	return(errorlevel) ;
+                    nblib++;
+                }
+
+                if( !end )
+                    errorlevel = -3;
+            }
+        }
+
+        fclose( name_libmodules );
+        ReadDocLib( FullLibName );
+    }
+
+    /* classement alphabetique: */
+    if( g_BaseListePkg )
+        g_BaseListePkg = TriListeModules( g_BaseListePkg, nblib );
+
+    return errorlevel;
 }
 
+
 /************************************************/
-static int LibCompare(void * mod1, void * mod2)
+static int LibCompare( void* mod1, void* mod2 )
 /************************************************/
+
 /*
-routine compare() pour qsort() en classement alphabétique des modules
-*/
+ *  routine compare() pour qsort() en classement alphabétique des modules
+ */
 {
-int ii;
-STOREMOD *pt1 , *pt2;
+    int       ii;
+    STOREMOD* pt1, * pt2;
 
-	pt1 = * ((STOREMOD**)mod1);
-	pt2 = * ((STOREMOD**)mod2);
+    pt1 = *( (STOREMOD**) mod1 );
+    pt2 = *( (STOREMOD**) mod2 );
 
-	ii = StrNumICmp( pt1->m_Module.GetData(), pt2->m_Module.GetData() );
-	return(ii);
+    ii = StrNumICmp( pt1->m_Module.GetData(), pt2->m_Module.GetData() );
+    return ii;
 }
 
 
+/********************************************************************/
+static STOREMOD* TriListeModules( STOREMOD* BaseListe, int nbitems )
+/********************************************************************/
 
-/********************************************************************/
-static STOREMOD * TriListeModules(STOREMOD * BaseListe, int nbitems)
-/********************************************************************/
 /* Tri la liste des Modules par ordre alphabetique et met a jour
-le nouveau chainage avant/arriere
-	retourne un pointeur sur le 1er element de la liste
-*/
+ *  le nouveau chainage avant/arriere
+ *   retourne un pointeur sur le 1er element de la liste
+ */
 {
-STOREMOD ** bufferptr, * Item;
-int ii, nb;
+    STOREMOD** bufferptr, * Item;
+    int        ii, nb;
 
-	if (nbitems <= 0 ) return(NULL);
-	if ( BaseListe == NULL ) return(NULL);
+    if( nbitems <= 0 )
+        return NULL;
+    if( BaseListe == NULL )
+        return NULL;
 
-	if (nbitems == 1 ) return(BaseListe);	// Tri inutile et impossible
+    if( nbitems == 1 )
+        return BaseListe;                   // Tri inutile et impossible
 
-	bufferptr = (STOREMOD**)MyZMalloc( (nbitems+3) * sizeof(STOREMOD*) );
+    bufferptr = (STOREMOD**) MyZMalloc( (nbitems + 3) * sizeof(STOREMOD*) );
 
-	for( ii = 1, nb = 0, Item = BaseListe; Item != NULL; Item = Item->Pnext, ii++)
-		{
-		nb++;
-		bufferptr[ii] = Item;
-		}
+    for( ii = 1, nb = 0, Item = BaseListe;
+         Item != NULL;
+         Item = Item->Pnext, ii++ )
+    {
+        nb++;
+        bufferptr[ii] = Item;
+    }
 
-	/* ici bufferptr[0] = NULL et bufferptr[nbitem+1] = NULL et ces 2 valeurs
-	representent le chainage arriere du 1er element ( = NULL),
-	et le chainage avant du dernier element ( = NULL ) */
+    /* ici bufferptr[0] = NULL et bufferptr[nbitem+1] = NULL et ces 2 valeurs
+     *  representent le chainage arriere du 1er element ( = NULL),
+     *  et le chainage avant du dernier element ( = NULL ) */
 
-	qsort(bufferptr+1,nb,sizeof(STOREMOD*),
-							(int(*)(const void*,const void*))LibCompare) ;
+    qsort( bufferptr + 1, nb, sizeof(STOREMOD*),
+           ( int( * ) ( const void*, const void* ) )LibCompare );
 
-	/* Mise a jour du chainage */
-	for( ii = 1; ii <= nb; ii++ )
-	{
-		Item = bufferptr[ii];
-		Item->m_Num = ii;
-		Item->Pnext = bufferptr[ii+1];
-		Item->Pback = bufferptr[ii-1];
-	}
+    /* Mise a jour du chainage */
+    for( ii = 1; ii <= nb; ii++ )
+    {
+        Item = bufferptr[ii];
+        Item->m_Num = ii;
+        Item->Pnext = bufferptr[ii + 1];
+        Item->Pback = bufferptr[ii - 1];
+    }
 
-	Item = bufferptr[1];
-	MyFree(bufferptr);
+    Item = bufferptr[1];
+    MyFree( bufferptr );
 
-	return(Item);
+    return Item;
 }
 
 
+/***************************************************/
+static void ReadDocLib( const wxString& ModLibName )
+/***************************************************/
 
-/***************************************************/
-static void ReadDocLib(const wxString & ModLibName )
-/***************************************************/
 /* Routine de lecture du fichier Doc associe a la librairie ModLibName.
-	Cree en memoire la chaine liste des docs pointee par MList
-	ModLibName = full file Name de la librairie Modules
-*/
+ *   Cree en memoire la chaine liste des docs pointee par MList
+ *   ModLibName = full file Name de la librairie Modules
+ */
 {
-STOREMOD * NewMod;
-char Line[1024];
-wxString ModuleName;
-wxString docfilename;
-FILE * LibDoc;
+    STOREMOD* NewMod;
+    char      Line[1024];
+    wxString  ModuleName;
+    wxString  docfilename;
+    FILE*     LibDoc;
 
-	docfilename = ModLibName;
-	ChangeFileNameExt(docfilename, EXT_DOC);
+    docfilename = ModLibName;
+    ChangeFileNameExt( docfilename, EXT_DOC );
 
-	if( (LibDoc = wxFopen(docfilename, wxT("rt"))) == NULL ) return;
+    if( ( LibDoc = wxFopen( docfilename, wxT( "rt" ) ) ) == NULL )
+        return;
 
-	GetLine(LibDoc, Line, NULL, sizeof(Line) -1);
-	if(strnicmp( Line,ENTETE_LIBDOC, L_ENTETE_LIB) != 0) return;
+    GetLine( LibDoc, Line, NULL, sizeof(Line) - 1 );
+    if( strnicmp( Line, ENTETE_LIBDOC, L_ENTETE_LIB ) != 0 )
+        return;
 
-	/* Lecture de la librairie */
-	while( GetLine(LibDoc,Line, NULL, sizeof(Line) -1) )
-		{
-		NewMod = NULL;
-		if( Line[0] != '$' ) continue;
-		if( Line[1] == 'E' ) break;;
-		if( Line[1] == 'M' )	/* Debut decription 1 module */
-			{
-			while( GetLine(LibDoc,Line, NULL, sizeof(Line) -1) )
-				{
-				if( Line[0] ==  '$' )	/* $EndMODULE */
-						break;
-				switch( Line[0] )
-					{
-					case 'L':	/* LibName */
-						ModuleName = CONV_FROM_UTF8(StrPurge(Line+3));
-						NewMod = g_BaseListePkg;
-						while ( NewMod )
-						{
-							if( ModuleName == NewMod->m_Module ) break;
-							NewMod = NewMod->Pnext;
-						}
-						break;
+    /* Lecture de la librairie */
+    while( GetLine( LibDoc, Line, NULL, sizeof(Line) - 1 ) )
+    {
+        NewMod = NULL;
+        if( Line[0] != '$' )
+            continue;
+        if( Line[1] == 'E' )
+            break;;
+        if( Line[1] == 'M' )    /* Debut decription 1 module */
+        {
+            while( GetLine( LibDoc, Line, NULL, sizeof(Line) - 1 ) )
+            {
+                if( Line[0] ==  '$' )   /* $EndMODULE */
+                    break;
+                switch( Line[0] )
+                {
+                case 'L':       /* LibName */
+                    ModuleName = CONV_FROM_UTF8( StrPurge( Line + 3 ) );
+                    NewMod     = g_BaseListePkg;
+                    while( NewMod )
+                    {
+                        if( ModuleName == NewMod->m_Module )
+                            break;
+                        NewMod = NewMod->Pnext;
+                    }
 
-					case 'K':	/* KeyWords */
-						if( NewMod && (! NewMod->m_KeyWord) )
-							NewMod->m_KeyWord = CONV_FROM_UTF8(StrPurge(Line+3) );
-						break;
+                    break;
 
-					case 'C':	/* Doc */
-						if( NewMod && (! NewMod->m_Doc ) )
-							NewMod->m_Doc = CONV_FROM_UTF8(StrPurge(Line+3) );
-						break;
-					}
-				}
-			} /* lecture 1 descr module */
-		}	/* Fin lecture librairie */
-	fclose(LibDoc);
+                case 'K':       /* KeyWords */
+                    if( NewMod && (!NewMod->m_KeyWord) )
+                        NewMod->m_KeyWord = CONV_FROM_UTF8( StrPurge( Line + 3 ) );
+                    break;
+
+                case 'C':       /* Doc */
+                    if( NewMod && (!NewMod->m_Doc ) )
+                        NewMod->m_Doc = CONV_FROM_UTF8( StrPurge( Line + 3 ) );
+                    break;
+                }
+            }
+        }       /* lecture 1 descr module */
+    }           /* Fin lecture librairie */
+
+    fclose( LibDoc );
 }
-
-
diff --git a/cvpcb/loadcmp.cpp b/cvpcb/loadcmp.cpp
index f59ca69d87..903255c78f 100644
--- a/cvpcb/loadcmp.cpp
+++ b/cvpcb/loadcmp.cpp
@@ -3,11 +3,15 @@
 /***************************************************/
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
 
 
 /*****************************************************************/
@@ -103,7 +107,8 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName )
             }
         }
 
-        fclose( lib_module ); lib_module = 0;
+        fclose( lib_module );
+        lib_module = 0;
     }
 
     if( lib_module )
diff --git a/cvpcb/menucfg.cpp b/cvpcb/menucfg.cpp
index 8c53d44a6c..28776fe290 100644
--- a/cvpcb/menucfg.cpp
+++ b/cvpcb/menucfg.cpp
@@ -5,10 +5,14 @@
 /* cree et/ou affiche et modifie la configuration de CVPCB */
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
 
 
 /*****************************************/
diff --git a/cvpcb/readschematicnetlist.cpp b/cvpcb/readschematicnetlist.cpp
index 06579d8d6e..a958f59958 100644
--- a/cvpcb/readschematicnetlist.cpp
+++ b/cvpcb/readschematicnetlist.cpp
@@ -8,12 +8,15 @@
  */
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
-#include "cvpcb.h"
+#include "confirm.h"
+#include "kicad_string.h"
 
+#include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
+
 
 #define SEPARATEUR '|'  /* caractere separateur dans netliste */
 
diff --git a/cvpcb/savecmp.cpp b/cvpcb/savecmp.cpp
index e7c6ffad71..486f751db5 100644
--- a/cvpcb/savecmp.cpp
+++ b/cvpcb/savecmp.cpp
@@ -1,167 +1,181 @@
-	/**************/
-	/* savecmp()  */
-	/**************/
+/**************/
+/* savecmp()  */
+/**************/
 
 /* sauvegarde la liste des associations composants/empreintes */
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+
 #include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
+
 
 /* Chaines de caractere d'identification */
-char EnteteCmpMod[] = {"Cmp-Mod V01"};
+char EnteteCmpMod[] = { "Cmp-Mod V01" };
 
 /****************************************************************************/
-int WinEDA_CvpcbFrame::SaveComponentList(const wxString & NetlistFullFileName)
+int WinEDA_CvpcbFrame::SaveComponentList( const wxString& NetlistFullFileName )
 /*****************************************************************************/
+
 /* Routine de sauvegarde du fichier des modules
-	Retourne 1 si OK
-			0 si ecriture non faite
-*/
+ *   Retourne 1 si OK
+ *           0 si ecriture non faite
+ */
 {
-STORECMP * Cmp;
-wxString FullFileName;
-char Line[1024];
-wxString Title = g_Main_Title + wxT(" ") + GetBuildVersion();
+    STORECMP* Cmp;
+    wxString  FullFileName;
+    char      Line[1024];
+    wxString  Title = g_Main_Title + wxT( " " ) + GetBuildVersion();
 
-	/* calcul du nom du fichier */
-	FullFileName = NetlistFullFileName;
-	ChangeFileNameExt(FullFileName, g_ExtCmpBuffer);
+    /* calcul du nom du fichier */
+    FullFileName = NetlistFullFileName;
+    ChangeFileNameExt( FullFileName, g_ExtCmpBuffer );
 
-	dest = wxFopen(FullFileName, wxT("wt") );
-	if( dest == NULL ) return(0);	/* Erreur ecriture */
+    dest = wxFopen( FullFileName, wxT( "wt" ) );
+    if( dest == NULL )
+        return 0;                   /* Erreur ecriture */
 
-	fprintf(dest,"%s", EnteteCmpMod);
-	fprintf(dest," Created by %s", CONV_TO_UTF8(Title));
-	fprintf(dest," date = %s\n", DateAndTime(Line));
+    fprintf( dest, "%s", EnteteCmpMod );
+    fprintf( dest, " Created by %s", CONV_TO_UTF8( Title ) );
+    fprintf( dest, " date = %s\n", DateAndTime( Line ) );
 
-	for ( Cmp = g_BaseListeCmp ; Cmp != NULL ; Cmp = Cmp->Pnext )
-		{
-		fprintf(dest,"\nBeginCmp\n");
-		fprintf(dest,"TimeStamp = %s;\n", CONV_TO_UTF8(Cmp->m_TimeStamp));
-		fprintf(dest,"Reference = %s;\n", CONV_TO_UTF8(Cmp->m_Reference));
-		fprintf(dest,"ValeurCmp = %s;\n", CONV_TO_UTF8(Cmp->m_Valeur));
-		fprintf(dest,"IdModule  = %s;\n", CONV_TO_UTF8(Cmp->m_Module));
-		fprintf(dest,"EndCmp\n");
-		}
-	fprintf(dest,"\nEndListe\n") ;
-	fclose(dest) ;
+    for( Cmp = g_BaseListeCmp; Cmp != NULL; Cmp = Cmp->Pnext )
+    {
+        fprintf( dest, "\nBeginCmp\n" );
+        fprintf( dest, "TimeStamp = %s;\n", CONV_TO_UTF8( Cmp->m_TimeStamp ) );
+        fprintf( dest, "Reference = %s;\n", CONV_TO_UTF8( Cmp->m_Reference ) );
+        fprintf( dest, "ValeurCmp = %s;\n", CONV_TO_UTF8( Cmp->m_Valeur ) );
+        fprintf( dest, "IdModule  = %s;\n", CONV_TO_UTF8( Cmp->m_Module ) );
+        fprintf( dest, "EndCmp\n" );
+    }
 
-	return(1) ;
+    fprintf( dest, "\nEndListe\n" );
+    fclose( dest );
+
+    return 1;
 }
 
+
 /****************/
 int loadcmp()
 /***************/
+
 /* recupere la liste des associations composants/empreintes
-*/
+ */
 {
-wxString timestamp, valeur, ilib, namecmp;
-bool read_cmp_data = FALSE, eof = FALSE;
-STORECMP * Cmp;
-char Line[1024], * ident, *data;
-wxString FullFileName;
+    wxString  timestamp, valeur, ilib, namecmp;
+    bool      read_cmp_data = FALSE, eof = FALSE;
+    STORECMP* Cmp;
+    char      Line[1024], * ident, * data;
+    wxString  FullFileName;
 
-	/* calcul du nom du fichier */
-	FullFileName = FFileName;
-	ChangeFileNameExt(FullFileName, g_ExtCmpBuffer);
+    /* calcul du nom du fichier */
+    FullFileName = FFileName;
+    ChangeFileNameExt( FullFileName, g_ExtCmpBuffer );
 
-	source = wxFopen(FullFileName, wxT("rt") );
-	if (source == NULL )
-	{
-		return(0) ;
-	}
+    source = wxFopen( FullFileName, wxT( "rt" ) );
+    if( source == NULL )
+    {
+        return 0;
+    }
 
-	/* Identification du Type de fichier CmpMod */
-	if ( fgets(Line,79,source) == 0 ) return(0);
-	if( strnicmp(Line, EnteteCmpMod, 11 ) != 0 ) /* old file version*/
-	{
-		fclose(source) ;
-		DisplayError( NULL, wxT("Old version of Componaent file, recreate it!"));
-		return(0) ;
-	}
-	
-	/* lecture de la liste */
-	while( ! eof && fgets(Line,79,source) != 0 )
-	{
-		if( strnicmp(Line, "EndListe", 8 ) == 0 ) break;
+    /* Identification du Type de fichier CmpMod */
+    if( fgets( Line, 79, source ) == 0 )
+        return 0;
+    if( strnicmp( Line, EnteteCmpMod, 11 ) != 0 ) /* old file version*/
+    {
+        fclose( source );
+        DisplayError( NULL,
+                      wxT( "Old version of Componaent file, recreate it!" ) );
+        return 0;
+    }
 
-		/* Recherche du debut de description du composant */
-		if( strnicmp(Line, "BeginCmp", 8 ) != 0 ) continue;
-		timestamp.Empty();
-		valeur.Empty();
-		ilib.Empty();
-		namecmp.Empty();
-		read_cmp_data = TRUE;
+    /* lecture de la liste */
+    while( !eof && fgets( Line, 79, source ) != 0 )
+    {
+        if( strnicmp( Line, "EndListe", 8 ) == 0 )
+            break;
 
-		while( ! eof && read_cmp_data )
-		{
-			if( fgets(Line, 1024,source) == 0 )
-			{
-				eof = TRUE; break;
-			}
-			
-			if( strnicmp(Line, "EndCmp", 6 ) == 0 )
-			{
-				read_cmp_data = TRUE; break;
-			}
+        /* Recherche du debut de description du composant */
+        if( strnicmp( Line, "BeginCmp", 8 ) != 0 )
+            continue;
+        timestamp.Empty();
+        valeur.Empty();
+        ilib.Empty();
+        namecmp.Empty();
+        read_cmp_data = TRUE;
 
-			ident = strtok ( Line,"=;\n\r");
-			data = strtok ( NULL,";\n\r");
-			if( strnicmp(ident, "TimeStamp", 9) == 0)
-			{
-				timestamp = CONV_FROM_UTF8(data);
-				timestamp.Trim(TRUE);
-				timestamp.Trim(FALSE);
-				continue;
-			}
+        while( !eof && read_cmp_data )
+        {
+            if( fgets( Line, 1024, source ) == 0 )
+            {
+                eof = TRUE; break;
+            }
 
-			if( strnicmp(ident, "Reference", 9) == 0)
-			{
-				namecmp = CONV_FROM_UTF8(data);
-				namecmp.Trim(TRUE);
-				namecmp.Trim(FALSE);
-				continue;
-			}
+            if( strnicmp( Line, "EndCmp", 6 ) == 0 )
+            {
+                read_cmp_data = TRUE; break;
+            }
 
-			if( strnicmp(ident, "ValeurCmp", 9) == 0)
-			{
-				valeur = CONV_FROM_UTF8(data);
-				valeur.Trim(TRUE);
-				valeur.Trim(FALSE);
-				continue;
-			}
+            ident = strtok( Line, "=;\n\r" );
+            data  = strtok( NULL, ";\n\r" );
+            if( strnicmp( ident, "TimeStamp", 9 ) == 0 )
+            {
+                timestamp = CONV_FROM_UTF8( data );
+                timestamp.Trim( TRUE );
+                timestamp.Trim( FALSE );
+                continue;
+            }
 
-			if( strnicmp(ident, "IdModule", 8) == 0)
-			{
-				ilib = CONV_FROM_UTF8(data);
-				ilib.Trim(TRUE);
-				ilib.Trim(FALSE);
-				continue;
-			}
-		} /* Fin lecture description de 1 composant */
+            if( strnicmp( ident, "Reference", 9 ) == 0 )
+            {
+                namecmp = CONV_FROM_UTF8( data );
+                namecmp.Trim( TRUE );
+                namecmp.Trim( FALSE );
+                continue;
+            }
 
-		/* Recherche du composant correspondant en netliste et
-			 mise a jour de ses parametres */
-		for ( Cmp = g_BaseListeCmp ; Cmp != NULL ; Cmp = Cmp->Pnext )
-		{
-			if (selection_type == 1 )
-			{
-				if( timestamp != Cmp->m_TimeStamp )
-					continue ;
-			}
-			else
-				if( namecmp != Cmp->m_Reference ) continue;
+            if( strnicmp( ident, "ValeurCmp", 9 ) == 0 )
+            {
+                valeur = CONV_FROM_UTF8( data );
+                valeur.Trim( TRUE );
+                valeur.Trim( FALSE );
+                continue;
+            }
 
-			/* composant identifie , copie du nom du module correspondant */
-			Cmp->m_Module= ilib;
-		}
-	}
-	fclose(source) ;
-	return(1) ;
+            if( strnicmp( ident, "IdModule", 8 ) == 0 )
+            {
+                ilib = CONV_FROM_UTF8( data );
+                ilib.Trim( TRUE );
+                ilib.Trim( FALSE );
+                continue;
+            }
+        } /* Fin lecture description de 1 composant */
+
+        /* Recherche du composant correspondant en netliste et
+         *    mise a jour de ses parametres */
+        for( Cmp = g_BaseListeCmp; Cmp != NULL; Cmp = Cmp->Pnext )
+        {
+            if( selection_type == 1 )
+            {
+                if( timestamp != Cmp->m_TimeStamp )
+                    continue;
+            }
+            else
+                if( namecmp != Cmp->m_Reference )
+                    continue;
+
+            /* composant identifie , copie du nom du module correspondant */
+            Cmp->m_Module = ilib;
+        }
+    }
+
+    fclose( source );
+    return 1;
 }
-
-
diff --git a/cvpcb/setvisu.cpp b/cvpcb/setvisu.cpp
index f717d61a77..cc1ed3dc13 100644
--- a/cvpcb/setvisu.cpp
+++ b/cvpcb/setvisu.cpp
@@ -3,14 +3,17 @@
 /*********************************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "cvpcb.h"
-#include "3d_viewer.h"
+#include "class_drawpanel.h"
 #include "id.h"
-#include "bitmaps.h"
 
+#include "3d_viewer.h"
+
+#include "bitmaps.h"
+#include "cvpcb.h"
 #include "protos.h"
+#include "cvstruct.h"
+
 
 /*******************************************/
 void WinEDA_CvpcbFrame::CreateScreenCmp()
diff --git a/cvpcb/tool_cvpcb.cpp b/cvpcb/tool_cvpcb.cpp
index 1fd0ebac7e..8b149bfaff 100644
--- a/cvpcb/tool_cvpcb.cpp
+++ b/cvpcb/tool_cvpcb.cpp
@@ -3,16 +3,15 @@
 /***************************************************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
-#include "cvpcb.h"
+#include "id.h"
 #include "trigo.h"
 
-#include "protos.h"
-
 #include "bitmaps.h"
-
-#include "id.h"
+#include "cvpcb.h"
+#include "protos.h"
+#include "cvstruct.h"
 
 
 /*********************************************/
diff --git a/cvpcb/writenetlistpcbnew.cpp b/cvpcb/writenetlistpcbnew.cpp
index d65f4be977..f203d462c2 100644
--- a/cvpcb/writenetlistpcbnew.cpp
+++ b/cvpcb/writenetlistpcbnew.cpp
@@ -1,29 +1,30 @@
-	/***************************/
-	/* writenetlistpcbnew.cpp  */
-	/***************************/
+/***************************/
+/* writenetlistpcbnew.cpp  */
+/***************************/
 
 /*
-Complete la netliste (*.NET) en y placant les ref *.lib FORMAT PCBNEW ou ORCADPCB
-*/
+ *  Complete la netliste (*.NET) en y placant les ref *.lib FORMAT PCBNEW ou ORCADPCB
+ */
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "cvpcb.h"
+#include "confirm.h"
+#include "kicad_string.h"
 
+#include "cvpcb.h"
 #include "protos.h"
 
 #define MAX_LEN_NETNAME 16
 
 /* Routines locales */
-static void TriPinsModule( STORECMP * CurrentCmp );
-static int PinCompare(const void *cmp1, const void *cmp2);
-static void ChangePinNet(  wxString &  PinNet );
-static void WriteFootprintFilterInfos(FILE * dest);
+static void TriPinsModule( STORECMP* CurrentCmp );
+static int  PinCompare( const void* cmp1, const void* cmp2 );
+static void ChangePinNet(  wxString& PinNet );
+static void WriteFootprintFilterInfos( FILE* dest );
 
 /* Variables Locales */
-int NetNumCode;			/* Nombre utilise pour cree des NetNames lors de
-						reaffectation de NetNames */
+int NetNumCode;         /* Nombre utilise pour cree des NetNames lors de
+                         *  reaffectation de NetNames */
 
 
 /*************************/
@@ -31,205 +32,228 @@ int GenNetlistPcbnew()
 /*************************/
 {
 #define NETLIST_HEAD_STRING "EESchema Netlist Version 1.1"
-char Line[1024];
-STOREPIN * Pin;
-STORECMP * CurrentCmp;
-wxString Title = g_Main_Title + wxT(" ") + GetBuildVersion();
+    char      Line[1024];
+    STOREPIN* Pin;
+    STORECMP* CurrentCmp;
+    wxString  Title = g_Main_Title + wxT( " " ) + GetBuildVersion();
 
-	NetNumCode = 1; DateAndTime(Line);
-	if ( g_FlagEESchema )
-		fprintf( dest, "# %s created  %s\n(\n", NETLIST_HEAD_STRING, Line);
-	else fprintf( dest, "( { netlist created  %s }\n", Line );
+    NetNumCode = 1; DateAndTime( Line );
+    if( g_FlagEESchema )
+        fprintf( dest, "# %s created  %s\n(\n", NETLIST_HEAD_STRING, Line );
+    else
+        fprintf( dest, "( { netlist created  %s }\n", Line );
 
-	  /***********************/
-	  /* Lecture de la liste */
-	  /***********************/
+    /***********************/
+    /* Lecture de la liste */
+    /***********************/
 
-	CurrentCmp = g_BaseListeCmp;
-	for( ; CurrentCmp != NULL; CurrentCmp = CurrentCmp->Pnext)
-	{
-		fprintf(dest," ( %s ", CONV_TO_UTF8(CurrentCmp->m_TimeStamp));
+    CurrentCmp = g_BaseListeCmp;
+    for( ; CurrentCmp != NULL; CurrentCmp = CurrentCmp->Pnext )
+    {
+        fprintf( dest, " ( %s ", CONV_TO_UTF8( CurrentCmp->m_TimeStamp ) );
 
-		if( ! CurrentCmp->m_Module.IsEmpty() )
-			fprintf(dest, CONV_TO_UTF8(CurrentCmp->m_Module));
+        if( !CurrentCmp->m_Module.IsEmpty() )
+            fprintf( dest, CONV_TO_UTF8( CurrentCmp->m_Module ) );
 
-		else fprintf(dest,"$noname$") ;
+        else
+            fprintf( dest, "$noname$" );
 
-		fprintf(dest," %s ",CONV_TO_UTF8(CurrentCmp->m_Reference)) ;
+        fprintf( dest, " %s ", CONV_TO_UTF8( CurrentCmp->m_Reference ) );
 
-		/* placement de la valeur */
-		fprintf(dest,"%s\n",CONV_TO_UTF8(CurrentCmp->m_Valeur)) ;
+        /* placement de la valeur */
+        fprintf( dest, "%s\n", CONV_TO_UTF8( CurrentCmp->m_Valeur ) );
 
-		/* Tri des pins */
-		TriPinsModule( CurrentCmp );
+        /* Tri des pins */
+        TriPinsModule( CurrentCmp );
 
-		/* Placement de la liste des pins */
-		Pin = CurrentCmp->m_Pins;
-		for( ; Pin != NULL; Pin = Pin->Pnext )
-		{
-			if( Pin->m_PinNet.Len() > MAX_LEN_NETNAME)
-				ChangePinNet( Pin->m_PinNet );
-				
-			if( ! Pin->m_PinNet.IsEmpty() )
-				fprintf(dest,"  ( %s %s )\n",
-					CONV_TO_UTF8(Pin->m_PinNum),
-					CONV_TO_UTF8(Pin->m_PinNet));
-			else
-				fprintf(dest,"  ( %s ? )\n", CONV_TO_UTF8(Pin->m_PinNum));
-		}
-		fprintf(dest," )\n");
-	}
-	fprintf(dest,")\n*\n");
-	if ( g_FlagEESchema ) WriteFootprintFilterInfos(dest);
-	fclose(dest);
-	return(0);
+        /* Placement de la liste des pins */
+        Pin = CurrentCmp->m_Pins;
+        for( ; Pin != NULL; Pin = Pin->Pnext )
+        {
+            if( Pin->m_PinNet.Len() > MAX_LEN_NETNAME )
+                ChangePinNet( Pin->m_PinNet );
+
+            if( !Pin->m_PinNet.IsEmpty() )
+                fprintf( dest, "  ( %s %s )\n",
+                         CONV_TO_UTF8( Pin->m_PinNum ),
+                         CONV_TO_UTF8( Pin->m_PinNet ) );
+            else
+                fprintf( dest, "  ( %s ? )\n", CONV_TO_UTF8( Pin->m_PinNum ) );
+        }
+
+        fprintf( dest, " )\n" );
+    }
+
+    fprintf( dest, ")\n*\n" );
+    if( g_FlagEESchema )
+        WriteFootprintFilterInfos( dest );
+    fclose( dest );
+    return 0;
 }
 
+
 /******************************************/
-void WriteFootprintFilterInfos(FILE * dest)
+void WriteFootprintFilterInfos( FILE* dest )
 /******************************************/
 /* Write the allowed footprint list for each component */
 {
-STORECMP * component = g_BaseListeCmp;
-bool WriteHeader = FALSE;
-	
-	for ( ; component != NULL; component = component->Pnext )
-	{
-		unsigned int FilterCount;
-		FilterCount = component->m_FootprintFilter.GetCount();
-		if ( FilterCount == 0 ) continue;
-		if ( ! WriteHeader ) 
-		{
-			fprintf( dest, "{ Allowed footprints by component:\n" );
-			WriteHeader = TRUE;
-		}
-		fprintf(dest, "$component %s\n", CONV_TO_UTF8(component->m_Reference));
-		/* Write the footprint list */
-		for ( unsigned int jj = 0; jj < FilterCount; jj ++ )
-		{
-			fprintf(dest, " %s\n", CONV_TO_UTF8(component->m_FootprintFilter[jj]));
-		}
-		fprintf(dest, "$endlist\n");
-	}
-	if ( WriteHeader ) 
-		fprintf(dest, "$endfootprintlist\n}\n");
+    STORECMP* component   = g_BaseListeCmp;
+    bool      WriteHeader = FALSE;
+
+    for( ; component != NULL; component = component->Pnext )
+    {
+        unsigned int FilterCount;
+        FilterCount = component->m_FootprintFilter.GetCount();
+        if( FilterCount == 0 )
+            continue;
+        if( !WriteHeader )
+        {
+            fprintf( dest, "{ Allowed footprints by component:\n" );
+            WriteHeader = TRUE;
+        }
+        fprintf( dest, "$component %s\n",
+                 CONV_TO_UTF8( component->m_Reference ) );
+        /* Write the footprint list */
+        for( unsigned int jj = 0; jj < FilterCount; jj++ )
+        {
+            fprintf( dest, " %s\n",
+                     CONV_TO_UTF8( component->m_FootprintFilter[jj] ) );
+        }
+
+        fprintf( dest, "$endlist\n" );
+    }
+
+    if( WriteHeader )
+        fprintf( dest, "$endfootprintlist\n}\n" );
 }
 
+
 /***********************************************/
-static void TriPinsModule( STORECMP * CurrentCmp )
+static void TriPinsModule( STORECMP* CurrentCmp )
 /***********************************************/
+
 /* Tri et controle des pins du module CurrentCmp
-*/
+ */
 {
-STOREPIN * Pin, * NextPin, ** BasePin;
-int nbpins = 0, ii;
+    STOREPIN* Pin, * NextPin, ** BasePin;
+    int       nbpins = 0, ii;
 
-	Pin = CurrentCmp->m_Pins;
-	if( Pin == NULL ) return;
+    Pin = CurrentCmp->m_Pins;
+    if( Pin == NULL )
+        return;
 
-	/* comptage des pins */
-	for( ; Pin != NULL ; Pin = Pin->Pnext ) nbpins++;
+    /* comptage des pins */
+    for( ; Pin != NULL; Pin = Pin->Pnext )
+        nbpins++;
 
-	/* Tri des pins: etablissement de la liste des pointeurs */
-	BasePin = (STOREPIN ** )MyZMalloc( nbpins * sizeof(STOREPIN*) );
+    /* Tri des pins: etablissement de la liste des pointeurs */
+    BasePin = (STOREPIN**) MyZMalloc( nbpins * sizeof(STOREPIN*) );
 
-	Pin = CurrentCmp->m_Pins;
-	for( ii = 0 ; ii < nbpins ; ii++, Pin = Pin->Pnext )
-	{
-		BasePin[ii] = Pin;
-	}
-	/* Tri des Pins */
-	qsort( BasePin, nbpins, sizeof( STORECMP*), PinCompare) ;
+    Pin = CurrentCmp->m_Pins;
+    for( ii = 0; ii < nbpins; ii++, Pin = Pin->Pnext )
+    {
+        BasePin[ii] = Pin;
+    }
 
-	/* Remise a jour des pointeurs chaines */
-	for( ii = 0 ; ii < nbpins-1 ; ii++ )
-	{
-		BasePin[ii]->Pnext = BasePin[ii+1];
-	}
-	BasePin[ii]->Pnext = NULL;
-	CurrentCmp->m_Pins = BasePin[0];
+    /* Tri des Pins */
+    qsort( BasePin, nbpins, sizeof( STORECMP*), PinCompare );
 
-	MyFree(BasePin);
+    /* Remise a jour des pointeurs chaines */
+    for( ii = 0; ii < nbpins - 1; ii++ )
+    {
+        BasePin[ii]->Pnext = BasePin[ii + 1];
+    }
 
-	/* Elimination des redondances */
-	Pin = CurrentCmp->m_Pins;
-	while( Pin != NULL)
-	{
-		NextPin = Pin->Pnext;
-		if ( NextPin == NULL ) break;
-		if( Pin->m_PinNum != NextPin->m_PinNum )
-		{
-			Pin = Pin->Pnext;  continue;
-		}
-		/* 2 pins successives ont le meme numero */
-		if( Pin->m_PinNet != NextPin->m_PinNet )
-		{
-			wxString msg;
-			msg.Printf( _("%s %s pin %s : Different Nets"),
-					CurrentCmp->m_Reference.GetData(),CurrentCmp->m_Valeur.GetData(),
-					Pin->m_PinNum.GetData());
-			DisplayError(NULL, msg, 60 );
-		}
-		Pin->Pnext = NextPin->Pnext;
-		delete NextPin;
-	}
+    BasePin[ii]->Pnext = NULL;
+    CurrentCmp->m_Pins = BasePin[0];
+
+    MyFree( BasePin );
+
+    /* Elimination des redondances */
+    Pin = CurrentCmp->m_Pins;
+    while( Pin != NULL )
+    {
+        NextPin = Pin->Pnext;
+        if( NextPin == NULL )
+            break;
+        if( Pin->m_PinNum != NextPin->m_PinNum )
+        {
+            Pin = Pin->Pnext;  continue;
+        }
+        /* 2 pins successives ont le meme numero */
+        if( Pin->m_PinNet != NextPin->m_PinNet )
+        {
+            wxString msg;
+            msg.Printf( _( "%s %s pin %s : Different Nets" ),
+                        CurrentCmp->m_Reference.GetData(),
+                        CurrentCmp->m_Valeur.GetData(),
+                        Pin->m_PinNum.GetData() );
+            DisplayError( NULL, msg, 60 );
+        }
+        Pin->Pnext = NextPin->Pnext;
+        delete NextPin;
+    }
 }
 
 
 /*******************************************************/
-static int PinCompare(const void *cmp1,const void *cmp2)
+static int PinCompare( const void* cmp1, const void* cmp2 )
 /*******************************************************/
+
 /*
-routine PinCompare() pour qsort() pour classement alphabetique
-	pour tri de la liste des Pins
-*/
+ *  routine PinCompare() pour qsort() pour classement alphabetique
+ *   pour tri de la liste des Pins
+ */
 {
-STOREPIN **pt1 , **pt2 ;
-int ii;
+    STOREPIN** pt1, ** pt2;
+    int        ii;
 
-	pt1 = (STOREPIN**)cmp1;
-	pt2 = (STOREPIN**)cmp2;
+    pt1 = (STOREPIN**) cmp1;
+    pt2 = (STOREPIN**) cmp2;
 
-	ii = StrLenNumICmp( (*pt1)->m_PinNum.GetData(), (*pt2)->m_PinNum.GetData(), 4);
-	return(ii);
+    ii = StrLenNumICmp( (*pt1)->m_PinNum.GetData(),
+                        (*pt2)->m_PinNum.GetData(), 4 );
+    return ii;
 }
 
 
 /*******************************************/
-static void ChangePinNet( wxString & PinNet )
+static void ChangePinNet( wxString& PinNet )
 /*******************************************/
+
 /* Change le NetName PinNet par un nom compose des 8 derniers codes de PinNet
-	suivi de _Xnnnnn ou nnnnn est un nom de 0 a 99999
-*/
+ *   suivi de _Xnnnnn ou nnnnn est un nom de 0 a 99999
+ */
 {
-STOREPIN * Pin;
-STORECMP * CurrentCmp;
-int ii;
-wxString OldName;
-wxString NewName;
+    STOREPIN* Pin;
+    STORECMP* CurrentCmp;
+    int       ii;
+    wxString  OldName;
+    wxString  NewName;
 
-	OldName = PinNet;
-	ii = PinNet.Len();
-	if( Rjustify )  /* On conserve les 8 dernieres lettres du nom */
-	{
-		NewName= OldName.Right(8); NewName << NetNumCode;
-	}
+    OldName = PinNet;
+    ii = PinNet.Len();
+    if( Rjustify )  /* On conserve les 8 dernieres lettres du nom */
+    {
+        NewName = OldName.Right( 8 );
+        NewName << NetNumCode;
+    }
+    else             /* On conserve les 8 premieres lettres du nom */
+    {
+        NewName = OldName.Left( 8 );
+        NewName << NetNumCode;
+    }
+    NetNumCode++;
 
-	else			 /* On conserve les 8 premieres lettres du nom */
-	{
-		NewName = OldName.Left(8); NewName << NetNumCode;
-	}
-	NetNumCode ++;
-
-	CurrentCmp = g_BaseListeCmp;
-	for( ; CurrentCmp != NULL; CurrentCmp = CurrentCmp->Pnext)
-	{
-		Pin = CurrentCmp->m_Pins;
-		for( ; Pin != NULL; Pin = Pin->Pnext )
-		{
-			if( Pin->m_PinNet != OldName ) continue;
-			Pin->m_PinNet = NewName;
-		}
-	}
+    CurrentCmp = g_BaseListeCmp;
+    for( ; CurrentCmp != NULL; CurrentCmp = CurrentCmp->Pnext )
+    {
+        Pin = CurrentCmp->m_Pins;
+        for( ; Pin != NULL; Pin = Pin->Pnext )
+        {
+            if( Pin->m_PinNet != OldName )
+                continue;
+            Pin->m_PinNet = NewName;
+        }
+    }
 }
-
diff --git a/eeschema/affiche.cpp b/eeschema/affiche.cpp
index db14aad0ad..67f41e7b9f 100644
--- a/eeschema/affiche.cpp
+++ b/eeschema/affiche.cpp
@@ -7,6 +7,7 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "wxstruct.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp
index c44fec7d80..d10126e689 100644
--- a/eeschema/annotate.cpp
+++ b/eeschema/annotate.cpp
@@ -7,6 +7,9 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "wxstruct.h"
 #include "program.h"
 #include "libcmp.h"
 #include "protos.h"
diff --git a/eeschema/annotate_dialog.cpp b/eeschema/annotate_dialog.cpp
index 4ecdac14cb..9e5b3e716c 100644
--- a/eeschema/annotate_dialog.cpp
+++ b/eeschema/annotate_dialog.cpp
@@ -15,17 +15,6 @@
 #pragma implementation "annotate_dialog.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 
@@ -33,6 +22,7 @@
 #include "bitmaps.h"
 #include "common.h"
 #include "program.h"
+
 #include "annotate_dialog.h"
 
 extern void AnnotateComponents( WinEDA_SchematicFrame* parent,
diff --git a/eeschema/annotate_dialog.h b/eeschema/annotate_dialog.h
index f1c1299e88..27294f1bd5 100644
--- a/eeschema/annotate_dialog.h
+++ b/eeschema/annotate_dialog.h
@@ -32,6 +32,7 @@
 
 ////@begin forward declarations
 class wxBoxSizer;
+class WinEDA_SchematicFrame;
 ////@end forward declarations
 
 /*!
diff --git a/eeschema/backanno.cpp b/eeschema/backanno.cpp
index 5a185d6a2b..bbf805bdc6 100644
--- a/eeschema/backanno.cpp
+++ b/eeschema/backanno.cpp
@@ -4,9 +4,11 @@
 ****************************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "program.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "libcmp.h"
 #include "general.h"
 
@@ -15,8 +17,7 @@
 /*******************************************************************************************/
 bool WinEDA_SchematicFrame::FillFootprintFieldForAllInstancesofComponent(
     const wxString& aReference,
-    const wxString&
-    aFootPrint,
+    const wxString& aFootPrint,
     bool            aSetVisible )
 /********************************************************************************************/
 
diff --git a/eeschema/block.cpp b/eeschema/block.cpp
index ffd93c7a82..2ff84b50fd 100644
--- a/eeschema/block.cpp
+++ b/eeschema/block.cpp
@@ -4,12 +4,16 @@
 /****************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "block_commande.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/block_libedit.cpp b/eeschema/block_libedit.cpp
index 368547f1bc..d37a4bcf02 100644
--- a/eeschema/block_libedit.cpp
+++ b/eeschema/block_libedit.cpp
@@ -5,12 +5,14 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "block_commande.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 /* Variables Locales */
diff --git a/eeschema/build_BOM.cpp b/eeschema/build_BOM.cpp
index 27a1146041..2d5082fa59 100644
--- a/eeschema/build_BOM.cpp
+++ b/eeschema/build_BOM.cpp
@@ -9,9 +9,10 @@
 #include <vector>
 
 #include "fctsys.h"
-
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/bus-wire-junction.cpp b/eeschema/bus-wire-junction.cpp
index f38280e2fd..fc9057da85 100644
--- a/eeschema/bus-wire-junction.cpp
+++ b/eeschema/bus-wire-junction.cpp
@@ -4,12 +4,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/busentry.cpp b/eeschema/busentry.cpp
index 0622b3ec61..10a065bcf6 100644
--- a/eeschema/busentry.cpp
+++ b/eeschema/busentry.cpp
@@ -4,13 +4,14 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "id.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-#include "id.h"
-
 #include "protos.h"
 
 /* Routines Locales */
diff --git a/eeschema/class_drawsheet.cpp b/eeschema/class_drawsheet.cpp
index 30aaeafcfe..6754c16988 100644
--- a/eeschema/class_drawsheet.cpp
+++ b/eeschema/class_drawsheet.cpp
@@ -13,12 +13,14 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/class_hierarchical_PIN_sheet.cpp b/eeschema/class_hierarchical_PIN_sheet.cpp
index 6421bfeaed..69442a9a53 100644
--- a/eeschema/class_hierarchical_PIN_sheet.cpp
+++ b/eeschema/class_hierarchical_PIN_sheet.cpp
@@ -13,12 +13,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index 79aa9aabed..b26fe340cb 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -4,8 +4,7 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
-#include "common.h"
+#include "kicad_string.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/class_pin.cpp b/eeschema/class_pin.cpp
index a24cd87653..40893350e9 100644
--- a/eeschema/class_pin.cpp
+++ b/eeschema/class_pin.cpp
@@ -3,8 +3,11 @@
 /*****************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/class_screen.cpp b/eeschema/class_screen.cpp
index 9bbb15c1b7..f82cf52a46 100644
--- a/eeschema/class_screen.cpp
+++ b/eeschema/class_screen.cpp
@@ -2,12 +2,12 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
-#include "id.h"
 
 
 /******************************************************************/
diff --git a/eeschema/class_text-label.cpp b/eeschema/class_text-label.cpp
index 6ecb8a3041..a47d57278d 100644
--- a/eeschema/class_text-label.cpp
+++ b/eeschema/class_text-label.cpp
@@ -4,15 +4,15 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "trigo.h"
+#include "id.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/classes_body_items.cpp b/eeschema/classes_body_items.cpp
index 32e35b2b1a..c136a46f3f 100644
--- a/eeschema/classes_body_items.cpp
+++ b/eeschema/classes_body_items.cpp
@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/cleanup.cpp b/eeschema/cleanup.cpp
index ed382cf9be..1100170e1d 100644
--- a/eeschema/cleanup.cpp
+++ b/eeschema/cleanup.cpp
@@ -3,8 +3,9 @@
 /*********************************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/component_class.cpp b/eeschema/component_class.cpp
index 03d5ff3a32..fa84339449 100644
--- a/eeschema/component_class.cpp
+++ b/eeschema/component_class.cpp
@@ -4,8 +4,8 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp
index 09bad06ac0..c003ebdfdd 100644
--- a/eeschema/controle.cpp
+++ b/eeschema/controle.cpp
@@ -3,18 +3,15 @@
 /****************/
 
 #include "fctsys.h"
-
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "eda_dde.h"
+#include "id.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
-#include "eda_dde.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 /**************************************************************************************/
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index 09d0e63e1c..e1a8a250b8 100644
--- a/eeschema/cross-probing.cpp
+++ b/eeschema/cross-probing.cpp
@@ -3,7 +3,7 @@
 /*********************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "program.h"
 #include "libcmp.h"
diff --git a/eeschema/database.cpp b/eeschema/database.cpp
index 1380c30d69..43995b4932 100644
--- a/eeschema/database.cpp
+++ b/eeschema/database.cpp
@@ -1,14 +1,17 @@
-	/****************************/
-	/*	EESchema - database.cpp	*/
-	/****************************/
+/****************************/
+/*	EESchema - database.cpp	*/
+/****************************/
 
 /* Routine de selection d'un composant en librairie
-*/
+ */
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "eda_doc.h"
+#include "kicad_string.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
@@ -22,110 +25,119 @@
 
 
 /********************************************************************************/
-bool DataBaseGetName(WinEDA_DrawFrame * frame,
-		wxString & Keys, wxString & BufName)
+bool DataBaseGetName( WinEDA_DrawFrame* frame,
+                      wxString& Keys, wxString& BufName )
 /********************************************************************************/
+
 /*
-	Routine de selection du nom d'un composant en librairie pour chargement,
-	Keys pointe la liste des mots cles de filtrage
-	Si Keys = "", recherche des composants qui correspondent
-au masque BufName( avec * et ? )
-
- Retourne
-	TRUE si composant selectionne
-	FALSE si commande annulee
-	place le nom du composant a charger, selectionne a partir d'une liste dans
-	BufName
-*/
+ *   Routine de selection du nom d'un composant en librairie pour chargement,
+ *   Keys pointe la liste des mots cles de filtrage
+ *   Si Keys = "", recherche des composants qui correspondent
+ *  au masque BufName( avec * et ? )
+ *
+ *  Retourne
+ *   TRUE si composant selectionne
+ *   FALSE si commande annulee
+ *   place le nom du composant a charger, selectionne a partir d'une liste dans
+ *   BufName
+ */
 {
-int ii;
-EDA_LibComponentStruct * LibEntry;
-LibraryStruct * Lib;
-WinEDAListBox * ListBox;
-const wxChar ** ListNames;
+    int ii;
+    EDA_LibComponentStruct* LibEntry;
+    LibraryStruct*          Lib;
+    WinEDAListBox*          ListBox;
+    const wxChar**          ListNames;
 
-	BufName.MakeUpper();
-	Keys.MakeUpper();
+    BufName.MakeUpper();
+    Keys.MakeUpper();
 
-	/* Examen de la liste des librairies pour comptage */
-	for (Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext)
-		{
-		LibEntry = (EDA_LibComponentStruct *) PQFirst(&Lib->m_Entries, FALSE);
-		while( LibEntry )
-			{
-			if ( ! Keys.IsEmpty() )
-				{
-				if( KeyWordOk(Keys, LibEntry->m_KeyWord) ) ii++;
-				}
-			else
-				{
-				if( WildCompareString( BufName, LibEntry->m_Name.m_Text, FALSE ) ) ii++;
-				}
-			LibEntry = (EDA_LibComponentStruct *) PQNext(Lib->m_Entries, LibEntry, NULL);
-			}
-		}
+    /* Examen de la liste des librairies pour comptage */
+    for( Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext )
+    {
+        LibEntry = (EDA_LibComponentStruct*) PQFirst( &Lib->m_Entries, FALSE );
+        while( LibEntry )
+        {
+            if( !Keys.IsEmpty() )
+            {
+                if( KeyWordOk( Keys, LibEntry->m_KeyWord ) )
+                    ii++;
+            }
+            else
+            {
+                if( WildCompareString( BufName, LibEntry->m_Name.m_Text, FALSE ) )
+                    ii++;
+            }
+            LibEntry = (EDA_LibComponentStruct*) PQNext( Lib->m_Entries,
+                                                         LibEntry,
+                                                         NULL );
+        }
+    }
 
-	if ( ii == 0 )
-		{
-		DisplayError(frame, _("No Component found") );
-		return 0;
-		}
+    if( ii == 0 )
+    {
+        DisplayError( frame, _( "No Component found" ) );
+        return 0;
+    }
 
-	ListNames = (const wxChar**)MyZMalloc( (ii+1) * sizeof(const wxChar*));
-	for (Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext)
-		{
-		/* Examen de la liste des elements */
-		LibEntry = (EDA_LibComponentStruct *) PQFirst(&Lib->m_Entries, FALSE);
-		while( LibEntry )
-			{
-			if ( ! Keys.IsEmpty())
-				{
-				if( KeyWordOk(Keys, LibEntry->m_KeyWord) )
-					{
-					ListNames[ii] = LibEntry->m_Name.m_Text.GetData(); ii++;
-					}
-				}
-			else if( WildCompareString( BufName, LibEntry->m_Name.m_Text, FALSE ) ) 
-				{
-				ListNames[ii] = LibEntry->m_Name.m_Text; ii++;
-				}
-			LibEntry = (EDA_LibComponentStruct *) PQNext(Lib->m_Entries, LibEntry, NULL);
-			}
-		}
+    ListNames = (const wxChar**) MyZMalloc( (ii + 1) * sizeof(const wxChar*) );
+    for( Lib = g_LibraryList, ii = 0; Lib != NULL; Lib = Lib->m_Pnext )
+    {
+        /* Examen de la liste des elements */
+        LibEntry = (EDA_LibComponentStruct*) PQFirst( &Lib->m_Entries, FALSE );
+        while( LibEntry )
+        {
+            if( !Keys.IsEmpty() )
+            {
+                if( KeyWordOk( Keys, LibEntry->m_KeyWord ) )
+                {
+                    ListNames[ii] = LibEntry->m_Name.m_Text.GetData(); ii++;
+                }
+            }
+            else if( WildCompareString( BufName, LibEntry->m_Name.m_Text,
+                                        FALSE ) )
+            {
+                ListNames[ii] = LibEntry->m_Name.m_Text; ii++;
+            }
+            LibEntry = (EDA_LibComponentStruct*) PQNext( Lib->m_Entries,
+                                                         LibEntry,
+                                                         NULL );
+        }
+    }
 
-	ListBox = new WinEDAListBox(frame, _("Selection"), ListNames,
-						wxEmptyString, DisplayCmpDoc, wxColour(200,200,255) );
-	ListBox->MoveMouseToOrigin();
-		
-	/* Affichage de la liste selectionnee */
-	if( ii )
-		{
-		ii = ListBox->ShowModal(); ListBox->Destroy();
-		if ( ii < 0 ) ii = 0;
-		else
-			{
-			BufName = ListNames[ii];
-			ii = 1;
-			}
-		}
+    ListBox = new WinEDAListBox( frame, _( "Selection" ), ListNames,
+                                 wxEmptyString, DisplayCmpDoc,
+                                 wxColour( 200, 200, 255 ) );
+    ListBox->MoveMouseToOrigin();
+
+    /* Affichage de la liste selectionnee */
+    if( ii )
+    {
+        ii = ListBox->ShowModal(); ListBox->Destroy();
+        if( ii < 0 )
+            ii = 0;
+        else
+        {
+            BufName = ListNames[ii];
+            ii = 1;
+        }
+    }
 
 
-	free (ListNames);
-	return (ii) ;
+    free( ListNames );
+    return ii;
 }
 
 
 /**********************************/
-void DisplayCmpDoc(wxString & Name)
+void DisplayCmpDoc( wxString& Name )
 /**********************************/
 {
-LibCmpEntry * CmpEntry;
+    LibCmpEntry* CmpEntry;
 
-	CmpEntry = FindLibPart(Name.GetData(), wxEmptyString, FIND_ALIAS);
-	if ( CmpEntry == NULL ) return;
+    CmpEntry = FindLibPart( Name.GetData(), wxEmptyString, FIND_ALIAS );
+    if( CmpEntry == NULL )
+        return;
 
-	Name = wxT("Descr: ") + CmpEntry->m_Doc;
-	Name += wxT("\nKeyW: ") + CmpEntry->m_KeyWord;
+    Name  = wxT( "Descr: " ) + CmpEntry->m_Doc;
+    Name += wxT( "\nKeyW: " ) + CmpEntry->m_KeyWord;
 }
-
-
diff --git a/eeschema/delsheet.cpp b/eeschema/delsheet.cpp
index 5587b5ec8e..3b16c385bf 100644
--- a/eeschema/delsheet.cpp
+++ b/eeschema/delsheet.cpp
@@ -3,12 +3,12 @@
 /*******************************************************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/dialog_SVG_print.cpp b/eeschema/dialog_SVG_print.cpp
index 8ffe8f376e..2a53108e00 100644
--- a/eeschema/dialog_SVG_print.cpp
+++ b/eeschema/dialog_SVG_print.cpp
@@ -7,8 +7,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 
 #include "dialog_SVG_print_base.h"
 
diff --git a/eeschema/dialog_build_BOM.cpp b/eeschema/dialog_build_BOM.cpp
index 94a671c802..d43acb1c6a 100644
--- a/eeschema/dialog_build_BOM.cpp
+++ b/eeschema/dialog_build_BOM.cpp
@@ -16,18 +16,8 @@
 #pragma implementation "dialog_build_BOM.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 
 ////@begin includes
 ////@end includes
diff --git a/eeschema/dialog_create_component.cpp b/eeschema/dialog_create_component.cpp
index 9c29ec9ddf..7d22297ba9 100644
--- a/eeschema/dialog_create_component.cpp
+++ b/eeschema/dialog_create_component.cpp
@@ -15,21 +15,10 @@
 #pragma implementation "dialog_create_component.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/dialog_edit_component_in_schematic.cpp b/eeschema/dialog_edit_component_in_schematic.cpp
index 0c35512cf1..7868cf32b7 100644
--- a/eeschema/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialog_edit_component_in_schematic.cpp
@@ -5,12 +5,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 #include "dialog_edit_component_in_schematic.h"
diff --git a/eeschema/dialog_edit_label.cpp b/eeschema/dialog_edit_label.cpp
index 4c54b66990..5dc9ab48b1 100644
--- a/eeschema/dialog_edit_label.cpp
+++ b/eeschema/dialog_edit_label.cpp
@@ -10,6 +10,7 @@
 #include "wx/valgen.h"
 
 #include "common.h"
+#include "class_drawpanel.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialog_edit_libentry_fields_in_lib.cpp
index 1fd9d01bbd..aa20318eaa 100644
--- a/eeschema/dialog_edit_libentry_fields_in_lib.cpp
+++ b/eeschema/dialog_edit_libentry_fields_in_lib.cpp
@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/dialog_eeschema_config.cpp b/eeschema/dialog_eeschema_config.cpp
index fd2565bfe9..ad9bad323c 100644
--- a/eeschema/dialog_eeschema_config.cpp
+++ b/eeschema/dialog_eeschema_config.cpp
@@ -15,22 +15,14 @@
 #pragma implementation "dialog_eeschema_config.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/dialog_options.cpp b/eeschema/dialog_options.cpp
index 54609447a4..c106761d1d 100644
--- a/eeschema/dialog_options.cpp
+++ b/eeschema/dialog_options.cpp
@@ -16,27 +16,16 @@
 #pragma implementation "dialog_options.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 ////@begin includes
diff --git a/eeschema/dialog_print_using_printer.cpp b/eeschema/dialog_print_using_printer.cpp
index a89e934e5f..2b6e96bc49 100644
--- a/eeschema/dialog_print_using_printer.cpp
+++ b/eeschema/dialog_print_using_printer.cpp
@@ -5,9 +5,11 @@
 // Set this to 1 if you want to test PostScript printing under MSW.
 #define wxTEST_POSTSCRIPT_IN_MSW 1
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 
 #include "program.h"
 #include "general.h"
diff --git a/eeschema/edit_component_in_lib.cpp b/eeschema/edit_component_in_lib.cpp
index 5dead6f99c..f61e80db2e 100644
--- a/eeschema/edit_component_in_lib.cpp
+++ b/eeschema/edit_component_in_lib.cpp
@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/edit_component_in_schematic.cpp b/eeschema/edit_component_in_schematic.cpp
index 870fb6755a..0860a6af90 100644
--- a/eeschema/edit_component_in_schematic.cpp
+++ b/eeschema/edit_component_in_schematic.cpp
@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/edit_graphic_bodyitem_text.cpp b/eeschema/edit_graphic_bodyitem_text.cpp
index fe4019000a..39f0d37c8b 100644
--- a/eeschema/edit_graphic_bodyitem_text.cpp
+++ b/eeschema/edit_graphic_bodyitem_text.cpp
@@ -9,8 +9,9 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp
index 9cd06ee6a0..3ccb657e46 100644
--- a/eeschema/edit_label.cpp
+++ b/eeschema/edit_label.cpp
@@ -5,8 +5,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/eeconfig.cpp b/eeschema/eeconfig.cpp
index 945329fda9..df2adb9c78 100644
--- a/eeschema/eeconfig.cpp
+++ b/eeschema/eeconfig.cpp
@@ -3,8 +3,14 @@
 /*******************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
@@ -13,7 +19,6 @@
 #include "worksheet.h"
 #include "hotkeys.h"
 
-#include "id.h"
 
 /* Variables locales */
 
diff --git a/eeschema/eecreate.cpp b/eeschema/eecreate.cpp
index 8b984356d5..c9b8b2520c 100644
--- a/eeschema/eecreate.cpp
+++ b/eeschema/eecreate.cpp
@@ -4,12 +4,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 /* Routines Locales */
diff --git a/eeschema/eelayer.cpp b/eeschema/eelayer.cpp
index 4f40fbd153..1a6d62be2a 100644
--- a/eeschema/eelayer.cpp
+++ b/eeschema/eelayer.cpp
@@ -9,27 +9,15 @@
 #pragma implementation "eelayer.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 #include "eelayer.h" // Header file associated with this file
diff --git a/eeschema/eelibs_draw_components.cpp b/eeschema/eelibs_draw_components.cpp
index bc65230fa0..9cb2627ff5 100644
--- a/eeschema/eelibs_draw_components.cpp
+++ b/eeschema/eelibs_draw_components.cpp
@@ -4,8 +4,9 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
 #include "program.h"
 #include "libcmp.h"
 #include "component_class.h"
diff --git a/eeschema/eelibs_read_libraryfiles.cpp b/eeschema/eelibs_read_libraryfiles.cpp
index e2c4f8dc05..bf8d573bba 100644
--- a/eeschema/eelibs_read_libraryfiles.cpp
+++ b/eeschema/eelibs_read_libraryfiles.cpp
@@ -4,13 +4,15 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "trigo.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 /* Local Functions */
diff --git a/eeschema/eeredraw.cpp b/eeschema/eeredraw.cpp
index 2a79109679..00c02ea931 100644
--- a/eeschema/eeredraw.cpp
+++ b/eeschema/eeredraw.cpp
@@ -5,12 +5,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index c889defe9d..a8ff432180 100644
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@@ -10,19 +10,24 @@
 #define MAIN
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
 #include "worksheet.h"
-#include "trigo.h"
 #include "bitmaps.h"
 #include "eda_dde.h"
 
 #include "protos.h"
 
+#include <wx/snglinst.h>
+
+
 // Global variables
 wxString g_Main_Title( wxT( "EESchema" ) );
 
diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp
index dd506bb64b..cc31532b72 100644
--- a/eeschema/erc.cpp
+++ b/eeschema/erc.cpp
@@ -4,13 +4,16 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
 #include "netlist.h"
-
 #include "protos.h"
 
 #include "bitmaps.h"
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 72e1af8e57..83f19dcdd4 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -3,8 +3,10 @@
 /****************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/find.cpp b/eeschema/find.cpp
index 4726c6e64a..aea3d2db7d 100644
--- a/eeschema/find.cpp
+++ b/eeschema/find.cpp
@@ -9,8 +9,11 @@
  */
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index 511ef4b7ec..fa3cdb2fe2 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -3,14 +3,15 @@
 /*************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
-
 #include "common.h"
-
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "get_component_dialog.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/hierarch.cpp b/eeschema/hierarch.cpp
index 535d256f78..44400d55d2 100644
--- a/eeschema/hierarch.cpp
+++ b/eeschema/hierarch.cpp
@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/lib_export.cpp b/eeschema/lib_export.cpp
index 0737ab5474..ff39d6a79b 100644
--- a/eeschema/lib_export.cpp
+++ b/eeschema/lib_export.cpp
@@ -9,8 +9,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/libalias.cpp b/eeschema/libalias.cpp
index 6a65de88bd..ddc40893d1 100644
--- a/eeschema/libalias.cpp
+++ b/eeschema/libalias.cpp
@@ -1,86 +1,95 @@
-	/****************************/
-	/*	EESchema - libalias.cpp	*/
-	/****************************/
+/****************************/
+/*	EESchema - libalias.cpp	*/
+/****************************/
 
 /* Routines de maintenanace des librairies: gestion des alias des composants
-*/
+ */
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 /* Variables locales */
 
 
 /**************************************************************************/
-bool BuildAliasData(LibraryStruct * Lib, EDA_LibComponentStruct * component)
+bool BuildAliasData( LibraryStruct* Lib, EDA_LibComponentStruct* component )
 /**************************************************************************/
+
 /* Create the alias data for the lib component to edit
-	Alias data is:
-	alias name
-	doc string
-	keywords string
-	doc file name
-	
-	in .m_AliastList
-	Alias data (4 strings) replace each alias name.
-	
-*/
+ *   Alias data is:
+ *   alias name
+ *   doc string
+ *   keywords string
+ *   doc file name
+ *
+ *   in .m_AliastList
+ *   Alias data (4 strings) replace each alias name.
+ *
+ */
 {
-wxArrayString List;
-LibCmpEntry * CmpEntry;
-unsigned ii;
+    wxArrayString List;
+    LibCmpEntry*  CmpEntry;
+    unsigned      ii;
 
-	if ( component == NULL ) return FALSE;
-	if( Lib == NULL ) return FALSE;
-	if( component->m_AliasList.GetCount() == 0 ) return FALSE;
-		
-	List = component->m_AliasList;
-	component->m_AliasList.Clear();
-	for ( ii = 0; ii < List.GetCount(); ii++ )
-	{
-		CmpEntry = (LibCmpEntry*) FindLibPart(List[ii].GetData(), Lib->m_Name, FIND_ALIAS);
-		if(CmpEntry && CmpEntry->Type != ALIAS )
-		{
-			DisplayError(NULL, wxT("BuildListAlias err: alias is a ROOT entry!"));
-		}
-		else
-		{
-			if( LocateAlias( component->m_AliasList, List[ii] ) < 0 )
-			{	/* Alias not found in list: create it (datas must be in this order) */
-				component->m_AliasList.Add(List[ii]);
-				component->m_AliasList.Add(CmpEntry->m_Doc);
-				component->m_AliasList.Add(CmpEntry->m_KeyWord);
-				component->m_AliasList.Add(CmpEntry->m_DocFile);
-			}
-		}
-	}
-	return TRUE;
+    if( component == NULL )
+        return FALSE;
+    if( Lib == NULL )
+        return FALSE;
+    if( component->m_AliasList.GetCount() == 0 )
+        return FALSE;
+
+    List = component->m_AliasList;
+    component->m_AliasList.Clear();
+    for( ii = 0; ii < List.GetCount(); ii++ )
+    {
+        CmpEntry = (LibCmpEntry*) FindLibPart( List[ii].GetData(),
+                                               Lib->m_Name, FIND_ALIAS );
+        if( CmpEntry && CmpEntry->Type != ALIAS )
+        {
+            DisplayError( NULL,
+                          wxT( "BuildListAlias err: alias is a ROOT entry!" ) );
+        }
+        else
+        {
+            if( LocateAlias( component->m_AliasList, List[ii] ) < 0 )
+            {
+                /* Alias not found in list: create it (datas must be in this order) */
+                component->m_AliasList.Add( List[ii] );
+                component->m_AliasList.Add( CmpEntry->m_Doc );
+                component->m_AliasList.Add( CmpEntry->m_KeyWord );
+                component->m_AliasList.Add( CmpEntry->m_DocFile );
+            }
+        }
+    }
+
+    return TRUE;
 }
 
 
 /***********************************************************************/
-int LocateAlias( const wxArrayString & AliasData, const wxString & Name)
+int LocateAlias( const wxArrayString& AliasData, const wxString& Name )
 /***********************************************************************/
+
 /* Return an index in alias data list
-	( -1 if not found )
-*/
+ *   ( -1 if not found )
+ */
 {
-int index = -1;
-unsigned ii;
-	
-	for ( ii = 0; ii < AliasData.GetCount(); ii += ALIAS_NEXT)
-	{
-		if ( Name.CmpNoCase(AliasData[ii+ALIAS_NAME].GetData()) == 0 )
-		{
-			index = ii;
-			break;
-		}
-	}
-	return(index);
+    int      index = -1;
+    unsigned ii;
+
+    for( ii = 0; ii < AliasData.GetCount(); ii += ALIAS_NEXT )
+    {
+        if( Name.CmpNoCase( AliasData[ii + ALIAS_NAME].GetData() ) == 0 )
+        {
+            index = ii;
+            break;
+        }
+    }
+
+    return index;
 }
diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp
index 9f2606ee47..51aed04226 100644
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@@ -6,8 +6,10 @@
 #include <vector>
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/libedit.cpp b/eeschema/libedit.cpp
index 3a2ec14885..78ef832cfd 100644
--- a/eeschema/libedit.cpp
+++ b/eeschema/libedit.cpp
@@ -9,12 +9,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 #include "id.h"
diff --git a/eeschema/libedit_onleftclick.cpp b/eeschema/libedit_onleftclick.cpp
index ce0be5ce6b..b433e2f36f 100644
--- a/eeschema/libedit_onleftclick.cpp
+++ b/eeschema/libedit_onleftclick.cpp
@@ -7,8 +7,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/libedit_onrightclick.cpp b/eeschema/libedit_onrightclick.cpp
index be01ed3ad4..cff4029ee2 100644
--- a/eeschema/libedit_onrightclick.cpp
+++ b/eeschema/libedit_onrightclick.cpp
@@ -7,8 +7,8 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/libfield.cpp b/eeschema/libfield.cpp
index 3629a251c7..181c6826a4 100644
--- a/eeschema/libfield.cpp
+++ b/eeschema/libfield.cpp
@@ -6,8 +6,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/libframe.cpp b/eeschema/libframe.cpp
index d6ee597f40..874084fde5 100644
--- a/eeschema/libframe.cpp
+++ b/eeschema/libframe.cpp
@@ -6,15 +6,16 @@
  */
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "eda_doc.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "bitmaps.h"
 #include "protos.h"
-
 #include "id.h"
 
 /*****************************/
diff --git a/eeschema/load_one_schematic_file.cpp b/eeschema/load_one_schematic_file.cpp
index 4f88e297d8..0aa3a4b628 100644
--- a/eeschema/load_one_schematic_file.cpp
+++ b/eeschema/load_one_schematic_file.cpp
@@ -3,14 +3,11 @@
 /****************************************/
 
 #include "fctsys.h"
-
-//#include "gr_basic.h"
-
-#include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 /* in read_from_file_schematic_items_description.cpp */
diff --git a/eeschema/locate.cpp b/eeschema/locate.cpp
index 6071c41bcd..6ea41dd8f4 100644
--- a/eeschema/locate.cpp
+++ b/eeschema/locate.cpp
@@ -4,8 +4,8 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 4d2815e964..bcac35f81b 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -8,11 +8,10 @@
 
 #include "fctsys.h"
 #include "common.h"
-
+#include "appl_wxstruct.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "bitmaps.h"
 #include "protos.h"
 #include "id.h"
diff --git a/eeschema/netform.cpp b/eeschema/netform.cpp
index 203e39c0aa..1f083a49b5 100644
--- a/eeschema/netform.cpp
+++ b/eeschema/netform.cpp
@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/netlist.cpp b/eeschema/netlist.cpp
index b76f80f67a..c933dc4d54 100644
--- a/eeschema/netlist.cpp
+++ b/eeschema/netlist.cpp
@@ -5,6 +5,7 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/netlist_control.cpp b/eeschema/netlist_control.cpp
index 0d807477d2..7fd5d58495 100644
--- a/eeschema/netlist_control.cpp
+++ b/eeschema/netlist_control.cpp
@@ -13,15 +13,15 @@
  */
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "netlist.h"
 #include "protos.h"
-
 #include "netlist_control.h"
 
 // ID for configuration:
diff --git a/eeschema/onleftclick.cpp b/eeschema/onleftclick.cpp
index 1fb0cf65ee..44da185ed4 100644
--- a/eeschema/onleftclick.cpp
+++ b/eeschema/onleftclick.cpp
@@ -3,16 +3,15 @@
 /******************************************************/
 
 #include "fctsys.h"
-
 #include "gr_basic.h"
-
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 static wxArrayString s_CmpNameList;
diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp
index 1f1bc0d8b7..16f97cad11 100644
--- a/eeschema/onrightclick.cpp
+++ b/eeschema/onrightclick.cpp
@@ -9,13 +9,15 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "id.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
 
 #include "protos.h"
-#include "id.h"
 #include "hotkeys.h"
 
 #include "bitmaps.h"
diff --git a/eeschema/pinedit-dialog.cpp b/eeschema/pinedit-dialog.cpp
index 815d718b65..f88be38922 100644
--- a/eeschema/pinedit-dialog.cpp
+++ b/eeschema/pinedit-dialog.cpp
@@ -11,19 +11,9 @@
 
 // Generated by DialogBlocks (unregistered), 11/02/2006 13:30:59
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
+#include "confirm.h"
 
 #include "pinedit-dialog.h"
 
diff --git a/eeschema/pinedit-dialog.h b/eeschema/pinedit-dialog.h
index d94103035b..73de7604a2 100644
--- a/eeschema/pinedit-dialog.h
+++ b/eeschema/pinedit-dialog.h
@@ -23,6 +23,7 @@
  */
 #include "fctsys.h"
 #include "gr_basic.h"
+#include "class_drawpanel.h"
 
 #include "common.h"
 #include "program.h"
diff --git a/eeschema/plot.cpp b/eeschema/plot.cpp
index 561432d1ff..c7998e0082 100644
--- a/eeschema/plot.cpp
+++ b/eeschema/plot.cpp
@@ -4,14 +4,16 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "plot_common.h"
+#include "worksheet.h"
+#include "grfonte.h"
+#include "base_struct.h"
+#include "drawtxt.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-#include "plot_common.h"
-#include "worksheet.h"
-
 #include "protos.h"
 
 /* Local Variables : */
diff --git a/eeschema/plothpgl.cpp b/eeschema/plothpgl.cpp
index 88d4747b7f..4c677ff057 100644
--- a/eeschema/plothpgl.cpp
+++ b/eeschema/plothpgl.cpp
@@ -16,24 +16,13 @@
 #pragma implementation "plothpgl.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/read_from_file_schematic_items_descriptions.cpp b/eeschema/read_from_file_schematic_items_descriptions.cpp
index 7473f4db8b..f8ef21bfd6 100644
--- a/eeschema/read_from_file_schematic_items_descriptions.cpp
+++ b/eeschema/read_from_file_schematic_items_descriptions.cpp
@@ -3,8 +3,9 @@
 /*functions to read schematic items descriptions from file
  */
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/save_schemas.cpp b/eeschema/save_schemas.cpp
index 296183e3d3..60cb20ad46 100644
--- a/eeschema/save_schemas.cpp
+++ b/eeschema/save_schemas.cpp
@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/savelib.cpp b/eeschema/savelib.cpp
index 92c375d834..622aa59247 100644
--- a/eeschema/savelib.cpp
+++ b/eeschema/savelib.cpp
@@ -7,8 +7,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
@@ -72,11 +74,11 @@ bool LibDrawText::Save( FILE* ExportFile ) const
     text.Replace( wxT( " " ), wxT( "~" ) );
 
     fprintf( ExportFile, "T %d %d %d %d %d %d %d %s ",
-            m_Orient,
-            m_Pos.x, m_Pos.y,
-            m_Size.x, m_Attributs,
-            m_Unit, m_Convert,
-            CONV_TO_UTF8( text ));
+             m_Orient,
+             m_Pos.x, m_Pos.y,
+             m_Size.x, m_Attributs,
+             m_Unit, m_Convert,
+             CONV_TO_UTF8( text ));
 
 	fprintf( ExportFile, " %s %d",	m_Italic ? "Italic" : "Normal", m_Width );
 
diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp
index 533cc628fe..357423d262 100644
--- a/eeschema/schedit.cpp
+++ b/eeschema/schedit.cpp
@@ -3,10 +3,12 @@
 /******************************************************/
 
 #include "fctsys.h"
-
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "eda_doc.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp
index 2777ed57a8..038d8d3947 100644
--- a/eeschema/schematic_undo_redo.cpp
+++ b/eeschema/schematic_undo_redo.cpp
@@ -4,13 +4,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
 #include "id.h"
-
 #include "protos.h"
 
 /* Functions to undo and redo edit commands.
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index ad6e4bb21a..73a0f1f1c1 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -7,12 +7,14 @@
 #endif
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "gestfich.h"
 
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "bitmaps.h"
 #include "protos.h"
 #include "id.h"
diff --git a/eeschema/selpart.cpp b/eeschema/selpart.cpp
index 12fe28aec4..c9ad1fc4f3 100644
--- a/eeschema/selpart.cpp
+++ b/eeschema/selpart.cpp
@@ -7,12 +7,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp
index 357fe2ac7c..cfd6914423 100644
--- a/eeschema/sheet.cpp
+++ b/eeschema/sheet.cpp
@@ -16,23 +16,15 @@
 #pragma implementation "sheet.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
diff --git a/eeschema/sheetlab.cpp b/eeschema/sheetlab.cpp
index 3ebdcd3e74..d5f3c309c0 100644
--- a/eeschema/sheetlab.cpp
+++ b/eeschema/sheetlab.cpp
@@ -4,12 +4,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/symbdraw.cpp b/eeschema/symbdraw.cpp
index 0c7540f55b..9425fc5ebd 100644
--- a/eeschema/symbdraw.cpp
+++ b/eeschema/symbdraw.cpp
@@ -4,18 +4,17 @@
 /* (lines, arcs ..													 */
 /*********************************************************************/
 
-
 #include "fctsys.h"
 #include "gr_basic.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
 #include "trigo.h"
-
 #include "protos.h"
-
 #include "id.h"
 
 /* Routines locales */
diff --git a/eeschema/symbedit.cpp b/eeschema/symbedit.cpp
index 25ff9abb36..f47ecb8ec6 100644
--- a/eeschema/symbedit.cpp
+++ b/eeschema/symbedit.cpp
@@ -9,12 +9,15 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 
diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp
index 8985e70b46..bab6c7a7cd 100644
--- a/eeschema/tool_sch.cpp
+++ b/eeschema/tool_sch.cpp
@@ -3,17 +3,17 @@
 /*****************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 #include "hotkeys.h"
 
 #include "bitmaps.h"
-
 #include "id.h"
 
 
diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index 5957defad5..5a7ed4a803 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -3,16 +3,14 @@
 /*************************************************************************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
-
+#include "class_drawpanel.h"
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
 #include "bitmaps.h"
-
 #include "protos.h"
-
 #include "id.h"
 
 /*****************************/
diff --git a/eeschema/viewlibs.cpp b/eeschema/viewlibs.cpp
index b6232d59a4..d99d049475 100644
--- a/eeschema/viewlibs.cpp
+++ b/eeschema/viewlibs.cpp
@@ -1,21 +1,23 @@
-	/****************************/
-	/*  EESchema - viewlibs.cpp */
-	/****************************/
+/****************************/
+/*  EESchema - viewlibs.cpp */
+/****************************/
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "eda_doc.h"
+
 #include "program.h"
 #include "libcmp.h"
 #include "general.h"
-
 #include "protos.h"
 
 #include "id.h"
 
-#define NEXT_PART 1
-#define NEW_PART 0
+#define NEXT_PART     1
+#define NEW_PART      0
 #define PREVIOUS_PART -1
 
 
@@ -24,85 +26,87 @@
 /* Variables locales */
 
 /*************************************************************************/
-void WinEDA_ViewlibFrame::Process_Special_Functions(wxCommandEvent& event)
+void WinEDA_ViewlibFrame::Process_Special_Functions( wxCommandEvent& event )
 /*************************************************************************/
 {
-EDA_LibComponentStruct * LibEntry;
-int ii, id = event.GetId();
-wxPoint pos;
+    wxString msg;
+    EDA_LibComponentStruct* LibEntry;
+    int     ii, id = event.GetId();
+    wxPoint pos;
 
-	wxGetMousePosition(&pos.x, &pos.y);
-	pos.y += 20;
+    wxGetMousePosition( &pos.x, &pos.y );
+    pos.y += 20;
 
-	switch ( id )
-	{
-		case ID_LIBVIEW_SELECT_LIB:
-			SelectCurrentLibrary();
-			break;
+    switch( id )
+    {
+    case ID_LIBVIEW_SELECT_LIB:
+        SelectCurrentLibrary();
+        break;
 
-		case ID_LIBVIEW_SELECT_PART:
-			SelectAndViewLibraryPart(NEW_PART);
-			break;
+    case ID_LIBVIEW_SELECT_PART:
+        SelectAndViewLibraryPart( NEW_PART );
+        break;
 
-		case ID_LIBVIEW_NEXT:
-			SelectAndViewLibraryPart(NEXT_PART);
-			break;
+    case ID_LIBVIEW_NEXT:
+        SelectAndViewLibraryPart( NEXT_PART );
+        break;
 
-		case ID_LIBVIEW_PREVIOUS:
-			SelectAndViewLibraryPart(PREVIOUS_PART);
-			break;
+    case ID_LIBVIEW_PREVIOUS:
+        SelectAndViewLibraryPart( PREVIOUS_PART );
+        break;
 
-		case ID_LIBVIEW_VIEWDOC:
-			LibEntry = FindLibPart(g_CurrentViewComponentName.GetData(),
-         					g_CurrentViewLibraryName.GetData(), FIND_ALIAS);
-			if( LibEntry && ( !LibEntry->m_DocFile.IsEmpty()) )
-				GetAssociatedDocument(this, g_RealLibDirBuffer, LibEntry->m_DocFile );
-			break;
+    case ID_LIBVIEW_VIEWDOC:
+        LibEntry = FindLibPart( g_CurrentViewComponentName.GetData(),
+                                g_CurrentViewLibraryName.GetData(), FIND_ALIAS );
+        if( LibEntry && ( !LibEntry->m_DocFile.IsEmpty() ) )
+            GetAssociatedDocument( this,
+                                   g_RealLibDirBuffer,
+                                   LibEntry->m_DocFile );
+        break;
 
-		case ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT:
-			m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, TRUE);
-			m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, FALSE);
-			g_ViewConvert = 1;
-			DrawPanel->Refresh();
-			break;
+    case ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT:
+        m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, TRUE );
+        m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, FALSE );
+        g_ViewConvert = 1;
+        DrawPanel->Refresh();
+        break;
 
-		case ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT:
-			m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, FALSE);
-			m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, TRUE);
-			g_ViewConvert = 2;
-			DrawPanel->Refresh();
-			break;
+    case ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT:
+        m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, FALSE );
+        m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, TRUE );
+        g_ViewConvert = 2;
+        DrawPanel->Refresh();
+        break;
 
-		case ID_LIBVIEW_SELECT_PART_NUMBER:
-			ii = SelpartBox->GetChoice();
-			if ( ii < 0 ) return;
-			g_ViewUnit = ii + 1;
-			DrawPanel->Refresh();
-			break;
-
-		default:
-		{
-			wxString msg;
-			msg << wxT("WinEDA_ViewlibFrame::Process_Special_Functions error: id = ") << id;
-			DisplayError( this, msg);
-			break;
-		}
-	}
+    case ID_LIBVIEW_SELECT_PART_NUMBER:
+        ii = SelpartBox->GetChoice();
+        if( ii < 0 )
+            return;
+        g_ViewUnit = ii + 1;
+        DrawPanel->Refresh();
+        break;
 
+    default:
+        msg << wxT( "WinEDA_ViewlibFrame::Process_Special_Functions error: id = " ) << id;
+        DisplayError( this, msg );
+        break;
+    }
 }
 
 
 /*************************************************************************/
-void WinEDA_ViewlibFrame::OnLeftClick(wxDC * DC, const wxPoint& MousePos)
+void WinEDA_ViewlibFrame::OnLeftClick( wxDC* DC, const wxPoint& MousePos )
 /*************************************************************************/
 {
 }
 
+
 /********************************************************************************/
-bool WinEDA_ViewlibFrame::OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu)
+bool WinEDA_ViewlibFrame::OnRightClick( const wxPoint& MousePos,
+                                        wxMenu*        PopMenu )
 /********************************************************************************/
 {
-	return true;
+    return true;
 }
 
 
@@ -111,240 +115,264 @@ void WinEDA_ViewlibFrame::DisplayLibInfos()
 /**********************************************/
 /* Affiche en Ligne d'info la librairie en cours de visualisation */
 {
-wxString msg;
-LibraryStruct * Lib;
+    wxString       msg;
+    LibraryStruct* Lib;
 
-	Lib = FindLibrary(g_CurrentViewLibraryName);
-	msg = _("Library browser");
+    Lib = FindLibrary( g_CurrentViewLibraryName );
+    msg = _( "Library browser" );
 
-        msg << wxT(" [");
+    msg << wxT( " [" );
 
-	if ( Lib ) msg << g_CurrentViewLibraryName;
-	else msg += _("none selected");
+    if( Lib )
+        msg << g_CurrentViewLibraryName;
+    else
+        msg += _( "none selected" );
 
-        msg << wxT("]");
-	SetTitle(msg);
+    msg << wxT( "]" );
+    SetTitle( msg );
 }
 
 
-	/*****************************************/
-	/* Routine to Select Current library	  */
-	/*****************************************/
+/*****************************************/
+/* Routine to Select Current library	  */
+/*****************************************/
 void WinEDA_ViewlibFrame::SelectCurrentLibrary()
 {
-LibraryStruct * Lib;
+    LibraryStruct* Lib;
 
-	Lib = SelectLibraryFromList(this);
-	if ( Lib )
-	{
-		g_CurrentViewComponentName.Empty();
-		g_CurrentViewLibraryName = Lib->m_Name;
-		DisplayLibInfos();
-		if ( m_LibList )
-		{
-			ReCreateListCmp();
-			DrawPanel->Refresh();
-			DisplayLibInfos();
-			ReCreateHToolbar();
-			int id = m_LibList->FindString(g_CurrentViewLibraryName.GetData());
-			if ( id >= 0 ) m_LibList->SetSelection(id);
-		}
-	}
+    Lib = SelectLibraryFromList( this );
+    if( Lib )
+    {
+        g_CurrentViewComponentName.Empty();
+        g_CurrentViewLibraryName = Lib->m_Name;
+        DisplayLibInfos();
+        if( m_LibList )
+        {
+            ReCreateListCmp();
+            DrawPanel->Refresh();
+            DisplayLibInfos();
+            ReCreateHToolbar();
+            int id = m_LibList->FindString( g_CurrentViewLibraryName.GetData() );
+            if( id >= 0 )
+                m_LibList->SetSelection( id );
+        }
+    }
 }
 
+
 /**************************************************************/
-void WinEDA_ViewlibFrame::SelectAndViewLibraryPart(int option)
+void WinEDA_ViewlibFrame::SelectAndViewLibraryPart( int option )
 /**************************************************************/
 /* Routine to select and view library Part  (NEW, NEXT or PREVIOUS) */
 {
-LibraryStruct * Lib;
+    LibraryStruct* Lib;
 
-	if(g_CurrentViewLibraryName.IsEmpty() ) SelectCurrentLibrary();
-	if(g_CurrentViewLibraryName.IsEmpty() ) return;
+    if( g_CurrentViewLibraryName.IsEmpty() )
+        SelectCurrentLibrary();
+    if( g_CurrentViewLibraryName.IsEmpty() )
+        return;
 
-	Lib = FindLibrary(g_CurrentViewLibraryName);
-	if ( Lib == NULL ) return;
+    Lib = FindLibrary( g_CurrentViewLibraryName );
+    if( Lib == NULL )
+        return;
 
-	if ( (g_CurrentViewComponentName.IsEmpty()) || ( option == NEW_PART ) )
-		{
-		ViewOneLibraryContent(Lib, NEW_PART);
-		return;
-		}
+    if( ( g_CurrentViewComponentName.IsEmpty() ) || ( option == NEW_PART ) )
+    {
+        ViewOneLibraryContent( Lib, NEW_PART );
+        return;
+    }
 
-	EDA_LibComponentStruct * LibEntry = FindLibPart(g_CurrentViewComponentName.GetData(),
-								 g_CurrentViewLibraryName, FIND_ALIAS);
+    EDA_LibComponentStruct* LibEntry = FindLibPart(
+        g_CurrentViewComponentName.GetData(),
+        g_CurrentViewLibraryName,
+        FIND_ALIAS );
 
-	if ( LibEntry == NULL ) return;
+    if( LibEntry == NULL )
+        return;
 
-	if (option == NEXT_PART )
-		ViewOneLibraryContent(Lib, NEXT_PART);
-
-	if (option == PREVIOUS_PART )
-		ViewOneLibraryContent(Lib, PREVIOUS_PART);
+    if( option == NEXT_PART )
+        ViewOneLibraryContent( Lib, NEXT_PART );
 
+    if( option == PREVIOUS_PART )
+        ViewOneLibraryContent( Lib, PREVIOUS_PART );
 }
 
+
 /*************************************************/
 /* Routine to view one selected library content. */
 /*************************************************/
-void WinEDA_ViewlibFrame::ViewOneLibraryContent(LibraryStruct *Lib, int Flag)
+void WinEDA_ViewlibFrame::ViewOneLibraryContent( LibraryStruct* Lib, int Flag )
 {
-int NumOfParts = 0;
-EDA_LibComponentStruct *LibEntry, * PreviousLibEntry;
-wxString CmpName;
-wxClientDC dc(DrawPanel);
+    int        NumOfParts = 0;
+    EDA_LibComponentStruct* LibEntry, * PreviousLibEntry;
+    wxString   CmpName;
+    wxClientDC dc( DrawPanel );
 
 
-	DrawPanel->PrepareGraphicContext(&dc);
+    DrawPanel->PrepareGraphicContext( &dc );
 
-	if (Lib) NumOfParts = Lib->m_NumOfParts;
+    if( Lib )
+        NumOfParts = Lib->m_NumOfParts;
 
-	if (NumOfParts == 0)
-		{
-		DisplayError(this, wxT("No Library or Library is empty!"));
-		return;
-		}
+    if( NumOfParts == 0 )
+    {
+        DisplayError( this, wxT( "No Library or Library is empty!" ) );
+        return;
+    }
 
-	if ( Lib == NULL ) return;
+    if( Lib == NULL )
+        return;
 
-	PQCompFunc((PQCompFuncType) LibraryEntryCompare);
-	LibEntry = (EDA_LibComponentStruct *) PQFirst(&Lib->m_Entries, FALSE);
+    PQCompFunc( (PQCompFuncType) LibraryEntryCompare );
+    LibEntry = (EDA_LibComponentStruct*) PQFirst( &Lib->m_Entries, FALSE );
 
-	if( Flag == NEW_PART )
-		{
-		DisplayComponentsNamesInLib(this, Lib, CmpName, g_CurrentViewComponentName);
-		}
+    if( Flag == NEW_PART )
+    {
+        DisplayComponentsNamesInLib( this,
+                                     Lib,
+                                     CmpName,
+                                     g_CurrentViewComponentName );
+    }
 
-	if( Flag == NEXT_PART )
-		{
-		LibEntry = (EDA_LibComponentStruct *) PQFirst(&Lib->m_Entries, FALSE);
-		while ( LibEntry )
-			{
-			if( LibEntry->m_Name.m_Text == g_CurrentViewComponentName )
-				{
-				LibEntry = (EDA_LibComponentStruct *)
-					PQNext(Lib->m_Entries, LibEntry, NULL);
-				break;
-				}
-			LibEntry = (EDA_LibComponentStruct *)
-					PQNext(Lib->m_Entries, LibEntry, NULL);
-			}
-		if(LibEntry == NULL)
-				LibEntry = (EDA_LibComponentStruct *) PQFirst(&Lib->m_Entries, FALSE);
-		if( LibEntry ) CmpName = LibEntry->m_Name.m_Text;
-		}
+    if( Flag == NEXT_PART )
+    {
+        LibEntry = (EDA_LibComponentStruct*) PQFirst( &Lib->m_Entries, FALSE );
+        while( LibEntry )
+        {
+            if( LibEntry->m_Name.m_Text == g_CurrentViewComponentName )
+            {
+                LibEntry = (EDA_LibComponentStruct*)
+                           PQNext( Lib->m_Entries, LibEntry, NULL );
+                break;
+            }
+            LibEntry = (EDA_LibComponentStruct*)
+                       PQNext( Lib->m_Entries, LibEntry, NULL );
+        }
 
-	if( Flag == PREVIOUS_PART )
-		{
-		PreviousLibEntry = NULL;
-		LibEntry = (EDA_LibComponentStruct *) PQFirst(&Lib->m_Entries, FALSE);
-		while ( LibEntry )
-			{
-			if( LibEntry->m_Name.m_Text == g_CurrentViewComponentName )
-				{
-				if( PreviousLibEntry ) break;
-				/* else : pointage sur 1er element :
-				balayage de la liste et Previous pointera dernier element */
-				}
+        if( LibEntry == NULL )
+            LibEntry = (EDA_LibComponentStruct*) PQFirst( &Lib->m_Entries,
+                                                          FALSE );
+        if( LibEntry )
+            CmpName = LibEntry->m_Name.m_Text;
+    }
 
-			PreviousLibEntry = LibEntry;
-			LibEntry = (EDA_LibComponentStruct *)
-					PQNext(Lib->m_Entries, LibEntry, NULL);
-			}
-		if( PreviousLibEntry )
-			CmpName = PreviousLibEntry->m_Name.m_Text;
-		}
+    if( Flag == PREVIOUS_PART )
+    {
+        PreviousLibEntry = NULL;
+        LibEntry = (EDA_LibComponentStruct*) PQFirst( &Lib->m_Entries, FALSE );
+        while( LibEntry )
+        {
+            if( LibEntry->m_Name.m_Text == g_CurrentViewComponentName )
+            {
+                if( PreviousLibEntry )
+                    break;
 
-	g_ViewUnit = 1;
-	g_ViewConvert = 1;
+                /* else : pointage sur 1er element :
+                 *  balayage de la liste et Previous pointera dernier element */
+            }
 
-	LibEntry = FindLibPart(CmpName.GetData(),Lib->m_Name, FIND_ALIAS);
-	g_CurrentViewComponentName = CmpName;
-	DisplayLibInfos();
-	Zoom_Automatique(FALSE);
-	RedrawActiveWindow(&dc, TRUE);
+            PreviousLibEntry = LibEntry;
+            LibEntry = (EDA_LibComponentStruct*)
+                       PQNext( Lib->m_Entries, LibEntry, NULL );
+        }
 
-	if ( m_CmpList )
-		{
-		int id = m_CmpList->FindString(g_CurrentViewComponentName.GetData());
-		if ( id >= 0 ) m_CmpList->SetSelection(id);
-		}
-	ReCreateHToolbar();
+        if( PreviousLibEntry )
+            CmpName = PreviousLibEntry->m_Name.m_Text;
+    }
+
+    g_ViewUnit    = 1;
+    g_ViewConvert = 1;
+
+    LibEntry = FindLibPart( CmpName.GetData(), Lib->m_Name, FIND_ALIAS );
+    g_CurrentViewComponentName = CmpName;
+    DisplayLibInfos();
+    Zoom_Automatique( FALSE );
+    RedrawActiveWindow( &dc, TRUE );
+
+    if( m_CmpList )
+    {
+        int id = m_CmpList->FindString( g_CurrentViewComponentName.GetData() );
+        if( id >= 0 )
+            m_CmpList->SetSelection( id );
+    }
+    ReCreateHToolbar();
 }
 
 
-
 /*****************************************************************************/
 /* Routine d'affichage du composant selectionne                              */
 /*	Si Le composant est un alias, le composant ROOT est recherche et affiche */
 /*****************************************************************************/
-void WinEDA_ViewlibFrame::RedrawActiveWindow(wxDC * DC, bool EraseBg)
+void WinEDA_ViewlibFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
 {
-EDA_LibComponentStruct * LibEntry = NULL;
-LibCmpEntry * ViewCmpEntry = NULL;
-const wxChar * RootName, * CmpName;
-wxString Msg;
+    EDA_LibComponentStruct* LibEntry     = NULL;
+    LibCmpEntry*            ViewCmpEntry = NULL;
+    const wxChar*           RootName, * CmpName;
+    wxString Msg;
 
-	ActiveScreen = GetScreen();
+    ActiveScreen = GetScreen();
 
-	if ( * g_CurrentViewComponentName )
-		{
-		LibEntry = FindLibPart(g_CurrentViewComponentName.GetData(),
-				 g_CurrentViewLibraryName, FIND_ALIAS);
-		ViewCmpEntry = (LibCmpEntry * ) LibEntry;
-		}
+    if( *g_CurrentViewComponentName )
+    {
+        LibEntry = FindLibPart( g_CurrentViewComponentName.GetData(),
+                                g_CurrentViewLibraryName, FIND_ALIAS );
+        ViewCmpEntry = (LibCmpEntry*) LibEntry;
+    }
 
-	/* Forcage de la reinit de la brosse et plume courante */
-	GRResetPenAndBrush(DC);
-	DC->SetBackground(*wxBLACK_BRUSH );
-	DC->SetBackgroundMode(wxTRANSPARENT);
+    /* Forcage de la reinit de la brosse et plume courante */
+    GRResetPenAndBrush( DC );
+    DC->SetBackground( *wxBLACK_BRUSH );
+    DC->SetBackgroundMode( wxTRANSPARENT );
 
-	if ( EraseBg ) DrawPanel->EraseScreen(DC);
+    if( EraseBg )
+        DrawPanel->EraseScreen( DC );
 
-	DrawPanel->DrawBackGround(DC);
+    DrawPanel->DrawBackGround( DC );
 
-	if( LibEntry)
-		{
-		CmpName = LibEntry->m_Name.m_Text.GetData();
-		if( LibEntry->Type != ROOT)
-			{
-			RootName = ((EDA_LibCmpAliasStruct*)LibEntry)->m_RootName.GetData();
-			Msg.Printf( _("Current Part: <%s> (is Alias of <%s>)"),
-					CmpName, RootName);
-			LibEntry = FindLibPart(RootName,g_CurrentViewLibraryName,FIND_ROOT);
+    if( LibEntry )
+    {
+        CmpName = LibEntry->m_Name.m_Text.GetData();
+        if( LibEntry->Type != ROOT )
+        {
+            RootName =
+                ( (EDA_LibCmpAliasStruct*) LibEntry )->m_RootName.GetData();
+            Msg.Printf( _( "Current Part: <%s> (is Alias of <%s>)" ),
+                        CmpName, RootName );
+            LibEntry = FindLibPart( RootName,
+                                    g_CurrentViewLibraryName,
+                                    FIND_ROOT );
 
-			if( LibEntry == NULL)
-			{
-				Msg.Printf( _("Error: Root Part <%s> not found"), RootName);
-				DisplayError(this, Msg);
-			}
-			else
-			{
-				/* Affichage du composant ROOT, avec nom de l'alias */
-				wxString RealName;
-				RealName = LibEntry->m_Name.m_Text;
-				LibEntry->m_Name.m_Text = CmpName;
-				if ( g_ViewUnit < 1 ) g_ViewUnit = 1;
- 				if ( g_ViewConvert < 1 ) g_ViewConvert = 1;
-				DrawLibEntry(DrawPanel, DC, LibEntry, wxPoint(0, 0),
-						g_ViewUnit, g_ViewConvert, GR_DEFAULT_DRAWMODE);
-				LibEntry->m_Name.m_Text = RealName;
-			}
-		}
+            if( LibEntry == NULL )
+            {
+                Msg.Printf( _( "Error: Root Part <%s> not found" ), RootName );
+                DisplayError( this, Msg );
+            }
+            else
+            {
+                /* Affichage du composant ROOT, avec nom de l'alias */
+                wxString RealName;
+                RealName = LibEntry->m_Name.m_Text;
+                LibEntry->m_Name.m_Text = CmpName;
+                if( g_ViewUnit < 1 )
+                    g_ViewUnit = 1;
+                if( g_ViewConvert < 1 )
+                    g_ViewConvert = 1;
+                DrawLibEntry( DrawPanel, DC, LibEntry, wxPoint( 0, 0 ),
+                              g_ViewUnit, g_ViewConvert, GR_DEFAULT_DRAWMODE );
+                LibEntry->m_Name.m_Text = RealName;
+            }
+        }
+        else
+        {
+            Msg.Printf( _( "Current Part: <%s>" ),
+                        ViewCmpEntry->m_Name.m_Text.GetData() );
+            DrawLibEntry( DrawPanel, DC, LibEntry, wxPoint( 0, 0 ),
+                          g_ViewUnit, g_ViewConvert, GR_DEFAULT_DRAWMODE );
+        }
+        AfficheDoc( this, ViewCmpEntry->m_Doc, ViewCmpEntry->m_KeyWord );
+    }
 
-		else
-			{
-			Msg.Printf( _("Current Part: <%s>"), ViewCmpEntry->m_Name.m_Text.GetData());
-			DrawLibEntry(DrawPanel, DC, LibEntry, wxPoint(0, 0),
-					g_ViewUnit, g_ViewConvert, GR_DEFAULT_DRAWMODE);
-			}
-		AfficheDoc(this, ViewCmpEntry->m_Doc, ViewCmpEntry->m_KeyWord);
-		}
+    SetStatusText( Msg, 0 );
 
-	SetStatusText(Msg,0);
-
-	DrawPanel->Trace_Curseur(DC);
+    DrawPanel->Trace_Curseur( DC );
 }
-
-
-
diff --git a/gerbview/block.cpp b/gerbview/block.cpp
index 850da9e60e..e736c2fa61 100644
--- a/gerbview/block.cpp
+++ b/gerbview/block.cpp
@@ -5,11 +5,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
-#include "gerbview.h"
+#include "class_drawpanel.h"
 #include "trigo.h"
+#include "confirm.h"
 
+#include "gerbview.h"
 #include "protos.h"
 
 
diff --git a/gerbview/controle.cpp b/gerbview/controle.cpp
index 2825764ce9..3a60db086b 100644
--- a/gerbview/controle.cpp
+++ b/gerbview/controle.cpp
@@ -9,11 +9,11 @@
  */
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "gerbview.h"
-
 #include "id.h"
+#include "class_drawpanel.h"
+
+#include "gerbview.h"
 #include "protos.h"
 
 /* Routines Locales : */
diff --git a/gerbview/dcode.cpp b/gerbview/dcode.cpp
index 99ae97e71b..44b232429a 100644
--- a/gerbview/dcode.cpp
+++ b/gerbview/dcode.cpp
@@ -3,11 +3,12 @@
 /********************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "gerbview.h"
 #include "pcbplot.h"
-
 #include "protos.h"
 
 #define DEFAULT_SIZE 100
diff --git a/gerbview/deltrack.cpp b/gerbview/deltrack.cpp
index c411a98046..ad811eca83 100644
--- a/gerbview/deltrack.cpp
+++ b/gerbview/deltrack.cpp
@@ -4,10 +4,10 @@
 /*********************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "gerbview.h"
+#include "class_drawpanel.h"
 
+#include "gerbview.h"
 #include "protos.h"
 
 /* Routines externes : */
diff --git a/gerbview/edit.cpp b/gerbview/edit.cpp
index 5b82b9d259..56f8c24c0a 100644
--- a/gerbview/edit.cpp
+++ b/gerbview/edit.cpp
@@ -3,13 +3,13 @@
 /******************************************************/
 
 #include "fctsys.h"
+#include "id.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 
-#include "common.h"
 #include "gerbview.h"
 #include "pcbplot.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 static void Process_Move_Item( WinEDA_GerberFrame* frame,
diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp
index be8b0391ef..259f126ae0 100644
--- a/gerbview/export_to_pcbnew.cpp
+++ b/gerbview/export_to_pcbnew.cpp
@@ -5,10 +5,13 @@
  */
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "gerbview.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 
+#include "gerbview.h"
 #include "protos.h"
 
 /* Routines Locales : */
diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index c3bae08e6e..134d020d58 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -3,8 +3,11 @@
 /******************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "gerbview.h"
 #include "pcbplot.h"
 #include "protos.h"
diff --git a/gerbview/gerberframe.cpp b/gerbview/gerberframe.cpp
index d3a14f60d3..19b619438d 100644
--- a/gerbview/gerberframe.cpp
+++ b/gerbview/gerberframe.cpp
@@ -8,11 +8,11 @@
 
 #include "fctsys.h"
 #include "wxstruct.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "gerbview.h"
 #include "pcbplot.h"
-
 #include "bitmaps.h"
 #include "protos.h"
 #include "id.h"
diff --git a/gerbview/gerbview.cpp b/gerbview/gerbview.cpp
index 5611756a70..b6ddacb49c 100644
--- a/gerbview/gerbview.cpp
+++ b/gerbview/gerbview.cpp
@@ -6,16 +6,20 @@
 #define eda_global
 
 #include "fctsys.h"
-
-#include <wx/file.h>
-
 #include "common.h"
+#include "appl_wxstruct.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "gerbview.h"
 #include "pcbplot.h"
-#include "trigo.h"
-#include "zones.h"
 #include "bitmaps.h"
 #include "protos.h"
+#include "zones.h"
+
+#include <wx/file.h>
+#include <wx/snglinst.h>
 
 
 wxString g_Main_Title = wxT( "GerbView" );
diff --git a/gerbview/gerbview.h b/gerbview/gerbview.h
index 22afad1d87..1a6d36f7cd 100644
--- a/gerbview/gerbview.h
+++ b/gerbview/gerbview.h
@@ -9,6 +9,9 @@
 #include <set>
 
 
+class WinEDA_GerberFrame;
+class BOARD;
+
 #ifndef eda_global
 #define eda_global extern
 #endif
diff --git a/gerbview/gerbview_config.cpp b/gerbview/gerbview_config.cpp
index e19ab69ab9..6f675c6dbc 100644
--- a/gerbview/gerbview_config.cpp
+++ b/gerbview/gerbview_config.cpp
@@ -5,14 +5,16 @@
 /* Functions to handle Gerbview configuration */
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "gerbview.h"
 #include "pcbplot.h"
 #include "id.h"
 #include "hotkeys.h"
 #include "gerbview_config.h"
-
 #include "protos.h"
 
 
diff --git a/gerbview/initpcb.cpp b/gerbview/initpcb.cpp
index 28fcd824ae..469c93fde1 100644
--- a/gerbview/initpcb.cpp
+++ b/gerbview/initpcb.cpp
@@ -5,10 +5,11 @@
 
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "gerbview.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 
+#include "gerbview.h"
 #include "protos.h"
 
 /* Routines Locales */
diff --git a/gerbview/lay2plot.cpp b/gerbview/lay2plot.cpp
index b0c5086a42..3f4666ea74 100644
--- a/gerbview/lay2plot.cpp
+++ b/gerbview/lay2plot.cpp
@@ -3,10 +3,10 @@
         /**********************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "gerbview.h"
+#include "class_drawpanel.h"
 
+#include "gerbview.h"
 #include "protos.h"
 
 
diff --git a/gerbview/locate.cpp b/gerbview/locate.cpp
index 00ee99f645..2b1019a8bb 100644
--- a/gerbview/locate.cpp
+++ b/gerbview/locate.cpp
@@ -3,11 +3,11 @@
 /***************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "gerbview.h"
 #include "trigo.h"
-
 #include "protos.h"
 
 
diff --git a/gerbview/onrightclick.cpp b/gerbview/onrightclick.cpp
index 6054dde47f..c23b2840e3 100644
--- a/gerbview/onrightclick.cpp
+++ b/gerbview/onrightclick.cpp
@@ -3,13 +3,13 @@
 /******************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "id.h"
+#include "confirm.h"
+
 #include "gerbview.h"
 #include "pcbplot.h"
-
-#include "id.h"
-
 #include "protos.h"
 
 /********************************************************************************/
diff --git a/gerbview/options.cpp b/gerbview/options.cpp
index c93dfd285f..ee316305e4 100644
--- a/gerbview/options.cpp
+++ b/gerbview/options.cpp
@@ -1,8 +1,8 @@
-	/********************************************/
-	/* GERBVIEW - Gestion des Options et Reglages */
-	/********************************************/
+/********************************************/
+/* GERBVIEW - Gestion des Options et Reglages */
+/********************************************/
 
-	/*	 File options.cpp 	*/
+/*	 File options.cpp   */
 
 /*
  * Set the display options for Gerbview
@@ -10,8 +10,10 @@
 
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "gerbview.h"
 #include "pcbplot.h"
 
@@ -22,321 +24,333 @@
 
 
 /*****************************************************************/
-void WinEDA_GerberFrame::OnSelectOptionToolbar(wxCommandEvent& event)
+void WinEDA_GerberFrame::OnSelectOptionToolbar( wxCommandEvent& event )
 /*****************************************************************/
+
 /** Function OnSelectOptionToolbar
  *  called to validate current choices
  */
 {
-int id = event.GetId();
+    int id = event.GetId();
 
-	switch ( id )
-	{
-		case ID_TB_OPTIONS_SHOW_GRID:
-			m_Draw_Grid = g_ShowGrid = m_OptionsToolBar->GetToolState(id);
-			DrawPanel->Refresh(TRUE);
-			break;
+    switch( id )
+    {
+    case ID_TB_OPTIONS_SHOW_GRID:
+        m_Draw_Grid = g_ShowGrid = m_OptionsToolBar->GetToolState( id );
+        DrawPanel->Refresh( TRUE );
+        break;
 
-		case ID_TB_OPTIONS_SELECT_UNIT_MM:
-			g_UnitMetric = MILLIMETRE;
-			Affiche_Status_Box();
-			break;
+    case ID_TB_OPTIONS_SELECT_UNIT_MM:
+        g_UnitMetric = MILLIMETRE;
+        Affiche_Status_Box();
+        break;
 
-		case ID_TB_OPTIONS_SELECT_UNIT_INCH:
-			g_UnitMetric = INCHES;
-			Affiche_Status_Box();
-			break;
+    case ID_TB_OPTIONS_SELECT_UNIT_INCH:
+        g_UnitMetric = INCHES;
+        Affiche_Status_Box();
+        break;
 
-		case ID_TB_OPTIONS_SHOW_POLAR_COORD:
-			Affiche_Message(wxEmptyString);
-			DisplayOpt.DisplayPolarCood = m_OptionsToolBar->GetToolState(id);
-			Affiche_Status_Box();
-			break;
+    case ID_TB_OPTIONS_SHOW_POLAR_COORD:
+        Affiche_Message( wxEmptyString );
+        DisplayOpt.DisplayPolarCood = m_OptionsToolBar->GetToolState( id );
+        Affiche_Status_Box();
+        break;
 
-		case ID_TB_OPTIONS_SELECT_CURSOR:
-			g_CursorShape = m_OptionsToolBar->GetToolState(id);
-			DrawPanel->Refresh(TRUE);
-			break;
+    case ID_TB_OPTIONS_SELECT_CURSOR:
+        g_CursorShape = m_OptionsToolBar->GetToolState( id );
+        DrawPanel->Refresh( TRUE );
+        break;
 
-		case ID_TB_OPTIONS_SHOW_PADS_SKETCH:
-			if ( m_OptionsToolBar->GetToolState(id) )
-			{
-				m_DisplayPadFill = FALSE;
-				DisplayOpt.DisplayPadFill = FALSE;
-			}
-			else
-			{
-				m_DisplayPadFill = TRUE;
-				DisplayOpt.DisplayPadFill = TRUE;
-			}
-			DrawPanel->Refresh(TRUE);
-			break;
+    case ID_TB_OPTIONS_SHOW_PADS_SKETCH:
+        if( m_OptionsToolBar->GetToolState( id ) )
+        {
+            m_DisplayPadFill = FALSE;
+            DisplayOpt.DisplayPadFill = FALSE;
+        }
+        else
+        {
+            m_DisplayPadFill = TRUE;
+            DisplayOpt.DisplayPadFill = TRUE;
+        }
+        DrawPanel->Refresh( TRUE );
+        break;
 
-		case ID_TB_OPTIONS_SHOW_TRACKS_SKETCH:
-			if( m_OptionsToolBar->GetToolState(id) )
-			{
-				m_DisplayPcbTrackFill = FALSE;
-				DisplayOpt.DisplayPcbTrackFill = FALSE;
-			}
-			else
-			{
-				m_DisplayPcbTrackFill = TRUE;
-				DisplayOpt.DisplayPcbTrackFill = TRUE;
-			}
-			DrawPanel->Refresh(TRUE);
-			break;
+    case ID_TB_OPTIONS_SHOW_TRACKS_SKETCH:
+        if( m_OptionsToolBar->GetToolState( id ) )
+        {
+            m_DisplayPcbTrackFill = FALSE;
+            DisplayOpt.DisplayPcbTrackFill = FALSE;
+        }
+        else
+        {
+            m_DisplayPcbTrackFill = TRUE;
+            DisplayOpt.DisplayPcbTrackFill = TRUE;
+        }
+        DrawPanel->Refresh( TRUE );
+        break;
 
-		case ID_TB_OPTIONS_SHOW_POLYGONS_SKETCH:
-			if ( m_OptionsToolBar->GetToolState(id) )	// Polygons filled asked
-				 g_DisplayPolygonsModeSketch = 1;
-			else g_DisplayPolygonsModeSketch = 0;
-			DrawPanel->Refresh(TRUE);
-			break;
+    case ID_TB_OPTIONS_SHOW_POLYGONS_SKETCH:
+        if( m_OptionsToolBar->GetToolState( id ) )      // Polygons filled asked
+            g_DisplayPolygonsModeSketch = 1;
+        else
+            g_DisplayPolygonsModeSketch = 0;
+        DrawPanel->Refresh( TRUE );
+        break;
 
-		case ID_TB_OPTIONS_SHOW_DCODES:
-			DisplayOpt.DisplayPadNum = m_OptionsToolBar->GetToolState(id);
-			DrawPanel->Refresh(TRUE);
-			break;
+    case ID_TB_OPTIONS_SHOW_DCODES:
+        DisplayOpt.DisplayPadNum = m_OptionsToolBar->GetToolState( id );
+        DrawPanel->Refresh( TRUE );
+        break;
 
-		default:
-			DisplayError(this, wxT("WinEDA_PcbFrame::OnSelectOptionToolbar error"));
-			break;
-	}
+    default:
+        DisplayError( this,
+                     wxT( "WinEDA_PcbFrame::OnSelectOptionToolbar error" ) );
+        break;
+    }
 
-	SetToolbars();
+    SetToolbars();
 }
 
 
 /******************************************************/
-class WinEDA_GerberGeneralOptionsFrame: public wxDialog
+class WinEDA_GerberGeneralOptionsFrame : public wxDialog
 /******************************************************/
 {
 private:
 
-	WinEDA_BasePcbFrame * m_Parent;
-	wxRadioBox * m_PolarDisplay;
-	wxRadioBox * m_BoxUnits;
-	wxRadioBox * m_CursorShape;
-	wxRadioBox * m_GerberDefaultScale;
+    WinEDA_BasePcbFrame* m_Parent;
+    wxRadioBox*          m_PolarDisplay;
+    wxRadioBox*          m_BoxUnits;
+    wxRadioBox*          m_CursorShape;
+    wxRadioBox*          m_GerberDefaultScale;
 
-	// Constructor and destructor
+    // Constructor and destructor
 public:
-	WinEDA_GerberGeneralOptionsFrame(WinEDA_BasePcbFrame *parent,const wxPoint& pos);
-	~WinEDA_GerberGeneralOptionsFrame() {};
+    WinEDA_GerberGeneralOptionsFrame( WinEDA_BasePcbFrame* parent,
+                                      const wxPoint&       pos );
+    ~WinEDA_GerberGeneralOptionsFrame() {};
 
 private:
-	void OnOkClick(wxCommandEvent& event);
-	void OnCancelClick(wxCommandEvent & event);
-
-	DECLARE_EVENT_TABLE()
+    void OnOkClick( wxCommandEvent& event );
+    void OnCancelClick( wxCommandEvent& event );
 
+    DECLARE_EVENT_TABLE()
 };
+
 /* Events table for WinEDA_GerberGeneralOptionsFrame */
-BEGIN_EVENT_TABLE(WinEDA_GerberGeneralOptionsFrame, wxDialog)
-	EVT_BUTTON(wxID_OK, WinEDA_GerberGeneralOptionsFrame::OnOkClick)
-	EVT_BUTTON(wxID_CANCEL, WinEDA_GerberGeneralOptionsFrame::OnCancelClick)
+BEGIN_EVENT_TABLE( WinEDA_GerberGeneralOptionsFrame, wxDialog )
+    EVT_BUTTON( wxID_OK, WinEDA_GerberGeneralOptionsFrame::OnOkClick )
+    EVT_BUTTON( wxID_CANCEL, WinEDA_GerberGeneralOptionsFrame::OnCancelClick )
 END_EVENT_TABLE()
 
 
-
-
 /**********************************************************************************************/
-WinEDA_GerberGeneralOptionsFrame::WinEDA_GerberGeneralOptionsFrame(WinEDA_BasePcbFrame *parent,
-		const wxPoint& framepos):
-		wxDialog(parent, -1, _("Gerbview Options"),
-				 framepos, wxSize(300, 240),
-				wxDEFAULT_DIALOG_STYLE|wxFRAME_FLOAT_ON_PARENT )
+WinEDA_GerberGeneralOptionsFrame::WinEDA_GerberGeneralOptionsFrame(
+    WinEDA_BasePcbFrame* parent,
+    const
+    wxPoint&             framepos ) :
+    wxDialog( parent, -1, _( "Gerbview Options" ),
+              framepos, wxSize( 300, 240 ),
+              wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT )
 /**********************************************************************************************/
+
 /** WinEDA_GerberGeneralOptionsFrame Constructor
-*/
+ */
 {
-	m_Parent = parent;
-	SetFont(*g_DialogFont);
+    m_Parent = parent;
+    SetFont( *g_DialogFont );
 
-	wxBoxSizer * MainBoxSizer = new wxBoxSizer(wxHORIZONTAL);
-	SetSizer(MainBoxSizer);
-	wxBoxSizer * RightBoxSizer = new wxBoxSizer(wxVERTICAL);
-	wxBoxSizer * MiddleBoxSizer = new wxBoxSizer(wxVERTICAL);
-	wxBoxSizer * LeftBoxSizer = new wxBoxSizer(wxVERTICAL);
-	MainBoxSizer->Add(LeftBoxSizer, 0, wxGROW|wxALL, 5);
-	MainBoxSizer->Add(MiddleBoxSizer, 0, wxGROW|wxALL, 5);
-	MainBoxSizer->Add(RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxBoxSizer* MainBoxSizer = new wxBoxSizer( wxHORIZONTAL );
+    SetSizer( MainBoxSizer );
+    wxBoxSizer* RightBoxSizer  = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* MiddleBoxSizer = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* LeftBoxSizer   = new wxBoxSizer( wxVERTICAL );
+    MainBoxSizer->Add( LeftBoxSizer, 0, wxGROW | wxALL, 5 );
+    MainBoxSizer->Add( MiddleBoxSizer, 0, wxGROW | wxALL, 5 );
+    MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
 
-	wxButton * Button = new wxButton(this, wxID_OK, _("OK"));
-	Button->SetForegroundColour(*wxRED);
-	RightBoxSizer->Add(Button, 0, wxGROW|wxALL, 5);
+    wxButton* Button = new wxButton( this, wxID_OK, _( "OK" ) );
+    Button->SetForegroundColour( *wxRED );
+    RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
-	Button = new wxButton(this, wxID_CANCEL, _("Cancel"));
-	Button->SetForegroundColour(*wxBLUE);
-	RightBoxSizer->Add(Button, 0, wxGROW|wxALL, 5);
+    Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
+    Button->SetForegroundColour( *wxBLUE );
+    RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
-	/* Display / not display polar coordinates: */
-wxString list_coord[2] =
-	{ _("No Display"),
-	_("Display") };
-	m_PolarDisplay = new wxRadioBox(this, -1, _("Display Polar Coord"),
-					wxDefaultPosition, wxDefaultSize,
-					2, list_coord, 1);
-	m_PolarDisplay->SetSelection(DisplayOpt.DisplayPolarCood ? 1 : 0);
-	LeftBoxSizer->Add(m_PolarDisplay, 0, wxGROW|wxALL, 5);
+    /* Display / not display polar coordinates: */
+    wxString list_coord[2] =
+    {
+        _( "No Display" ),
+        _( "Display" )
+    };
+    m_PolarDisplay = new wxRadioBox( this, -1, _( "Display Polar Coord" ),
+                                     wxDefaultPosition, wxDefaultSize,
+                                     2, list_coord, 1 );
+    m_PolarDisplay->SetSelection( DisplayOpt.DisplayPolarCood ? 1 : 0 );
+    LeftBoxSizer->Add( m_PolarDisplay, 0, wxGROW | wxALL, 5 );
 
-	/* Selection of units */
-wxString list_units[2] = {
-	_("Inches"),
-	_("millimeters") };
-	m_BoxUnits = new wxRadioBox(this, -1, _("Units"), wxDefaultPosition, wxDefaultSize,
-					2, list_units, 1);
-	m_BoxUnits->SetSelection( g_UnitMetric ? 1 : 0);
-	LeftBoxSizer->Add(m_BoxUnits, 0, wxGROW|wxALL, 5);
+    /* Selection of units */
+    wxString list_units[2] =
+    {
+        _( "Inches" ),
+        _( "millimeters" )
+    };
+    m_BoxUnits = new wxRadioBox( this, -1, _( "Units" ), wxDefaultPosition,
+                                 wxDefaultSize,
+                                 2, list_units, 1 );
+    m_BoxUnits->SetSelection( g_UnitMetric ? 1 : 0 );
+    LeftBoxSizer->Add( m_BoxUnits, 0, wxGROW | wxALL, 5 );
 
-	/* Selection of cursor shape */
-wxString list_cursors[2] = { _("Small"), _("Big") };
-	m_CursorShape = new wxRadioBox(this, -1, _("Cursor"), wxDefaultPosition, wxDefaultSize,
-					2, list_cursors, 1);
-	m_CursorShape->SetSelection( g_CursorShape ? 1 : 0);
-	MiddleBoxSizer->Add(m_CursorShape, 0, wxGROW|wxALL, 5);
+    /* Selection of cursor shape */
+    wxString list_cursors[2] = { _( "Small" ), _( "Big" ) };
+    m_CursorShape = new wxRadioBox( this, -1, _( "Cursor" ), wxDefaultPosition,
+                                    wxDefaultSize,
+                                    2, list_cursors, 1 );
+    m_CursorShape->SetSelection( g_CursorShape ? 1 : 0 );
+    MiddleBoxSizer->Add( m_CursorShape, 0, wxGROW | wxALL, 5 );
 
-	/* Selection Default Scale (i.e. format 2.3 ou 3.4) */
-wxString list_scales[2] = { _("format: 2.3"), _("format 3.4") };
-	m_GerberDefaultScale = new wxRadioBox(this, -1, _("Default format"),
-						wxDefaultPosition, wxDefaultSize,
-					2, list_scales, 1);
-	m_GerberDefaultScale->SetSelection( (g_Default_GERBER_Format == 23) ? 0 : 1);
-	MiddleBoxSizer->Add(m_GerberDefaultScale, 0, wxGROW|wxALL, 5);
+    /* Selection Default Scale (i.e. format 2.3 ou 3.4) */
+    wxString list_scales[2] = { _( "format: 2.3" ), _( "format 3.4" ) };
+    m_GerberDefaultScale = new wxRadioBox( this, -1, _( "Default format" ),
+                                           wxDefaultPosition, wxDefaultSize,
+                                           2, list_scales, 1 );
+    m_GerberDefaultScale->SetSelection(
+         (g_Default_GERBER_Format == 23) ? 0 : 1 );
+    MiddleBoxSizer->Add( m_GerberDefaultScale, 0, wxGROW | wxALL, 5 );
 
-	GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
+    GetSizer()->Fit( this );
+    GetSizer()->SetSizeHints( this );
 }
 
 
 /************************************************************************/
-void  WinEDA_GerberGeneralOptionsFrame::OnCancelClick(wxCommandEvent& WXUNUSED(event))
+void WinEDA_GerberGeneralOptionsFrame::OnCancelClick(
+     wxCommandEvent& WXUNUSED(event) )
 /************************************************************************/
 {
     EndModal( -1 );
 }
 
 
-
 /*****************************************************************************/
-void WinEDA_GerberGeneralOptionsFrame::OnOkClick(wxCommandEvent& event)
+void WinEDA_GerberGeneralOptionsFrame::OnOkClick( wxCommandEvent& event )
 /*****************************************************************************/
 {
-	DisplayOpt.DisplayPolarCood =
-		(m_PolarDisplay->GetSelection() == 0) ? FALSE : TRUE;
-	g_UnitMetric = (m_BoxUnits->GetSelection() == 0) ? 0 : 1;
-	g_CursorShape = m_CursorShape->GetSelection();
-	g_Default_GERBER_Format =
-		(m_GerberDefaultScale->GetSelection() == 0) ? 23 : 34;
+    DisplayOpt.DisplayPolarCood =
+        (m_PolarDisplay->GetSelection() == 0) ? FALSE : TRUE;
+    g_UnitMetric  = (m_BoxUnits->GetSelection() == 0) ? 0 : 1;
+    g_CursorShape = m_CursorShape->GetSelection();
+    g_Default_GERBER_Format =
+        (m_GerberDefaultScale->GetSelection() == 0) ? 23 : 34;
 
-	EndModal( 1 );
+    EndModal( 1 );
 }
 
 
-
 /*******************************************/
 /* Dialog frame to select deisplay options */
 /*******************************************/
-class WinEDA_LookFrame: public wxDialog
+class WinEDA_LookFrame : public wxDialog
 {
 private:
-	WinEDA_BasePcbFrame * m_Parent;
-	wxRadioBox * m_OptDisplayLines;
-	wxRadioBox * m_OptDisplayFlashes;
-	wxRadioBox * m_OptDisplayPolygons;
-	wxCheckBox * m_OptDisplayDCodes;
-	wxRadioBox * m_OptDisplayDrawings;
+    WinEDA_BasePcbFrame* m_Parent;
+    wxRadioBox*          m_OptDisplayLines;
+    wxRadioBox*          m_OptDisplayFlashes;
+    wxRadioBox*          m_OptDisplayPolygons;
+    wxCheckBox*          m_OptDisplayDCodes;
+    wxRadioBox*          m_OptDisplayDrawings;
 
 public:
-	// Constructor and destructor
-	WinEDA_LookFrame(WinEDA_BasePcbFrame *parent,const wxPoint& pos);
-	~WinEDA_LookFrame() {};
+
+    // Constructor and destructor
+    WinEDA_LookFrame( WinEDA_BasePcbFrame* parent, const wxPoint& pos );
+    ~WinEDA_LookFrame() {};
 
 private:
-	void OnOkClick(wxCommandEvent& event);
-	void OnCancelClick(wxCommandEvent & event);
-
-	DECLARE_EVENT_TABLE()
+    void OnOkClick( wxCommandEvent& event );
+    void OnCancelClick( wxCommandEvent& event );
 
+    DECLARE_EVENT_TABLE()
 };
+
 /* Construction de la table des evenements pour WinEDA_LookFrame */
-BEGIN_EVENT_TABLE(WinEDA_LookFrame, wxDialog)
-	EVT_BUTTON(wxID_OK, WinEDA_LookFrame::OnOkClick)
-	EVT_BUTTON(wxID_CANCEL, WinEDA_LookFrame::OnCancelClick)
+BEGIN_EVENT_TABLE( WinEDA_LookFrame, wxDialog )
+    EVT_BUTTON( wxID_OK, WinEDA_LookFrame::OnOkClick )
+    EVT_BUTTON( wxID_CANCEL, WinEDA_LookFrame::OnCancelClick )
 END_EVENT_TABLE()
 
 
-
 /*******************************************************************************/
-WinEDA_LookFrame::WinEDA_LookFrame(WinEDA_BasePcbFrame *parent,
-		const wxPoint& framepos):
-		wxDialog(parent, -1, _("Gerbview Draw Options"), framepos, wxSize(350, 200),
-		wxDEFAULT_DIALOG_STYLE|wxFRAME_FLOAT_ON_PARENT )
+WinEDA_LookFrame::WinEDA_LookFrame( WinEDA_BasePcbFrame* parent,
+                                    const wxPoint&       framepos ) :
+    wxDialog( parent, -1, _( "Gerbview Draw Options" ), framepos,
+              wxSize( 350, 200 ),
+              wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT )
 /*******************************************************************************/
 {
-	m_Parent = parent;
-	SetFont(*g_DialogFont);
+    m_Parent = parent;
+    SetFont( *g_DialogFont );
 
-	wxBoxSizer * MainBoxSizer = new wxBoxSizer(wxHORIZONTAL);
-	SetSizer(MainBoxSizer);
-	wxBoxSizer * RightBoxSizer = new wxBoxSizer(wxVERTICAL);
-	wxBoxSizer * MiddleBoxSizer = new wxBoxSizer(wxVERTICAL);
-	wxBoxSizer * LeftBoxSizer = new wxBoxSizer(wxVERTICAL);
-	MainBoxSizer->Add(LeftBoxSizer, 0, wxGROW|wxALL, 5);
-	MainBoxSizer->Add(MiddleBoxSizer, 0, wxGROW|wxALL, 5);
-	MainBoxSizer->Add(RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxBoxSizer* MainBoxSizer = new wxBoxSizer( wxHORIZONTAL );
+    SetSizer( MainBoxSizer );
+    wxBoxSizer* RightBoxSizer  = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* MiddleBoxSizer = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* LeftBoxSizer   = new wxBoxSizer( wxVERTICAL );
+    MainBoxSizer->Add( LeftBoxSizer, 0, wxGROW | wxALL, 5 );
+    MainBoxSizer->Add( MiddleBoxSizer, 0, wxGROW | wxALL, 5 );
+    MainBoxSizer->Add( RightBoxSizer, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
 
-	wxButton * Button = new wxButton(this, wxID_OK, _("OK"));
-	Button->SetForegroundColour(*wxRED);
-	RightBoxSizer->Add(Button, 0, wxGROW|wxALL, 5);
+    wxButton* Button = new wxButton( this, wxID_OK, _( "OK" ) );
+    Button->SetForegroundColour( *wxRED );
+    RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
-	Button = new wxButton(this, wxID_CANCEL, _("Cancel"));
-	Button->SetForegroundColour(*wxBLUE);
-	RightBoxSizer->Add(Button, 0, wxGROW|wxALL, 5);
+    Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
+    Button->SetForegroundColour( *wxBLUE );
+    RightBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
 
-	// Show Option Draw Tracks
-wxString list_opt2[2] = { _("Sketch"), _("Filled") };
-	m_OptDisplayLines = new wxRadioBox(this, -1, _("Lines:"),
-				wxDefaultPosition, wxDefaultSize,
-				2, list_opt2, 1);
-	if ( DisplayOpt.DisplayPcbTrackFill )
-		m_OptDisplayLines->SetSelection(1);
-	LeftBoxSizer->Add(m_OptDisplayLines, 0, wxGROW|wxALL, 5);
+    // Show Option Draw Tracks
+    wxString list_opt2[2] = { _( "Sketch" ), _( "Filled" ) };
+    m_OptDisplayLines = new wxRadioBox( this, -1, _( "Lines:" ),
+                                        wxDefaultPosition, wxDefaultSize,
+                                        2, list_opt2, 1 );
+    if( DisplayOpt.DisplayPcbTrackFill )
+        m_OptDisplayLines->SetSelection( 1 );
+    LeftBoxSizer->Add( m_OptDisplayLines, 0, wxGROW | wxALL, 5 );
 
-	m_OptDisplayFlashes = new wxRadioBox(this, -1, _("Spots:"),
-				wxDefaultPosition, wxDefaultSize,
-				2, list_opt2, 1);
-	if ( DisplayOpt.DisplayPadFill )
-		m_OptDisplayFlashes->SetSelection(1);
-	LeftBoxSizer->Add(m_OptDisplayFlashes, 0, wxGROW|wxALL, 5);
+    m_OptDisplayFlashes = new wxRadioBox( this, -1, _( "Spots:" ),
+                                          wxDefaultPosition, wxDefaultSize,
+                                          2, list_opt2, 1 );
+    if( DisplayOpt.DisplayPadFill )
+        m_OptDisplayFlashes->SetSelection( 1 );
+    LeftBoxSizer->Add( m_OptDisplayFlashes, 0, wxGROW | wxALL, 5 );
 
-		// Show Option Draw polygons
-	m_OptDisplayPolygons = new wxRadioBox(this, -1, _("Polygons:"),
-				wxDefaultPosition, wxDefaultSize,
-				2, list_opt2, 1);
-	if ( g_DisplayPolygonsModeSketch == 0)
-		m_OptDisplayPolygons->SetSelection(1);
-	LeftBoxSizer->Add(m_OptDisplayPolygons, 0, wxGROW|wxALL, 5);
+    // Show Option Draw polygons
+    m_OptDisplayPolygons = new wxRadioBox( this, -1, _( "Polygons:" ),
+                                           wxDefaultPosition, wxDefaultSize,
+                                           2, list_opt2, 1 );
+    if( g_DisplayPolygonsModeSketch == 0 )
+        m_OptDisplayPolygons->SetSelection( 1 );
+    LeftBoxSizer->Add( m_OptDisplayPolygons, 0, wxGROW | wxALL, 5 );
 
-wxString list_opt3[3] = { _("Sketch"), _("Filled"), _("Line") };
-	m_OptDisplayDrawings = new wxRadioBox(this, -1, _("Display other items:"),
-				wxDefaultPosition, wxDefaultSize,
-				3, list_opt3, 1);
-	m_OptDisplayDrawings->SetSelection(DisplayOpt.DisplayDrawItems);
-	MiddleBoxSizer->Add(m_OptDisplayDrawings, 0, wxGROW|wxALL, 5);
+    wxString list_opt3[3] = { _( "Sketch" ), _( "Filled" ), _( "Line" ) };
+    m_OptDisplayDrawings = new wxRadioBox( this, -1, _( "Display other items:" ),
+                                           wxDefaultPosition, wxDefaultSize,
+                                           3, list_opt3, 1 );
+    m_OptDisplayDrawings->SetSelection( DisplayOpt.DisplayDrawItems );
+    MiddleBoxSizer->Add( m_OptDisplayDrawings, 0, wxGROW | wxALL, 5 );
 
-	m_OptDisplayDCodes = new wxCheckBox(this, -1, _("Show D codes"));
-	if ( DisplayOpt.DisplayPadNum )
-		m_OptDisplayDCodes->SetValue(TRUE);
-	MiddleBoxSizer->Add(m_OptDisplayDCodes, 0, wxGROW|wxALL, 5);
- 
-	GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
+    m_OptDisplayDCodes = new wxCheckBox( this, -1, _( "Show D codes" ) );
+    if( DisplayOpt.DisplayPadNum )
+        m_OptDisplayDCodes->SetValue( TRUE );
+    MiddleBoxSizer->Add( m_OptDisplayDCodes, 0, wxGROW | wxALL, 5 );
+
+    GetSizer()->Fit( this );
+    GetSizer()->SetSizeHints( this );
 }
 
 
 /**************************************************************/
-void  WinEDA_LookFrame::OnCancelClick(wxCommandEvent& WXUNUSED(event))
+void WinEDA_LookFrame::OnCancelClick( wxCommandEvent& WXUNUSED(event) )
 /**************************************************************/
 {
     EndModal( -1 );
@@ -344,64 +358,62 @@ void  WinEDA_LookFrame::OnCancelClick(wxCommandEvent& WXUNUSED(event))
 
 
 /*************************************************************/
-void WinEDA_LookFrame::OnOkClick(wxCommandEvent& event)
+void WinEDA_LookFrame::OnOkClick( wxCommandEvent& event )
 /*************************************************************/
+
 /* Met a jour les options
  */
 {
-	if ( m_OptDisplayLines->GetSelection() == 1 )
-		DisplayOpt.DisplayPcbTrackFill = TRUE;
-	else
-		DisplayOpt.DisplayPcbTrackFill = FALSE;
+    if( m_OptDisplayLines->GetSelection() == 1 )
+        DisplayOpt.DisplayPcbTrackFill = TRUE;
+    else
+        DisplayOpt.DisplayPcbTrackFill = FALSE;
 
-	if ( m_OptDisplayFlashes->GetSelection() == 1 )
-		 DisplayOpt.DisplayPadFill = TRUE;
-	else
-		DisplayOpt.DisplayPadFill = FALSE;
+    if( m_OptDisplayFlashes->GetSelection() == 1 )
+        DisplayOpt.DisplayPadFill = TRUE;
+    else
+        DisplayOpt.DisplayPadFill = FALSE;
 
-	if ( m_OptDisplayPolygons->GetSelection() == 0 )
-		 g_DisplayPolygonsModeSketch = 1;
-	else
-		g_DisplayPolygonsModeSketch = 0;
+    if( m_OptDisplayPolygons->GetSelection() == 0 )
+        g_DisplayPolygonsModeSketch = 1;
+    else
+        g_DisplayPolygonsModeSketch = 0;
 
-	DisplayOpt.DisplayPadNum = m_OptDisplayDCodes->GetValue();
+    DisplayOpt.DisplayPadNum = m_OptDisplayDCodes->GetValue();
 
-	DisplayOpt.DisplayDrawItems = m_OptDisplayDrawings->GetSelection();
+    DisplayOpt.DisplayDrawItems = m_OptDisplayDrawings->GetSelection();
 
-	m_Parent->m_DisplayPadFill = DisplayOpt.DisplayPadFill;
-	m_Parent->m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill;
+    m_Parent->m_DisplayPadFill = DisplayOpt.DisplayPadFill;
+    m_Parent->m_DisplayPcbTrackFill = DisplayOpt.DisplayPcbTrackFill;
 
-	m_Parent->GetScreen()->SetRefreshReq();
+    m_Parent->GetScreen()->SetRefreshReq();
 
-	EndModal( 1 );
+    EndModal( 1 );
 }
 
 
-
-
-
 /***************************************************************************/
-void WinEDA_GerberFrame::InstallPcbOptionsFrame(const wxPoint & pos, int id)
+void WinEDA_GerberFrame::InstallPcbOptionsFrame( const wxPoint& pos, int id )
 /***************************************************************************/
 {
-	switch ( id )
-	{
-		case ID_PCB_LOOK_SETUP:
-		{
-			WinEDA_LookFrame * OptionsFrame =
-				new WinEDA_LookFrame(this, pos);
-			OptionsFrame->ShowModal();
-			OptionsFrame->Destroy();
-		}
-			break;
+    switch( id )
+    {
+    case ID_PCB_LOOK_SETUP:
+    {
+        WinEDA_LookFrame* OptionsFrame =
+            new WinEDA_LookFrame( this, pos );
+        OptionsFrame->ShowModal();
+        OptionsFrame->Destroy();
+    }
+    break;
 
-		case ID_OPTIONS_SETUP:
-		{
-			WinEDA_GerberGeneralOptionsFrame * OptionsFrame =
-				new WinEDA_GerberGeneralOptionsFrame(this, pos);
-			OptionsFrame->ShowModal();
-			OptionsFrame->Destroy();
-		}
-			break;
-	}
+    case ID_OPTIONS_SETUP:
+    {
+        WinEDA_GerberGeneralOptionsFrame* OptionsFrame =
+            new WinEDA_GerberGeneralOptionsFrame( this, pos );
+        OptionsFrame->ShowModal();
+        OptionsFrame->Destroy();
+    }
+    break;
+    }
 }
diff --git a/gerbview/pcbplot.cpp b/gerbview/pcbplot.cpp
index 981be74d84..d855207904 100644
--- a/gerbview/pcbplot.cpp
+++ b/gerbview/pcbplot.cpp
@@ -3,12 +3,11 @@
 		/************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
-#include "gerbview.h"
-#include "pcbplot.h"
 #include "id.h"
 
+#include "gerbview.h"
+#include "pcbplot.h"
 #include "protos.h"
 
 /* variables locale : */
diff --git a/gerbview/readgerb.cpp b/gerbview/readgerb.cpp
index 3308410899..55e11e86f8 100644
--- a/gerbview/readgerb.cpp
+++ b/gerbview/readgerb.cpp
@@ -3,11 +3,12 @@
 /********************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "gerbview.h"
 #include "pcbplot.h"
-
 #include "protos.h"
 
 /* Format Gerber : NOTES :
diff --git a/gerbview/reglage.cpp b/gerbview/reglage.cpp
index 104a610747..402a30dfbc 100644
--- a/gerbview/reglage.cpp
+++ b/gerbview/reglage.cpp
@@ -10,11 +10,10 @@
 
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "gerbview.h"
 #include "pcbplot.h"
-
 #include "protos.h"
 
 /***********/
diff --git a/gerbview/rs274d.cpp b/gerbview/rs274d.cpp
index f39c0d8e9d..d8dfb9577a 100644
--- a/gerbview/rs274d.cpp
+++ b/gerbview/rs274d.cpp
@@ -4,11 +4,10 @@
 
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "gerbview.h"
 #include "pcbplot.h"
-
 #include "protos.h"
 
 #define IsNumber( x ) ( ( ( (x) >= '0' ) && ( (x) <='9' ) )   \
diff --git a/gerbview/rs274x.cpp b/gerbview/rs274x.cpp
index 05bb428557..9f493d9728 100644
--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
@@ -3,11 +3,10 @@
 /********************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "gerbview.h"
 #include "pcbplot.h"
-
 #include "protos.h"
 
 #define CODE( x, y ) ( ((x) << 8) + (y) )
diff --git a/gerbview/set_color.cpp b/gerbview/set_color.cpp
index e94130a5b9..e9258ee4fa 100644
--- a/gerbview/set_color.cpp
+++ b/gerbview/set_color.cpp
@@ -9,21 +9,11 @@
 #pragma implementation "set_color.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "gerbview.h"
 #include "pcbnew.h"
 
diff --git a/gerbview/tool_gerber.cpp b/gerbview/tool_gerber.cpp
index 6046116b09..2d8cfb26da 100644
--- a/gerbview/tool_gerber.cpp
+++ b/gerbview/tool_gerber.cpp
@@ -3,17 +3,13 @@
 /***************************************************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "gerbview.h"
 #include "pcbplot.h"
-
 #include "protos.h"
-
 #include "bitmaps.h"
-
 #include "id.h"
-
 #include "hotkeys.h"
 
 /***********************************************/
@@ -38,35 +34,35 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
                        FALSE );
 
     filesMenu->Append( ID_MENU_APPEND_FILE, _( "Load Gerber file" ),
-                         _( "Load new Gerber file on currrent layer" ),
-                         FALSE );
+                       _( "Load new Gerber file on currrent layer" ),
+                       FALSE );
 
     filesMenu->Append( ID_MENU_INC_LAYER_AND_APPEND_FILE,
-                         _( "Inc Layer and load Gerber file" ),
-                         _( "Increment layer number, and Load Gerber file" ),
-                         FALSE );
+                       _( "Inc Layer and load Gerber file" ),
+                       _( "Increment layer number, and Load Gerber file" ),
+                       FALSE );
 
     filesMenu->Append( ID_GERBVIEW_LOAD_DCODE_FILE, _( "Load DCodes" ),
-                         _( "Load D-Codes File" ), FALSE );
+                       _( "Load D-Codes File" ), FALSE );
 #if 0
     filesMenu->Append( ID_GERBVIEW_LOAD_DRILL_FILE, _( "Load drill" ),
-                         _( "Load excellon drill file" ), FALSE );
+                       _( "Load excellon drill file" ), FALSE );
 #endif
 
     filesMenu->Append( ID_MENU_NEW_BOARD, _( "&New" ),
-                         _( "Clear all layers" ), FALSE );
+                       _( "Clear all layers" ), FALSE );
 
     filesMenu->AppendSeparator();
     filesMenu->Append( ID_GERBVIEW_EXPORT_TO_PCBNEW,  _( "&Export to Pcbnew" ),
-                         _( "Export data in pcbnew format" ), FALSE );
+                       _( "Export data in pcbnew format" ), FALSE );
 
 #if 0
     filesMenu->AppendSeparator();
     filesMenu->Append( ID_MENU_SAVE_BOARD, _( "&Save layers" ),
-                         _( "Save current layers (GERBER format)" ), FALSE );
+                       _( "Save current layers (GERBER format)" ), FALSE );
 
     filesMenu->Append( ID_MENU_SAVE_BOARD_AS, _( "Save layers as.." ),
-                         _( "Save current layers as.." ), FALSE );
+                       _( "Save current layers as.." ), FALSE );
 #endif
 
     filesMenu->AppendSeparator();
@@ -132,9 +128,9 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
     wxMenu* helpMenu = new wxMenu;
     ADD_MENUITEM_WITH_HELP( helpMenu, ID_GENERAL_HELP, _( "&Contents" ),
                             _( "Open the gerbview manual" ), help_xpm );
-    ADD_MENUITEM_WITH_HELP(helpMenu, ID_KICAD_ABOUT, _( "&About gerbview" ),
-                           _( "About gerbview gerber and drill viewer" ),
-                           info_xpm );
+    ADD_MENUITEM_WITH_HELP( helpMenu, ID_KICAD_ABOUT, _( "&About gerbview" ),
+                            _( "About gerbview gerber and drill viewer" ),
+                            info_xpm );
 
     menuBar->Append( filesMenu, _( "&File" ) );
     menuBar->Append( configmenu, _( "&Preferences" ) );
diff --git a/gerbview/tracepcb.cpp b/gerbview/tracepcb.cpp
index ba36b54b0f..ac4906c16e 100644
--- a/gerbview/tracepcb.cpp
+++ b/gerbview/tracepcb.cpp
@@ -10,11 +10,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "gerbview.h"
 #include "pcbplot.h"
-
 #include "protos.h"
 
 
diff --git a/gerbview/trpiste.cpp b/gerbview/trpiste.cpp
index b9ff7703d0..7267a2dad1 100644
--- a/gerbview/trpiste.cpp
+++ b/gerbview/trpiste.cpp
@@ -4,12 +4,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+#include "confirm.h"
+
 #include "gerbview.h"
 #include "pcbplot.h"
-#include "trigo.h"
-
 #include "protos.h"
 
 /* Definition des cas ou l'on force l'affichage en SKETCH (membre .flags) */
diff --git a/include/appl_wxstruct.h b/include/appl_wxstruct.h
index 7360f2f594..cb5dfb8385 100644
--- a/include/appl_wxstruct.h
+++ b/include/appl_wxstruct.h
@@ -10,14 +10,15 @@
 #ifndef  APPL_WXSTRUCT_H
 #define  APPL_WXSTRUCT_H
 
-#ifndef eda_global
-#define eda_global extern
-#endif
-
 /* Use wxFileHistory for most recently used file handling. */
 #include <wx/docview.h>
+#include <wx/config.h>
+
 
 class PARAM_CFG_BASE;
+class wxSingleInstanceChecker;
+class wxHtmlHelpController;
+
 
 /**********************************************/
 /*  Class representing the entire Application */
diff --git a/include/class_base_screen.h b/include/class_base_screen.h
index d2e8a24539..3053b6534c 100644
--- a/include/class_base_screen.h
+++ b/include/class_base_screen.h
@@ -10,6 +10,9 @@
 #ifndef  __CLASS_BASE_SCREEN_H__
 #define  __CLASS_BASE_SCREEN_H__
 
+#include "base_struct.h"
+
+
 // Forward declarations:
 class SCH_ITEM;
 class Ki_PageDescr;
@@ -69,6 +72,20 @@ public:
 };
 
 
+/* Simple class for handling grid arrays. */
+class GRID_TYPE
+{
+public:
+    int    m_Id;
+    wxSize m_Size;
+};
+
+
+/* Declare array of wxSize for grid list implementation. */
+#include <wx/dynarray.h>
+WX_DECLARE_OBJARRAY( GRID_TYPE, GridArray );
+
+
 /*******************************************************************/
 /* Class to handle how to draw a screen (a board, a schematic ...) */
 /*******************************************************************/
diff --git a/include/class_drawpanel.h b/include/class_drawpanel.h
index 815fa6f404..ecd0d9769c 100644
--- a/include/class_drawpanel.h
+++ b/include/class_drawpanel.h
@@ -10,21 +10,11 @@
 #define  PANEL_WXSTRUCT_H
 
 #include "colors.h"
+#include "base_struct.h"
 
+class WinEDA_DrawFrame;
 class BASE_SCREEN;
-
-/* Simple class for handling grid arrays. */
-class GRID_TYPE
-{
-public:
-    int    m_Id;
-    wxSize m_Size;
-};
-
-
-/* Declare array of wxSize for grid list implementation. */
-#include <wx/dynarray.h>
-WX_DECLARE_OBJARRAY( GRID_TYPE, GridArray );
+class PCB_SCREEN;
 
 
 /****************************************************/
diff --git a/include/class_sch_screen.h b/include/class_sch_screen.h
index 1973a9792d..e0251b1bf9 100644
--- a/include/class_sch_screen.h
+++ b/include/class_sch_screen.h
@@ -11,6 +11,7 @@
 
 #include "macros.h"
 #include "base_struct.h"
+#include "class_base_screen.h"
 
 /* Max number of sheets in a hierarchy project: */
 #define NB_MAX_SHEET 500
diff --git a/include/common.h b/include/common.h
index aed89f4587..3a2fd1e8d8 100644
--- a/include/common.h
+++ b/include/common.h
@@ -6,12 +6,6 @@
 #ifndef __INCLUDE__COMMON_H__
 #define __INCLUDE__COMMON_H__ 1
 
-/* wxWidgets about dialog */
-#include <wx/aboutdlg.h>
-#include "wx/statline.h"
-#include "wx/generic/aboutdlgg.h"
-/**************************/
-
 #include "wx/confbase.h"
 #include "wx/fileconf.h"
 
@@ -19,6 +13,12 @@
 #  define COMMON_GLOBL extern
 #endif
 
+class wxAboutDialogInfo;
+class BASE_SCREEN;
+class WinEDA_DrawFrame;
+class WinEDAListBox;
+class WinEDA_DrawPanel;
+
 
 /* Flag for special keys */
 #define GR_KB_RIGHTSHIFT    0x10000000              /* Keybd states: right shift key depressed */
@@ -355,15 +355,6 @@ COMMON_GLOBL int g_GridColor
 COMMON_GLOBL BASE_SCREEN* ActiveScreen;
 
 
-/**************************************/
-/* Prototypage des Fonctions Usuelles */
-/**************************************/
-
-class WinEDA_DrawFrame;
-class WinEDAListBox;
-class WinEDA_DrawPanel;
-
-
 /* COMMON.CPP */
 
 /** function SetLocaleTo_C_standard
@@ -440,26 +431,6 @@ wxString            ReturnPcbLayerName( int layer_number, bool is_filename = FAL
   double round( double aNumber );
 #endif
 
-/**************/
-/* DRAWTXT.CPP */
-/**************/
-#include "drawtxt.h"
-
-/***************/
-/* CONFIRM.CPP */
-/***************/
-#include "confirm.h"
-
-/****************/
-/* GESTFICH.CPP */
-/****************/
-#include "gestfich.h"
-
-/*************/
-/*STRING.CPP */
-/*************/
-#include "kicad_string.h"
-
 
 /*******************/
 /* about_kicad.cpp */
@@ -544,22 +515,4 @@ void            MyFree( void* pt_mem );
 void*           MyZMalloc( size_t nb_octets );
 void*           MyMalloc( size_t nb_octets );
 
-
-/****************/
-/* eda_doc.cpp */
-/****************/
-#include "eda_doc.h"
-
-/****************************/
-/* get_component_dialog.cpp */
-/****************************/
-#include "get_component_dialog.h"
-
-/**********************/
-/* block_commande.cpp */
-/**********************/
-#include "block_commande.h"
-
-
 #endif  /* __INCLUDE__COMMON_H__ */
-
diff --git a/include/drawtxt.h b/include/drawtxt.h
index 4a88da9df4..7bc78aacfd 100644
--- a/include/drawtxt.h
+++ b/include/drawtxt.h
@@ -8,6 +8,7 @@
 #ifndef __INCLUDE__DRAWTXT_H__
 #define __INCLUDE__DRAWTXT_H__ 1
 
+class WinEDA_DrawPanel;
 
 /** Function DrawGraphicText
  * Draw a graphic text (like module texts)
diff --git a/include/fctsys.h b/include/fctsys.h
index c477f95d0e..abbc8f7b12 100644
--- a/include/fctsys.h
+++ b/include/fctsys.h
@@ -41,19 +41,6 @@
 #define PCB_INTERNAL_UNIT      10000    //  PCBNEW internal unit = 1/10000 inch
 #define EESCHEMA_INTERNAL_UNIT 1000     //  EESCHEMA internal unit = 1/1000 inch
 
-#include "wxstruct.h"
-
-// Old wxWidget compatibility (prior to wxWidget 2.7):
-#if !wxCHECK_VERSION( 2, 7, 0 )
-#define wxFD_OPEN             wxOPEN
-#define wxFD_SAVE             wxSAVE
-#define wxFD_DEFAULT_STYLE    wxOPEN
-#define wxFD_MULTIPLE         wxMULTIPLE
-#define wxFD_OVERWRITE_PROMPT wxOVERWRITE_PROMPT
-#define WXK_PAGEUP            WXK_PRIOR
-#define WXK_PAGEDOWN          WXK_NEXT
-#endif
-
 #ifdef __UNIX__
 #define stricmp  strcasecmp
 #define strnicmp strncasecmp
diff --git a/include/gestfich.h b/include/gestfich.h
index 2f8d0fdc05..a0a34c7dcf 100644
--- a/include/gestfich.h
+++ b/include/gestfich.h
@@ -10,6 +10,10 @@
 #define __INCLUDE__GESTFICH_H__ 1
 
 
+/* Forward class declarations. */
+class WinEDAListBox;
+
+
 wxString    GetEditorName(); // Return the prefered editor name
 
 /** Function OpenPDF
diff --git a/include/gr_basic.h b/include/gr_basic.h
index e73261b367..4ad423ffa4 100644
--- a/include/gr_basic.h
+++ b/include/gr_basic.h
@@ -11,6 +11,10 @@
 
 #include "colors.h"
 
+
+class EDA_Rect;
+
+
 /* Constantes utiles */
 
 #define GR_COPY             0
diff --git a/include/pcbstruct.h b/include/pcbstruct.h
index 77d2cd4550..89fcd3a533 100644
--- a/include/pcbstruct.h
+++ b/include/pcbstruct.h
@@ -6,6 +6,7 @@
 #define PCBSTRUCT_H
 
 #include "base_struct.h"
+#include "class_base_screen.h"
 #include "board_item_struct.h"
 
 // Definitions relatives aux libariries
diff --git a/include/sch_item_struct.h b/include/sch_item_struct.h
index 4128314ace..1fe77cdf9a 100644
--- a/include/sch_item_struct.h
+++ b/include/sch_item_struct.h
@@ -6,6 +6,8 @@
 #define SCH_ITEM_STRUCT_H
 
 
+class WinEDA_SchematicFrame;
+
 
 /**
  * Class SCH_ITEM
diff --git a/include/trigo.h b/include/trigo.h
index f8373398d0..d11c87dce9 100644
--- a/include/trigo.h
+++ b/include/trigo.h
@@ -1,1502 +1,52 @@
-	/****************************************************/
-	/*  TRIGO.H :  Tables de fonctions trigonometriques */
-	/*		utilisees dans les rotations d'axes 		*/
-	/****************************************************/
+/****************************************************/
+/*  TRIGO.H :  Tables de fonctions trigonometriques */
+/*      utilisees dans les rotations d'axes         */
+/****************************************************/
 
 #ifndef TRIGO_H
 #define TRIGO_H
 
 
 /* Prototype des fonctions de trigo.cpp */
-void RotatePoint(int *pX, int *pY, int angle);
-void RotatePoint(int *pX, int *pY, int cx, int cy, int angle);
-void RotatePoint(wxPoint* point, int angle );
-void RotatePoint(wxPoint *point, const wxPoint & centre, int angle);
-void RotatePoint(double *pX, double *pY, int angle);
-void RotatePoint(double *pX, double *pY, double cx, double cy, int angle);
-int ArcTangente(int dy, int dx);
-	/* Retourne l'arc tangente en 0.1 degres du vecteur de coord dx, dy
-			  entre -1800 et 1800
-			  Analogue a atan2 ( mais plus rapide pour les caculs si
-			  l'angle est souvent 0, -1800, ou +- 900  */
+void RotatePoint( int *pX, int *pY, int angle );
+void RotatePoint( int *pX, int *pY, int cx, int cy, int angle );
+void RotatePoint( wxPoint* point, int angle );
+void RotatePoint( wxPoint *point, const wxPoint & centre, int angle );
+void RotatePoint( double *pX, double *pY, int angle );
+void RotatePoint( double *pX, double *pY, double cx, double cy, int angle );
+int ArcTangente( int dy, int dx );
+/* Retourne l'arc tangente en 0.1 degres du vecteur de coord dx, dy
+   entre -1800 et 1800
+   Analogue a atan2 ( mais plus rapide pour les caculs si
+   l'angle est souvent 0, -1800, ou +- 900  */
 
 bool DistanceTest( int seuil, int dx, int dy, int spot_cX, int spot_cY );
 
 
-	/*******************/
-	/* Macro NEW_COORD */
-	/*******************/
+/*******************/
+/* Macro NEW_COORD */
+/*******************/
 
 /* Macro de calcul de novelles coordonnees par rotation d'axe
-			 coord :  xrot = y*sin + x*cos
-						 yrot = y*cos - x*sin
-			 soit :		 xrot = (y*tg + x)*cos
-						 yrot = (y - x*tg)*cos
+             coord :  xrot = y*sin + x*cos
+                         yrot = y*cos - x*sin
+             soit :      xrot = (y*tg + x)*cos
+                         yrot = (y - x*tg)*cos
 
-			les coeffs COS sont tabules en fct de tg sur 16 valeurs.
+            les coeffs COS sont tabules en fct de tg sur 16 valeurs.
 */
-#define NEW_COORD(x0,y0) \
-	do { \
-	int itmp ; \
-	itmp = x0 ; x0 = x0 + (int)( y0 * tg ) ;  y0 = y0 - (int)( itmp * tg ) ; \
-	x0 = (x0*cosinus) >> 8 ; y0 = (y0*cosinus) >> 8 ; \
-	} while(0);
+#define NEW_COORD( x0, y0 )                       \
+    do {                                          \
+        int itmp;                                 \
+        itmp = x0;                                \
+        x0 = x0 + (int)( y0 * tg );               \
+        y0 = y0 - (int)( itmp * tg );             \
+        x0 = ( x0 * cosinus ) >> 8;               \
+        y0 = ( y0 * cosinus ) >> 8;               \
+    } while( 0 );
 
 
-eda_global float fsinus[3600]
-#if defined MAIN
-	= {
-	0.0000000000,0.0017453284,0.0034906514,0.0052359638,
-	0.0069812603,0.0087265355,0.0104717841,0.0122170008,0.0139621803,
-	0.0157073173,0.0174524064,0.0191974424,0.0209424199,0.0226873336,
-	0.0244321782,0.0261769483,0.0279216387,0.0296662441,0.0314107591,
-	0.0331551784,0.0348994967,0.0366437087,0.0383878091,0.0401317925,
-	0.0418756537,0.0436193874,0.0453629881,0.0471064507,0.0488497698,
-	0.0505929401,0.0523359562,0.0540788130,0.0558215050,0.0575640270,
-	0.0593063736,0.0610485395,0.0627905195,0.0645323083,0.0662739004,
-	0.0680152907,0.0697564737,0.0714974443,0.0732381971,0.0749787268,
-	0.0767190281,0.0784590957,0.0801989243,0.0819385086,0.0836778433,
-	0.0854169231,0.0871557427,0.0888942969,0.0906325802,0.0923705874,
-	0.0941083133,0.0958457525,0.0975828998,0.0993197497,0.1010562972,
-	0.1027925368,0.1045284633,0.1062640713,0.1079993557,0.1097343111,
-	0.1114689322,0.1132032138,0.1149371505,0.1166707371,0.1184039683,
-	0.1201368388,0.1218693434,0.1236014767,0.1253332336,0.1270646086,
-	0.1287955966,0.1305261922,0.1322563903,0.1339861854,0.1357155724,
-	0.1374445460,0.1391731010,0.1409012319,0.1426289337,0.1443562010,
-	0.1460830286,0.1478094111,0.1495353434,0.1512608202,0.1529858363,
-	0.1547103863,0.1564344650,0.1581580673,0.1598811877,0.1616038211,
-	0.1633259622,0.1650476059,0.1667687467,0.1684893796,0.1702094992,
-	0.1719291003,0.1736481777,0.1753667261,0.1770847403,0.1788022151,
-	0.1805191453,0.1822355255,0.1839513506,0.1856666154,0.1873813146,
-	0.1890954430,0.1908089954,0.1925219665,0.1942343512,0.1959461442,
-	0.1976573404,0.1993679344,0.2010779211,0.2027872954,0.2044960518,
-	0.2062041854,0.2079116908,0.2096185629,0.2113247965,0.2130303863,
-	0.2147353272,0.2164396139,0.2181432414,0.2198462044,0.2215484976,
-	0.2232501160,0.2249510543,0.2266513074,0.2283508701,0.2300497372,
-	0.2317479035,0.2334453639,0.2351421131,0.2368381461,0.2385334576,
-	0.2402280425,0.2419218956,0.2436150118,0.2453073859,0.2469990127,
-	0.2486898872,0.2503800041,0.2520693582,0.2537579446,0.2554457579,
-	0.2571327932,0.2588190451,0.2605045086,0.2621891786,0.2638730500,
-	0.2655561175,0.2672383761,0.2689198206,0.2706004460,0.2722802470,
-	0.2739592187,0.2756373558,0.2773146533,0.2789911060,0.2806667089,
-	0.2823414568,0.2840153447,0.2856883674,0.2873605198,0.2890317969,
-	0.2907021936,0.2923717047,0.2940403252,0.2957080500,0.2973748741,
-	0.2990407923,0.3007057995,0.3023698908,0.3040330609,0.3056953050,
-	0.3073566178,0.3090169944,0.3106764296,0.3123349185,0.3139924560,
-	0.3156490369,0.3173046564,0.3189593093,0.3206129906,0.3222656952,
-	0.3239174182,0.3255681545,0.3272178990,0.3288666467,0.3305143927,
-	0.3321611319,0.3338068592,0.3354515698,0.3370952584,0.3387379202,
-	0.3403795502,0.3420201433,0.3436596946,0.3452981990,0.3469356516,
-	0.3485720473,0.3502073813,0.3518416484,0.3534748438,0.3551069624,
-	0.3567379993,0.3583679495,0.3599968081,0.3616245701,0.3632512305,
-	0.3648767843,0.3665012267,0.3681245527,0.3697467573,0.3713678356,
-	0.3729877826,0.3746065934,0.3762242631,0.3778407868,0.3794561595,
-	0.3810703764,0.3826834324,0.3842953227,0.3859060423,0.3875155865,
-	0.3891239501,0.3907311285,0.3923371166,0.3939419096,0.3955455026,
-	0.3971478906,0.3987490689,0.4003490326,0.4019477767,0.4035452964,
-	0.4051415868,0.4067366431,0.4083304604,0.4099230338,0.4115143586,
-	0.4131044298,0.4146932427,0.4162807923,0.4178670738,0.4194520824,
-	0.4210358134,0.4226182617,0.4241994227,0.4257792916,0.4273578634,
-	0.4289351334,0.4305110968,0.4320857488,0.4336590846,0.4352310994,
-	0.4368017884,0.4383711468,0.4399391699,0.4415058528,0.4430711908,
-	0.4446351792,0.4461978131,0.4477590878,0.4493189986,0.4508775407,
-	0.4524347093,0.4539904997,0.4555449072,0.4570979271,0.4586495545,
-	0.4601997848,0.4617486132,0.4632960351,0.4648420457,0.4663866403,
-	0.4679298143,0.4694715628,0.4710118812,0.4725507649,0.4740882090,
-	0.4756242091,0.4771587603,0.4786918579,0.4802234974,0.4817536741,
-	0.4832823833,0.4848096202,0.4863353804,0.4878596591,0.4893824517,
-	0.4909037536,0.4924235601,0.4939418666,0.4954586684,0.4969739610,
-	0.4984877398,0.5000000000,0.5015107372,0.5030199466,0.5045276238,
-	0.5060337641,0.5075383630,0.5090414158,0.5105429179,0.5120428649,
-	0.5135412521,0.5150380749,0.5165333289,0.5180270094,0.5195191119,
-	0.5210096318,0.5224985647,0.5239859060,0.5254716511,0.5269557955,
-	0.5284383347,0.5299192642,0.5313985795,0.5328762761,0.5343523494,
-	0.5358267950,0.5372996083,0.5387707850,0.5402403205,0.5417082103,
-	0.5431744500,0.5446390350,0.5461019610,0.5475632235,0.5490228180,
-	0.5504807401,0.5519369853,0.5533915492,0.5548444274,0.5562956155,
-	0.5577451090,0.5591929035,0.5606389946,0.5620833779,0.5635260489,
-	0.5649670034,0.5664062369,0.5678437451,0.5692795234,0.5707135677,
-	0.5721458734,0.5735764364,0.5750052520,0.5764323162,0.5778576244,
-	0.5792811723,0.5807029557,0.5821229702,0.5835412114,0.5849576750,
-	0.5863723567,0.5877852523,0.5891963574,0.5906056676,0.5920131788,
-	0.5934188866,0.5948227868,0.5962248750,0.5976251470,0.5990235985,
-	0.6004202253,0.6018150232,0.6032079877,0.6045991149,0.6059884003,
-	0.6073758397,0.6087614290,0.6101451639,0.6115270402,0.6129070537,
-	0.6142852001,0.6156614753,0.6170358751,0.6184083954,0.6197790318,
-	0.6211477803,0.6225146366,0.6238795967,0.6252426563,0.6266038114,
-	0.6279630576,0.6293203910,0.6306758074,0.6320293027,0.6333808726,
-	0.6347305132,0.6360782203,0.6374239897,0.6387678175,0.6401096995,
-	0.6414496316,0.6427876097,0.6441236298,0.6454576877,0.6467897795,
-	0.6481199011,0.6494480483,0.6507742173,0.6520984038,0.6534206040,
-	0.6547408137,0.6560590290,0.6573752458,0.6586894601,0.6600016680,
-	0.6613118653,0.6626200482,0.6639262127,0.6652303547,0.6665324702,
-	0.6678325555,0.6691306064,0.6704266190,0.6717205893,0.6730125135,
-	0.6743023876,0.6755902076,0.6768759697,0.6781596699,0.6794413043,
-	0.6807208690,0.6819983601,0.6832737737,0.6845471059,0.6858183529,
-	0.6870875108,0.6883545757,0.6896195437,0.6908824111,0.6921431739,
-	0.6934018283,0.6946583705,0.6959127966,0.6971651029,0.6984152854,
-	0.6996633405,0.7009092643,0.7021530530,0.7033947028,0.7046342100,
-	0.7058715707,0.7071067812,0.7083398377,0.7095707365,0.7107994739,
-	0.7120260460,0.7132504492,0.7144726796,0.7156927337,0.7169106077,
-	0.7181262978,0.7193398003,0.7205511117,0.7217602281,0.7229671459,
-	0.7241718614,0.7253743710,0.7265746710,0.7277727577,0.7289686274,
-	0.7301622766,0.7313537016,0.7325428988,0.7337298645,0.7349145951,
-	0.7360970871,0.7372773368,0.7384553406,0.7396310950,0.7408045963,
-	0.7419758410,0.7431448255,0.7443115462,0.7454759997,0.7466381823,
-	0.7477980905,0.7489557208,0.7501110696,0.7512641335,0.7524149089,
-	0.7535633923,0.7547095802,0.7558534692,0.7569950557,0.7581343362,
-	0.7592713073,0.7604059656,0.7615383075,0.7626683297,0.7637960286,
-	0.7649214009,0.7660444431,0.7671651518,0.7682835236,0.7693995550,
-	0.7705132428,0.7716245834,0.7727335735,0.7738402097,0.7749444887,
-	0.7760464071,0.7771459615,0.7782431485,0.7793379649,0.7804304073,
-	0.7815204724,0.7826081569,0.7836934573,0.7847763705,0.7858568932,
-	0.7869350220,0.7880107536,0.7890840848,0.7901550124,0.7912235330,
-	0.7922896434,0.7933533403,0.7944146205,0.7954734809,0.7965299180,
-	0.7975839288,0.7986355100,0.7996846585,0.8007313709,0.8017756442,
-	0.8028174752,0.8038568606,0.8048937974,0.8059282822,0.8069603121,
-	0.8079898839,0.8090169944,0.8100416404,0.8110638190,0.8120835269,
-	0.8131007610,0.8141155184,0.8151277957,0.8161375901,0.8171448983,
-	0.8181497174,0.8191520443,0.8201518759,0.8211492091,0.8221440410,
-	0.8231363685,0.8241261886,0.8251134983,0.8260982945,0.8270805743,
-	0.8280603346,0.8290375726,0.8300122851,0.8309844693,0.8319541221,
-	0.8329212407,0.8338858221,0.8348478633,0.8358073614,0.8367643135,
-	0.8377187166,0.8386705679,0.8396198645,0.8405666035,0.8415107819,
-	0.8424523970,0.8433914458,0.8443279255,0.8452618332,0.8461931661,
-	0.8471219214,0.8480480962,0.8489716876,0.8498926930,0.8508111094,
-	0.8517269341,0.8526401644,0.8535507973,0.8544588301,0.8553642602,
-	0.8562670846,0.8571673007,0.8580649057,0.8589598969,0.8598522716,
-	0.8607420270,0.8616291604,0.8625136692,0.8633955506,0.8642748020,
-	0.8651514206,0.8660254038,0.8668967489,0.8677654534,0.8686315144,
-	0.8694949295,0.8703556959,0.8712138111,0.8720692724,0.8729220773,
-	0.8737722230,0.8746197071,0.8754645270,0.8763066800,0.8771461637,
-	0.8779829754,0.8788171127,0.8796485729,0.8804773535,0.8813034521,
-	0.8821268660,0.8829475929,0.8837656301,0.8845809752,0.8853936258,
-	0.8862035792,0.8870108332,0.8878153851,0.8886172327,0.8894163733,
-	0.8902128046,0.8910065242,0.8917975296,0.8925858185,0.8933713883,
-	0.8941542368,0.8949343616,0.8957117602,0.8964864304,0.8972583697,
-	0.8980275758,0.8987940463,0.8995577790,0.9003187714,0.9010770213,
-	0.9018325264,0.9025852843,0.9033352929,0.9040825497,0.9048270525,
-	0.9055687990,0.9063077870,0.9070440143,0.9077774785,0.9085081775,
-	0.9092361090,0.9099612709,0.9106836608,0.9114032766,0.9121201162,
-	0.9128341772,0.9135454576,0.9142539552,0.9149596678,0.9156625933,
-	0.9163627296,0.9170600744,0.9177546257,0.9184463813,0.9191353393,
-	0.9198214973,0.9205048535,0.9211854056,0.9218631516,0.9225380895,
-	0.9232102171,0.9238795325,0.9245460336,0.9252097184,0.9258705848,
-	0.9265286309,0.9271838546,0.9278362539,0.9284858269,0.9291325715,
-	0.9297764859,0.9304175680,0.9310558159,0.9316912276,0.9323238012,
-	0.9329535348,0.9335804265,0.9342044743,0.9348256764,0.9354440308,
-	0.9360595357,0.9366721892,0.9372819895,0.9378889346,0.9384930228,
-	0.9390942521,0.9396926208,0.9402881270,0.9408807690,0.9414705448,
-	0.9420574528,0.9426414911,0.9432226579,0.9438009516,0.9443763702,
-	0.9449489122,0.9455185756,0.9460853588,0.9466492601,0.9472102777,
-	0.9477684100,0.9483236552,0.9488760116,0.9494254776,0.9499720515,
-	0.9505157316,0.9510565163,0.9515944039,0.9521293927,0.9526614813,
-	0.9531906678,0.9537169507,0.9542403285,0.9547607995,0.9552783621,
-	0.9557930148,0.9563047560,0.9568135841,0.9573194975,0.9578224948,
-	0.9583225745,0.9588197349,0.9593139745,0.9598052920,0.9602936857,
-	0.9607791542,0.9612616959,0.9617413095,0.9622179935,0.9626917464,
-	0.9631625668,0.9636304532,0.9640954042,0.9645574185,0.9650164945,
-	0.9654726309,0.9659258263,0.9663760793,0.9668233886,0.9672677528,
-	0.9677091705,0.9681476404,0.9685831611,0.9690157314,0.9694453499,
-	0.9698720153,0.9702957263,0.9707164816,0.9711342799,0.9715491200,
-	0.9719610006,0.9723699204,0.9727758782,0.9731788728,0.9735789029,
-	0.9739759673,0.9743700648,0.9747611942,0.9751493543,0.9755345439,
-	0.9759167619,0.9762960071,0.9766722783,0.9770455744,0.9774158943,
-	0.9777832368,0.9781476007,0.9785089851,0.9788673888,0.9792228106,
-	0.9795752496,0.9799247046,0.9802711746,0.9806146585,0.9809551553,
-	0.9812926640,0.9816271834,0.9819587127,0.9822872507,0.9826127965,
-	0.9829353491,0.9832549076,0.9835714708,0.9838850379,0.9841956080,
-	0.9845031800,0.9848077530,0.9851093262,0.9854078985,0.9857034691,
-	0.9859960371,0.9862856015,0.9865721616,0.9868557164,0.9871362651,
-	0.9874138068,0.9876883406,0.9879598658,0.9882283814,0.9884938868,
-	0.9887563810,0.9890158634,0.9892723330,0.9895257891,0.9897762309,
-	0.9900236577,0.9902680687,0.9905094632,0.9907478405,0.9909831997,
-	0.9912155403,0.9914448614,0.9916711624,0.9918944426,0.9921147013,
-	0.9923319379,0.9925461516,0.9927573419,0.9929655081,0.9931706495,
-	0.9933727656,0.9935718557,0.9937679192,0.9939609555,0.9941509640,
-	0.9943379441,0.9945218954,0.9947028171,0.9948807088,0.9950555700,
-	0.9952274000,0.9953961984,0.9955619646,0.9957246982,0.9958843986,
-	0.9960410654,0.9961946981,0.9963452962,0.9964928592,0.9966373868,
-	0.9967788785,0.9969173337,0.9970527522,0.9971851335,0.9973144772,
-	0.9974407829,0.9975640503,0.9976842788,0.9978014683,0.9979156183,
-	0.9980267284,0.9981347984,0.9982398279,0.9983418166,0.9984407642,
-	0.9985366703,0.9986295348,0.9987193572,0.9988061373,0.9988898750,
-	0.9989705698,0.9990482216,0.9991228301,0.9991943951,0.9992629164,
-	0.9993283938,0.9993908270,0.9994502159,0.9995065604,0.9995598601,
-	0.9996101150,0.9996573250,0.9997014898,0.9997426093,0.9997806835,
-	0.9998157121,0.9998476952,0.9998766325,0.9999025240,0.9999253697,
-	0.9999451694,0.9999619231,0.9999756307,0.9999862922,0.9999939077,
-	0.9999984769,1.0000000000,0.9999984769,0.9999939077,0.9999862922,
-	0.9999756307,0.9999619231,0.9999451694,0.9999253697,0.9999025240,
-	0.9998766325,0.9998476952,0.9998157121,0.9997806835,0.9997426093,
-	0.9997014898,0.9996573250,0.9996101150,0.9995598601,0.9995065604,
-	0.9994502159,0.9993908270,0.9993283938,0.9992629164,0.9991943951,
-	0.9991228301,0.9990482216,0.9989705698,0.9988898750,0.9988061373,
-	0.9987193572,0.9986295348,0.9985366703,0.9984407642,0.9983418166,
-	0.9982398279,0.9981347984,0.9980267284,0.9979156183,0.9978014683,
-	0.9976842788,0.9975640503,0.9974407829,0.9973144772,0.9971851335,
-	0.9970527522,0.9969173337,0.9967788785,0.9966373868,0.9964928592,
-	0.9963452962,0.9961946981,0.9960410654,0.9958843986,0.9957246982,
-	0.9955619646,0.9953961984,0.9952274000,0.9950555700,0.9948807088,
-	0.9947028171,0.9945218954,0.9943379441,0.9941509640,0.9939609555,
-	0.9937679192,0.9935718557,0.9933727656,0.9931706495,0.9929655081,
-	0.9927573419,0.9925461516,0.9923319379,0.9921147013,0.9918944426,
-	0.9916711624,0.9914448614,0.9912155403,0.9909831997,0.9907478405,
-	0.9905094632,0.9902680687,0.9900236577,0.9897762309,0.9895257891,
-	0.9892723330,0.9890158634,0.9887563810,0.9884938868,0.9882283814,
-	0.9879598658,0.9876883406,0.9874138068,0.9871362651,0.9868557164,
-	0.9865721616,0.9862856015,0.9859960371,0.9857034691,0.9854078985,
-	0.9851093262,0.9848077530,0.9845031800,0.9841956080,0.9838850379,
-	0.9835714708,0.9832549076,0.9829353491,0.9826127965,0.9822872507,
-	0.9819587127,0.9816271834,0.9812926640,0.9809551553,0.9806146585,
-	0.9802711746,0.9799247046,0.9795752496,0.9792228106,0.9788673888,
-	0.9785089851,0.9781476007,0.9777832368,0.9774158943,0.9770455744,
-	0.9766722783,0.9762960071,0.9759167619,0.9755345439,0.9751493543,
-	0.9747611942,0.9743700648,0.9739759673,0.9735789029,0.9731788728,
-	0.9727758782,0.9723699204,0.9719610006,0.9715491200,0.9711342799,
-	0.9707164816,0.9702957263,0.9698720153,0.9694453499,0.9690157314,
-	0.9685831611,0.9681476404,0.9677091705,0.9672677528,0.9668233886,
-	0.9663760793,0.9659258263,0.9654726309,0.9650164945,0.9645574185,
-	0.9640954042,0.9636304532,0.9631625668,0.9626917464,0.9622179935,
-	0.9617413095,0.9612616959,0.9607791542,0.9602936857,0.9598052920,
-	0.9593139745,0.9588197349,0.9583225745,0.9578224948,0.9573194975,
-	0.9568135841,0.9563047560,0.9557930148,0.9552783621,0.9547607995,
-	0.9542403285,0.9537169507,0.9531906678,0.9526614813,0.9521293927,
-	0.9515944039,0.9510565163,0.9505157316,0.9499720515,0.9494254776,
-	0.9488760116,0.9483236552,0.9477684100,0.9472102777,0.9466492601,
-	0.9460853588,0.9455185756,0.9449489122,0.9443763702,0.9438009516,
-	0.9432226579,0.9426414911,0.9420574528,0.9414705448,0.9408807690,
-	0.9402881270,0.9396926208,0.9390942521,0.9384930228,0.9378889346,
-	0.9372819895,0.9366721892,0.9360595357,0.9354440308,0.9348256764,
-	0.9342044743,0.9335804265,0.9329535348,0.9323238012,0.9316912276,
-	0.9310558159,0.9304175680,0.9297764859,0.9291325715,0.9284858269,
-	0.9278362539,0.9271838546,0.9265286309,0.9258705848,0.9252097184,
-	0.9245460336,0.9238795325,0.9232102171,0.9225380895,0.9218631516,
-	0.9211854056,0.9205048535,0.9198214973,0.9191353393,0.9184463813,
-	0.9177546257,0.9170600744,0.9163627296,0.9156625933,0.9149596678,
-	0.9142539552,0.9135454576,0.9128341772,0.9121201162,0.9114032766,
-	0.9106836608,0.9099612709,0.9092361090,0.9085081775,0.9077774785,
-	0.9070440143,0.9063077870,0.9055687990,0.9048270525,0.9040825497,
-	0.9033352929,0.9025852843,0.9018325264,0.9010770213,0.9003187714,
-	0.8995577790,0.8987940463,0.8980275758,0.8972583697,0.8964864304,
-	0.8957117602,0.8949343616,0.8941542368,0.8933713883,0.8925858185,
-	0.8917975296,0.8910065242,0.8902128046,0.8894163733,0.8886172327,
-	0.8878153851,0.8870108332,0.8862035792,0.8853936258,0.8845809752,
-	0.8837656301,0.8829475929,0.8821268660,0.8813034521,0.8804773535,
-	0.8796485729,0.8788171127,0.8779829754,0.8771461637,0.8763066800,
-	0.8754645270,0.8746197071,0.8737722230,0.8729220773,0.8720692724,
-	0.8712138111,0.8703556959,0.8694949295,0.8686315144,0.8677654534,
-	0.8668967489,0.8660254038,0.8651514206,0.8642748020,0.8633955506,
-	0.8625136692,0.8616291604,0.8607420270,0.8598522716,0.8589598969,
-	0.8580649057,0.8571673007,0.8562670846,0.8553642602,0.8544588301,
-	0.8535507973,0.8526401644,0.8517269341,0.8508111094,0.8498926930,
-	0.8489716876,0.8480480962,0.8471219214,0.8461931661,0.8452618332,
-	0.8443279255,0.8433914458,0.8424523970,0.8415107819,0.8405666035,
-	0.8396198645,0.8386705679,0.8377187166,0.8367643135,0.8358073614,
-	0.8348478633,0.8338858221,0.8329212407,0.8319541221,0.8309844693,
-	0.8300122851,0.8290375726,0.8280603346,0.8270805743,0.8260982945,
-	0.8251134983,0.8241261886,0.8231363685,0.8221440410,0.8211492091,
-	0.8201518759,0.8191520443,0.8181497174,0.8171448983,0.8161375901,
-	0.8151277957,0.8141155184,0.8131007610,0.8120835269,0.8110638190,
-	0.8100416404,0.8090169944,0.8079898839,0.8069603121,0.8059282822,
-	0.8048937974,0.8038568606,0.8028174752,0.8017756442,0.8007313709,
-	0.7996846585,0.7986355100,0.7975839288,0.7965299180,0.7954734809,
-	0.7944146205,0.7933533403,0.7922896434,0.7912235330,0.7901550124,
-	0.7890840848,0.7880107536,0.7869350220,0.7858568932,0.7847763705,
-	0.7836934573,0.7826081569,0.7815204724,0.7804304073,0.7793379649,
-	0.7782431485,0.7771459615,0.7760464071,0.7749444887,0.7738402097,
-	0.7727335735,0.7716245834,0.7705132428,0.7693995550,0.7682835236,
-	0.7671651518,0.7660444431,0.7649214009,0.7637960286,0.7626683297,
-	0.7615383075,0.7604059656,0.7592713073,0.7581343362,0.7569950557,
-	0.7558534692,0.7547095802,0.7535633923,0.7524149089,0.7512641335,
-	0.7501110696,0.7489557208,0.7477980905,0.7466381823,0.7454759997,
-	0.7443115462,0.7431448255,0.7419758410,0.7408045963,0.7396310950,
-	0.7384553406,0.7372773368,0.7360970871,0.7349145951,0.7337298645,
-	0.7325428988,0.7313537016,0.7301622766,0.7289686274,0.7277727577,
-	0.7265746710,0.7253743710,0.7241718614,0.7229671459,0.7217602281,
-	0.7205511117,0.7193398003,0.7181262978,0.7169106077,0.7156927337,
-	0.7144726796,0.7132504492,0.7120260460,0.7107994739,0.7095707365,
-	0.7083398377,0.7071067812,0.7058715707,0.7046342100,0.7033947028,
-	0.7021530530,0.7009092643,0.6996633405,0.6984152854,0.6971651029,
-	0.6959127966,0.6946583705,0.6934018283,0.6921431739,0.6908824111,
-	0.6896195437,0.6883545757,0.6870875108,0.6858183529,0.6845471059,
-	0.6832737737,0.6819983601,0.6807208690,0.6794413043,0.6781596699,
-	0.6768759697,0.6755902076,0.6743023876,0.6730125135,0.6717205893,
-	0.6704266190,0.6691306064,0.6678325555,0.6665324702,0.6652303547,
-	0.6639262127,0.6626200482,0.6613118653,0.6600016680,0.6586894601,
-	0.6573752458,0.6560590290,0.6547408137,0.6534206040,0.6520984038,
-	0.6507742173,0.6494480483,0.6481199011,0.6467897795,0.6454576877,
-	0.6441236298,0.6427876097,0.6414496316,0.6401096995,0.6387678175,
-	0.6374239897,0.6360782203,0.6347305132,0.6333808726,0.6320293027,
-	0.6306758074,0.6293203910,0.6279630576,0.6266038114,0.6252426563,
-	0.6238795967,0.6225146366,0.6211477803,0.6197790318,0.6184083954,
-	0.6170358751,0.6156614753,0.6142852001,0.6129070537,0.6115270402,
-	0.6101451639,0.6087614290,0.6073758397,0.6059884003,0.6045991149,
-	0.6032079877,0.6018150232,0.6004202253,0.5990235985,0.5976251470,
-	0.5962248750,0.5948227868,0.5934188866,0.5920131788,0.5906056676,
-	0.5891963574,0.5877852523,0.5863723567,0.5849576750,0.5835412114,
-	0.5821229702,0.5807029557,0.5792811723,0.5778576244,0.5764323162,
-	0.5750052520,0.5735764364,0.5721458734,0.5707135677,0.5692795234,
-	0.5678437451,0.5664062369,0.5649670034,0.5635260489,0.5620833779,
-	0.5606389946,0.5591929035,0.5577451090,0.5562956155,0.5548444274,
-	0.5533915492,0.5519369853,0.5504807401,0.5490228180,0.5475632235,
-	0.5461019610,0.5446390350,0.5431744500,0.5417082103,0.5402403205,
-	0.5387707850,0.5372996083,0.5358267950,0.5343523494,0.5328762761,
-	0.5313985795,0.5299192642,0.5284383347,0.5269557955,0.5254716511,
-	0.5239859060,0.5224985647,0.5210096318,0.5195191119,0.5180270094,
-	0.5165333289,0.5150380749,0.5135412521,0.5120428649,0.5105429179,
-	0.5090414158,0.5075383630,0.5060337641,0.5045276238,0.5030199466,
-	0.5015107372,0.5000000000,0.4984877398,0.4969739610,0.4954586684,
-	0.4939418666,0.4924235601,0.4909037536,0.4893824517,0.4878596591,
-	0.4863353804,0.4848096202,0.4832823833,0.4817536741,0.4802234974,
-	0.4786918579,0.4771587603,0.4756242091,0.4740882090,0.4725507649,
-	0.4710118812,0.4694715628,0.4679298143,0.4663866403,0.4648420457,
-	0.4632960351,0.4617486132,0.4601997848,0.4586495545,0.4570979271,
-	0.4555449072,0.4539904997,0.4524347093,0.4508775407,0.4493189986,
-	0.4477590878,0.4461978131,0.4446351792,0.4430711908,0.4415058528,
-	0.4399391699,0.4383711468,0.4368017884,0.4352310994,0.4336590846,
-	0.4320857488,0.4305110968,0.4289351334,0.4273578634,0.4257792916,
-	0.4241994227,0.4226182617,0.4210358134,0.4194520824,0.4178670738,
-	0.4162807923,0.4146932427,0.4131044298,0.4115143586,0.4099230338,
-	0.4083304604,0.4067366431,0.4051415868,0.4035452964,0.4019477767,
-	0.4003490326,0.3987490689,0.3971478906,0.3955455026,0.3939419096,
-	0.3923371166,0.3907311285,0.3891239501,0.3875155865,0.3859060423,
-	0.3842953227,0.3826834324,0.3810703764,0.3794561595,0.3778407868,
-	0.3762242631,0.3746065934,0.3729877826,0.3713678356,0.3697467573,
-	0.3681245527,0.3665012267,0.3648767843,0.3632512305,0.3616245701,
-	0.3599968081,0.3583679495,0.3567379993,0.3551069624,0.3534748438,
-	0.3518416484,0.3502073813,0.3485720473,0.3469356516,0.3452981990,
-	0.3436596946,0.3420201433,0.3403795502,0.3387379202,0.3370952584,
-	0.3354515698,0.3338068592,0.3321611319,0.3305143927,0.3288666467,
-	0.3272178990,0.3255681545,0.3239174182,0.3222656952,0.3206129906,
-	0.3189593093,0.3173046564,0.3156490369,0.3139924560,0.3123349185,
-	0.3106764296,0.3090169944,0.3073566178,0.3056953050,0.3040330609,
-	0.3023698908,0.3007057995,0.2990407923,0.2973748741,0.2957080500,
-	0.2940403252,0.2923717047,0.2907021936,0.2890317969,0.2873605198,
-	0.2856883674,0.2840153447,0.2823414568,0.2806667089,0.2789911060,
-	0.2773146533,0.2756373558,0.2739592187,0.2722802470,0.2706004460,
-	0.2689198206,0.2672383761,0.2655561175,0.2638730500,0.2621891786,
-	0.2605045086,0.2588190451,0.2571327932,0.2554457579,0.2537579446,
-	0.2520693582,0.2503800041,0.2486898872,0.2469990127,0.2453073859,
-	0.2436150118,0.2419218956,0.2402280425,0.2385334576,0.2368381461,
-	0.2351421131,0.2334453639,0.2317479035,0.2300497372,0.2283508701,
-	0.2266513074,0.2249510543,0.2232501160,0.2215484976,0.2198462044,
-	0.2181432414,0.2164396139,0.2147353272,0.2130303863,0.2113247965,
-	0.2096185629,0.2079116908,0.2062041854,0.2044960518,0.2027872954,
-	0.2010779211,0.1993679344,0.1976573404,0.1959461442,0.1942343512,
-	0.1925219665,0.1908089954,0.1890954430,0.1873813146,0.1856666154,
-	0.1839513506,0.1822355255,0.1805191453,0.1788022151,0.1770847403,
-	0.1753667261,0.1736481777,0.1719291003,0.1702094992,0.1684893796,
-	0.1667687467,0.1650476059,0.1633259622,0.1616038211,0.1598811877,
-	0.1581580673,0.1564344650,0.1547103863,0.1529858363,0.1512608202,
-	0.1495353434,0.1478094111,0.1460830286,0.1443562010,0.1426289337,
-	0.1409012319,0.1391731010,0.1374445460,0.1357155724,0.1339861854,
-	0.1322563903,0.1305261922,0.1287955966,0.1270646086,0.1253332336,
-	0.1236014767,0.1218693434,0.1201368388,0.1184039683,0.1166707371,
-	0.1149371505,0.1132032138,0.1114689322,0.1097343111,0.1079993557,
-	0.1062640713,0.1045284633,0.1027925368,0.1010562972,0.0993197497,
-	0.0975828998,0.0958457525,0.0941083133,0.0923705874,0.0906325802,
-	0.0888942969,0.0871557427,0.0854169231,0.0836778433,0.0819385086,
-	0.0801989243,0.0784590957,0.0767190281,0.0749787268,0.0732381971,
-	0.0714974443,0.0697564737,0.0680152907,0.0662739004,0.0645323083,
-	0.0627905195,0.0610485395,0.0593063736,0.0575640270,0.0558215050,
-	0.0540788130,0.0523359562,0.0505929401,0.0488497698,0.0471064507,
-	0.0453629881,0.0436193874,0.0418756537,0.0401317925,0.0383878091,
-	0.0366437087,0.0348994967,0.0331551784,0.0314107591,0.0296662441,
-	0.0279216387,0.0261769483,0.0244321782,0.0226873336,0.0209424199,
-	0.0191974424,0.0174524064,0.0157073173,0.0139621803,0.0122170008,
-	0.0104717841,0.0087265355,0.0069812603,0.0052359638,0.0034906514,
-	0.0017453284,0.0000000000,-0.0017453284,-0.0034906514,-0.0052359638,
-	-0.0069812603,-0.0087265355,-0.0104717841,-0.0122170008,-0.0139621803,
-	-0.0157073173,-0.0174524064,-0.0191974424,-0.0209424199,-0.0226873336,
-	-0.0244321782,-0.0261769483,-0.0279216387,-0.0296662441,-0.0314107591,
-	-0.0331551784,-0.0348994967,-0.0366437087,-0.0383878091,-0.0401317925,
-	-0.0418756537,-0.0436193874,-0.0453629881,-0.0471064507,-0.0488497698,
-	-0.0505929401,-0.0523359562,-0.0540788130,-0.0558215050,-0.0575640270,
-	-0.0593063736,-0.0610485395,-0.0627905195,-0.0645323083,-0.0662739004,
-	-0.0680152907,-0.0697564737,-0.0714974443,-0.0732381971,-0.0749787268,
-	-0.0767190281,-0.0784590957,-0.0801989243,-0.0819385086,-0.0836778433,
-	-0.0854169231,-0.0871557427,-0.0888942969,-0.0906325802,-0.0923705874,
-	-0.0941083133,-0.0958457525,-0.0975828998,-0.0993197497,-0.1010562972,
-	-0.1027925368,-0.1045284633,-0.1062640713,-0.1079993557,-0.1097343111,
-	-0.1114689322,-0.1132032138,-0.1149371505,-0.1166707371,-0.1184039683,
-	-0.1201368388,-0.1218693434,-0.1236014767,-0.1253332336,-0.1270646086,
-	-0.1287955966,-0.1305261922,-0.1322563903,-0.1339861854,-0.1357155724,
-	-0.1374445460,-0.1391731010,-0.1409012319,-0.1426289337,-0.1443562010,
-	-0.1460830286,-0.1478094111,-0.1495353434,-0.1512608202,-0.1529858363,
-	-0.1547103863,-0.1564344650,-0.1581580673,-0.1598811877,-0.1616038211,
-	-0.1633259622,-0.1650476059,-0.1667687467,-0.1684893796,-0.1702094992,
-	-0.1719291003,-0.1736481777,-0.1753667261,-0.1770847403,-0.1788022151,
-	-0.1805191453,-0.1822355255,-0.1839513506,-0.1856666154,-0.1873813146,
-	-0.1890954430,-0.1908089954,-0.1925219665,-0.1942343512,-0.1959461442,
-	-0.1976573404,-0.1993679344,-0.2010779211,-0.2027872954,-0.2044960518,
-	-0.2062041854,-0.2079116908,-0.2096185629,-0.2113247965,-0.2130303863,
-	-0.2147353272,-0.2164396139,-0.2181432414,-0.2198462044,-0.2215484976,
-	-0.2232501160,-0.2249510543,-0.2266513074,-0.2283508701,-0.2300497372,
-	-0.2317479035,-0.2334453639,-0.2351421131,-0.2368381461,-0.2385334576,
-	-0.2402280425,-0.2419218956,-0.2436150118,-0.2453073859,-0.2469990127,
-	-0.2486898872,-0.2503800041,-0.2520693582,-0.2537579446,-0.2554457579,
-	-0.2571327932,-0.2588190451,-0.2605045086,-0.2621891786,-0.2638730500,
-	-0.2655561175,-0.2672383761,-0.2689198206,-0.2706004460,-0.2722802470,
-	-0.2739592187,-0.2756373558,-0.2773146533,-0.2789911060,-0.2806667089,
-	-0.2823414568,-0.2840153447,-0.2856883674,-0.2873605198,-0.2890317969,
-	-0.2907021936,-0.2923717047,-0.2940403252,-0.2957080500,-0.2973748741,
-	-0.2990407923,-0.3007057995,-0.3023698908,-0.3040330609,-0.3056953050,
-	-0.3073566178,-0.3090169944,-0.3106764296,-0.3123349185,-0.3139924560,
-	-0.3156490369,-0.3173046564,-0.3189593093,-0.3206129906,-0.3222656952,
-	-0.3239174182,-0.3255681545,-0.3272178990,-0.3288666467,-0.3305143927,
-	-0.3321611319,-0.3338068592,-0.3354515698,-0.3370952584,-0.3387379202,
-	-0.3403795502,-0.3420201433,-0.3436596946,-0.3452981990,-0.3469356516,
-	-0.3485720473,-0.3502073813,-0.3518416484,-0.3534748438,-0.3551069624,
-	-0.3567379993,-0.3583679495,-0.3599968081,-0.3616245701,-0.3632512305,
-	-0.3648767843,-0.3665012267,-0.3681245527,-0.3697467573,-0.3713678356,
-	-0.3729877826,-0.3746065934,-0.3762242631,-0.3778407868,-0.3794561595,
-	-0.3810703764,-0.3826834324,-0.3842953227,-0.3859060423,-0.3875155865,
-	-0.3891239501,-0.3907311285,-0.3923371166,-0.3939419096,-0.3955455026,
-	-0.3971478906,-0.3987490689,-0.4003490326,-0.4019477767,-0.4035452964,
-	-0.4051415868,-0.4067366431,-0.4083304604,-0.4099230338,-0.4115143586,
-	-0.4131044298,-0.4146932427,-0.4162807923,-0.4178670738,-0.4194520824,
-	-0.4210358134,-0.4226182617,-0.4241994227,-0.4257792916,-0.4273578634,
-	-0.4289351334,-0.4305110968,-0.4320857488,-0.4336590846,-0.4352310994,
-	-0.4368017884,-0.4383711468,-0.4399391699,-0.4415058528,-0.4430711908,
-	-0.4446351792,-0.4461978131,-0.4477590878,-0.4493189986,-0.4508775407,
-	-0.4524347093,-0.4539904997,-0.4555449072,-0.4570979271,-0.4586495545,
-	-0.4601997848,-0.4617486132,-0.4632960351,-0.4648420457,-0.4663866403,
-	-0.4679298143,-0.4694715628,-0.4710118812,-0.4725507649,-0.4740882090,
-	-0.4756242091,-0.4771587603,-0.4786918579,-0.4802234974,-0.4817536741,
-	-0.4832823833,-0.4848096202,-0.4863353804,-0.4878596591,-0.4893824517,
-	-0.4909037536,-0.4924235601,-0.4939418666,-0.4954586684,-0.4969739610,
-	-0.4984877398,-0.5000000000,-0.5015107372,-0.5030199466,-0.5045276238,
-	-0.5060337641,-0.5075383630,-0.5090414158,-0.5105429179,-0.5120428649,
-	-0.5135412521,-0.5150380749,-0.5165333289,-0.5180270094,-0.5195191119,
-	-0.5210096318,-0.5224985647,-0.5239859060,-0.5254716511,-0.5269557955,
-	-0.5284383347,-0.5299192642,-0.5313985795,-0.5328762761,-0.5343523494,
-	-0.5358267950,-0.5372996083,-0.5387707850,-0.5402403205,-0.5417082103,
-	-0.5431744500,-0.5446390350,-0.5461019610,-0.5475632235,-0.5490228180,
-	-0.5504807401,-0.5519369853,-0.5533915492,-0.5548444274,-0.5562956155,
-	-0.5577451090,-0.5591929035,-0.5606389946,-0.5620833779,-0.5635260489,
-	-0.5649670034,-0.5664062369,-0.5678437451,-0.5692795234,-0.5707135677,
-	-0.5721458734,-0.5735764364,-0.5750052520,-0.5764323162,-0.5778576244,
-	-0.5792811723,-0.5807029557,-0.5821229702,-0.5835412114,-0.5849576750,
-	-0.5863723567,-0.5877852523,-0.5891963574,-0.5906056676,-0.5920131788,
-	-0.5934188866,-0.5948227868,-0.5962248750,-0.5976251470,-0.5990235985,
-	-0.6004202253,-0.6018150232,-0.6032079877,-0.6045991149,-0.6059884003,
-	-0.6073758397,-0.6087614290,-0.6101451639,-0.6115270402,-0.6129070537,
-	-0.6142852001,-0.6156614753,-0.6170358751,-0.6184083954,-0.6197790318,
-	-0.6211477803,-0.6225146366,-0.6238795967,-0.6252426563,-0.6266038114,
-	-0.6279630576,-0.6293203910,-0.6306758074,-0.6320293027,-0.6333808726,
-	-0.6347305132,-0.6360782203,-0.6374239897,-0.6387678175,-0.6401096995,
-	-0.6414496316,-0.6427876097,-0.6441236298,-0.6454576877,-0.6467897795,
-	-0.6481199011,-0.6494480483,-0.6507742173,-0.6520984038,-0.6534206040,
-	-0.6547408137,-0.6560590290,-0.6573752458,-0.6586894601,-0.6600016680,
-	-0.6613118653,-0.6626200482,-0.6639262127,-0.6652303547,-0.6665324702,
-	-0.6678325555,-0.6691306064,-0.6704266190,-0.6717205893,-0.6730125135,
-	-0.6743023876,-0.6755902076,-0.6768759697,-0.6781596699,-0.6794413043,
-	-0.6807208690,-0.6819983601,-0.6832737737,-0.6845471059,-0.6858183529,
-	-0.6870875108,-0.6883545757,-0.6896195437,-0.6908824111,-0.6921431739,
-	-0.6934018283,-0.6946583705,-0.6959127966,-0.6971651029,-0.6984152854,
-	-0.6996633405,-0.7009092643,-0.7021530530,-0.7033947028,-0.7046342100,
-	-0.7058715707,-0.7071067812,-0.7083398377,-0.7095707365,-0.7107994739,
-	-0.7120260460,-0.7132504492,-0.7144726796,-0.7156927337,-0.7169106077,
-	-0.7181262978,-0.7193398003,-0.7205511117,-0.7217602281,-0.7229671459,
-	-0.7241718614,-0.7253743710,-0.7265746710,-0.7277727577,-0.7289686274,
-	-0.7301622766,-0.7313537016,-0.7325428988,-0.7337298645,-0.7349145951,
-	-0.7360970871,-0.7372773368,-0.7384553406,-0.7396310950,-0.7408045963,
-	-0.7419758410,-0.7431448255,-0.7443115462,-0.7454759997,-0.7466381823,
-	-0.7477980905,-0.7489557208,-0.7501110696,-0.7512641335,-0.7524149089,
-	-0.7535633923,-0.7547095802,-0.7558534692,-0.7569950557,-0.7581343362,
-	-0.7592713073,-0.7604059656,-0.7615383075,-0.7626683297,-0.7637960286,
-	-0.7649214009,-0.7660444431,-0.7671651518,-0.7682835236,-0.7693995550,
-	-0.7705132428,-0.7716245834,-0.7727335735,-0.7738402097,-0.7749444887,
-	-0.7760464071,-0.7771459615,-0.7782431485,-0.7793379649,-0.7804304073,
-	-0.7815204724,-0.7826081569,-0.7836934573,-0.7847763705,-0.7858568932,
-	-0.7869350220,-0.7880107536,-0.7890840848,-0.7901550124,-0.7912235330,
-	-0.7922896434,-0.7933533403,-0.7944146205,-0.7954734809,-0.7965299180,
-	-0.7975839288,-0.7986355100,-0.7996846585,-0.8007313709,-0.8017756442,
-	-0.8028174752,-0.8038568606,-0.8048937974,-0.8059282822,-0.8069603121,
-	-0.8079898839,-0.8090169944,-0.8100416404,-0.8110638190,-0.8120835269,
-	-0.8131007610,-0.8141155184,-0.8151277957,-0.8161375901,-0.8171448983,
-	-0.8181497174,-0.8191520443,-0.8201518759,-0.8211492091,-0.8221440410,
-	-0.8231363685,-0.8241261886,-0.8251134983,-0.8260982945,-0.8270805743,
-	-0.8280603346,-0.8290375726,-0.8300122851,-0.8309844693,-0.8319541221,
-	-0.8329212407,-0.8338858221,-0.8348478633,-0.8358073614,-0.8367643135,
-	-0.8377187166,-0.8386705679,-0.8396198645,-0.8405666035,-0.8415107819,
-	-0.8424523970,-0.8433914458,-0.8443279255,-0.8452618332,-0.8461931661,
-	-0.8471219214,-0.8480480962,-0.8489716876,-0.8498926930,-0.8508111094,
-	-0.8517269341,-0.8526401644,-0.8535507973,-0.8544588301,-0.8553642602,
-	-0.8562670846,-0.8571673007,-0.8580649057,-0.8589598969,-0.8598522716,
-	-0.8607420270,-0.8616291604,-0.8625136692,-0.8633955506,-0.8642748020,
-	-0.8651514206,-0.8660254038,-0.8668967489,-0.8677654534,-0.8686315144,
-	-0.8694949295,-0.8703556959,-0.8712138111,-0.8720692724,-0.8729220773,
-	-0.8737722230,-0.8746197071,-0.8754645270,-0.8763066800,-0.8771461637,
-	-0.8779829754,-0.8788171127,-0.8796485729,-0.8804773535,-0.8813034521,
-	-0.8821268660,-0.8829475929,-0.8837656301,-0.8845809752,-0.8853936258,
-	-0.8862035792,-0.8870108332,-0.8878153851,-0.8886172327,-0.8894163733,
-	-0.8902128046,-0.8910065242,-0.8917975296,-0.8925858185,-0.8933713883,
-	-0.8941542368,-0.8949343616,-0.8957117602,-0.8964864304,-0.8972583697,
-	-0.8980275758,-0.8987940463,-0.8995577790,-0.9003187714,-0.9010770213,
-	-0.9018325264,-0.9025852843,-0.9033352929,-0.9040825497,-0.9048270525,
-	-0.9055687990,-0.9063077870,-0.9070440143,-0.9077774785,-0.9085081775,
-	-0.9092361090,-0.9099612709,-0.9106836608,-0.9114032766,-0.9121201162,
-	-0.9128341772,-0.9135454576,-0.9142539552,-0.9149596678,-0.9156625933,
-	-0.9163627296,-0.9170600744,-0.9177546257,-0.9184463813,-0.9191353393,
-	-0.9198214973,-0.9205048535,-0.9211854056,-0.9218631516,-0.9225380895,
-	-0.9232102171,-0.9238795325,-0.9245460336,-0.9252097184,-0.9258705848,
-	-0.9265286309,-0.9271838546,-0.9278362539,-0.9284858269,-0.9291325715,
-	-0.9297764859,-0.9304175680,-0.9310558159,-0.9316912276,-0.9323238012,
-	-0.9329535348,-0.9335804265,-0.9342044743,-0.9348256764,-0.9354440308,
-	-0.9360595357,-0.9366721892,-0.9372819895,-0.9378889346,-0.9384930228,
-	-0.9390942521,-0.9396926208,-0.9402881270,-0.9408807690,-0.9414705448,
-	-0.9420574528,-0.9426414911,-0.9432226579,-0.9438009516,-0.9443763702,
-	-0.9449489122,-0.9455185756,-0.9460853588,-0.9466492601,-0.9472102777,
-	-0.9477684100,-0.9483236552,-0.9488760116,-0.9494254776,-0.9499720515,
-	-0.9505157316,-0.9510565163,-0.9515944039,-0.9521293927,-0.9526614813,
-	-0.9531906678,-0.9537169507,-0.9542403285,-0.9547607995,-0.9552783621,
-	-0.9557930148,-0.9563047560,-0.9568135841,-0.9573194975,-0.9578224948,
-	-0.9583225745,-0.9588197349,-0.9593139745,-0.9598052920,-0.9602936857,
-	-0.9607791542,-0.9612616959,-0.9617413095,-0.9622179935,-0.9626917464,
-	-0.9631625668,-0.9636304532,-0.9640954042,-0.9645574185,-0.9650164945,
-	-0.9654726309,-0.9659258263,-0.9663760793,-0.9668233886,-0.9672677528,
-	-0.9677091705,-0.9681476404,-0.9685831611,-0.9690157314,-0.9694453499,
-	-0.9698720153,-0.9702957263,-0.9707164816,-0.9711342799,-0.9715491200,
-	-0.9719610006,-0.9723699204,-0.9727758782,-0.9731788728,-0.9735789029,
-	-0.9739759673,-0.9743700648,-0.9747611942,-0.9751493543,-0.9755345439,
-	-0.9759167619,-0.9762960071,-0.9766722783,-0.9770455744,-0.9774158943,
-	-0.9777832368,-0.9781476007,-0.9785089851,-0.9788673888,-0.9792228106,
-	-0.9795752496,-0.9799247046,-0.9802711746,-0.9806146585,-0.9809551553,
-	-0.9812926640,-0.9816271834,-0.9819587127,-0.9822872507,-0.9826127965,
-	-0.9829353491,-0.9832549076,-0.9835714708,-0.9838850379,-0.9841956080,
-	-0.9845031800,-0.9848077530,-0.9851093262,-0.9854078985,-0.9857034691,
-	-0.9859960371,-0.9862856015,-0.9865721616,-0.9868557164,-0.9871362651,
-	-0.9874138068,-0.9876883406,-0.9879598658,-0.9882283814,-0.9884938868,
-	-0.9887563810,-0.9890158634,-0.9892723330,-0.9895257891,-0.9897762309,
-	-0.9900236577,-0.9902680687,-0.9905094632,-0.9907478405,-0.9909831997,
-	-0.9912155403,-0.9914448614,-0.9916711624,-0.9918944426,-0.9921147013,
-	-0.9923319379,-0.9925461516,-0.9927573419,-0.9929655081,-0.9931706495,
-	-0.9933727656,-0.9935718557,-0.9937679192,-0.9939609555,-0.9941509640,
-	-0.9943379441,-0.9945218954,-0.9947028171,-0.9948807088,-0.9950555700,
-	-0.9952274000,-0.9953961984,-0.9955619646,-0.9957246982,-0.9958843986,
-	-0.9960410654,-0.9961946981,-0.9963452962,-0.9964928592,-0.9966373868,
-	-0.9967788785,-0.9969173337,-0.9970527522,-0.9971851335,-0.9973144772,
-	-0.9974407829,-0.9975640503,-0.9976842788,-0.9978014683,-0.9979156183,
-	-0.9980267284,-0.9981347984,-0.9982398279,-0.9983418166,-0.9984407642,
-	-0.9985366703,-0.9986295348,-0.9987193572,-0.9988061373,-0.9988898750,
-	-0.9989705698,-0.9990482216,-0.9991228301,-0.9991943951,-0.9992629164,
-	-0.9993283938,-0.9993908270,-0.9994502159,-0.9995065604,-0.9995598601,
-	-0.9996101150,-0.9996573250,-0.9997014898,-0.9997426093,-0.9997806835,
-	-0.9998157121,-0.9998476952,-0.9998766325,-0.9999025240,-0.9999253697,
-	-0.9999451694,-0.9999619231,-0.9999756307,-0.9999862922,-0.9999939077,
-	-0.9999984769,-1.0000000000,-0.9999984769,-0.9999939077,-0.9999862922,
-	-0.9999756307,-0.9999619231,-0.9999451694,-0.9999253697,-0.9999025240,
-	-0.9998766325,-0.9998476952,-0.9998157121,-0.9997806835,-0.9997426093,
-	-0.9997014898,-0.9996573250,-0.9996101150,-0.9995598601,-0.9995065604,
-	-0.9994502159,-0.9993908270,-0.9993283938,-0.9992629164,-0.9991943951,
-	-0.9991228301,-0.9990482216,-0.9989705698,-0.9988898750,-0.9988061373,
-	-0.9987193572,-0.9986295348,-0.9985366703,-0.9984407642,-0.9983418166,
-	-0.9982398279,-0.9981347984,-0.9980267284,-0.9979156183,-0.9978014683,
-	-0.9976842788,-0.9975640503,-0.9974407829,-0.9973144772,-0.9971851335,
-	-0.9970527522,-0.9969173337,-0.9967788785,-0.9966373868,-0.9964928592,
-	-0.9963452962,-0.9961946981,-0.9960410654,-0.9958843986,-0.9957246982,
-	-0.9955619646,-0.9953961984,-0.9952274000,-0.9950555700,-0.9948807088,
-	-0.9947028171,-0.9945218954,-0.9943379441,-0.9941509640,-0.9939609555,
-	-0.9937679192,-0.9935718557,-0.9933727656,-0.9931706495,-0.9929655081,
-	-0.9927573419,-0.9925461516,-0.9923319379,-0.9921147013,-0.9918944426,
-	-0.9916711624,-0.9914448614,-0.9912155403,-0.9909831997,-0.9907478405,
-	-0.9905094632,-0.9902680687,-0.9900236577,-0.9897762309,-0.9895257891,
-	-0.9892723330,-0.9890158634,-0.9887563810,-0.9884938868,-0.9882283814,
-	-0.9879598658,-0.9876883406,-0.9874138068,-0.9871362651,-0.9868557164,
-	-0.9865721616,-0.9862856015,-0.9859960371,-0.9857034691,-0.9854078985,
-	-0.9851093262,-0.9848077530,-0.9845031800,-0.9841956080,-0.9838850379,
-	-0.9835714708,-0.9832549076,-0.9829353491,-0.9826127965,-0.9822872507,
-	-0.9819587127,-0.9816271834,-0.9812926640,-0.9809551553,-0.9806146585,
-	-0.9802711746,-0.9799247046,-0.9795752496,-0.9792228106,-0.9788673888,
-	-0.9785089851,-0.9781476007,-0.9777832368,-0.9774158943,-0.9770455744,
-	-0.9766722783,-0.9762960071,-0.9759167619,-0.9755345439,-0.9751493543,
-	-0.9747611942,-0.9743700648,-0.9739759673,-0.9735789029,-0.9731788728,
-	-0.9727758782,-0.9723699204,-0.9719610006,-0.9715491200,-0.9711342799,
-	-0.9707164816,-0.9702957263,-0.9698720153,-0.9694453499,-0.9690157314,
-	-0.9685831611,-0.9681476404,-0.9677091705,-0.9672677528,-0.9668233886,
-	-0.9663760793,-0.9659258263,-0.9654726309,-0.9650164945,-0.9645574185,
-	-0.9640954042,-0.9636304532,-0.9631625668,-0.9626917464,-0.9622179935,
-	-0.9617413095,-0.9612616959,-0.9607791542,-0.9602936857,-0.9598052920,
-	-0.9593139745,-0.9588197349,-0.9583225745,-0.9578224948,-0.9573194975,
-	-0.9568135841,-0.9563047560,-0.9557930148,-0.9552783621,-0.9547607995,
-	-0.9542403285,-0.9537169507,-0.9531906678,-0.9526614813,-0.9521293927,
-	-0.9515944039,-0.9510565163,-0.9505157316,-0.9499720515,-0.9494254776,
-	-0.9488760116,-0.9483236552,-0.9477684100,-0.9472102777,-0.9466492601,
-	-0.9460853588,-0.9455185756,-0.9449489122,-0.9443763702,-0.9438009516,
-	-0.9432226579,-0.9426414911,-0.9420574528,-0.9414705448,-0.9408807690,
-	-0.9402881270,-0.9396926208,-0.9390942521,-0.9384930228,-0.9378889346,
-	-0.9372819895,-0.9366721892,-0.9360595357,-0.9354440308,-0.9348256764,
-	-0.9342044743,-0.9335804265,-0.9329535348,-0.9323238012,-0.9316912276,
-	-0.9310558159,-0.9304175680,-0.9297764859,-0.9291325715,-0.9284858269,
-	-0.9278362539,-0.9271838546,-0.9265286309,-0.9258705848,-0.9252097184,
-	-0.9245460336,-0.9238795325,-0.9232102171,-0.9225380895,-0.9218631516,
-	-0.9211854056,-0.9205048535,-0.9198214973,-0.9191353393,-0.9184463813,
-	-0.9177546257,-0.9170600744,-0.9163627296,-0.9156625933,-0.9149596678,
-	-0.9142539552,-0.9135454576,-0.9128341772,-0.9121201162,-0.9114032766,
-	-0.9106836608,-0.9099612709,-0.9092361090,-0.9085081775,-0.9077774785,
-	-0.9070440143,-0.9063077870,-0.9055687990,-0.9048270525,-0.9040825497,
-	-0.9033352929,-0.9025852843,-0.9018325264,-0.9010770213,-0.9003187714,
-	-0.8995577790,-0.8987940463,-0.8980275758,-0.8972583697,-0.8964864304,
-	-0.8957117602,-0.8949343616,-0.8941542368,-0.8933713883,-0.8925858185,
-	-0.8917975296,-0.8910065242,-0.8902128046,-0.8894163733,-0.8886172327,
-	-0.8878153851,-0.8870108332,-0.8862035792,-0.8853936258,-0.8845809752,
-	-0.8837656301,-0.8829475929,-0.8821268660,-0.8813034521,-0.8804773535,
-	-0.8796485729,-0.8788171127,-0.8779829754,-0.8771461637,-0.8763066800,
-	-0.8754645270,-0.8746197071,-0.8737722230,-0.8729220773,-0.8720692724,
-	-0.8712138111,-0.8703556959,-0.8694949295,-0.8686315144,-0.8677654534,
-	-0.8668967489,-0.8660254038,-0.8651514206,-0.8642748020,-0.8633955506,
-	-0.8625136692,-0.8616291604,-0.8607420270,-0.8598522716,-0.8589598969,
-	-0.8580649057,-0.8571673007,-0.8562670846,-0.8553642602,-0.8544588301,
-	-0.8535507973,-0.8526401644,-0.8517269341,-0.8508111094,-0.8498926930,
-	-0.8489716876,-0.8480480962,-0.8471219214,-0.8461931661,-0.8452618332,
-	-0.8443279255,-0.8433914458,-0.8424523970,-0.8415107819,-0.8405666035,
-	-0.8396198645,-0.8386705679,-0.8377187166,-0.8367643135,-0.8358073614,
-	-0.8348478633,-0.8338858221,-0.8329212407,-0.8319541221,-0.8309844693,
-	-0.8300122851,-0.8290375726,-0.8280603346,-0.8270805743,-0.8260982945,
-	-0.8251134983,-0.8241261886,-0.8231363685,-0.8221440410,-0.8211492091,
-	-0.8201518759,-0.8191520443,-0.8181497174,-0.8171448983,-0.8161375901,
-	-0.8151277957,-0.8141155184,-0.8131007610,-0.8120835269,-0.8110638190,
-	-0.8100416404,-0.8090169944,-0.8079898839,-0.8069603121,-0.8059282822,
-	-0.8048937974,-0.8038568606,-0.8028174752,-0.8017756442,-0.8007313709,
-	-0.7996846585,-0.7986355100,-0.7975839288,-0.7965299180,-0.7954734809,
-	-0.7944146205,-0.7933533403,-0.7922896434,-0.7912235330,-0.7901550124,
-	-0.7890840848,-0.7880107536,-0.7869350220,-0.7858568932,-0.7847763705,
-	-0.7836934573,-0.7826081569,-0.7815204724,-0.7804304073,-0.7793379649,
-	-0.7782431485,-0.7771459615,-0.7760464071,-0.7749444887,-0.7738402097,
-	-0.7727335735,-0.7716245834,-0.7705132428,-0.7693995550,-0.7682835236,
-	-0.7671651518,-0.7660444431,-0.7649214009,-0.7637960286,-0.7626683297,
-	-0.7615383075,-0.7604059656,-0.7592713073,-0.7581343362,-0.7569950557,
-	-0.7558534692,-0.7547095802,-0.7535633923,-0.7524149089,-0.7512641335,
-	-0.7501110696,-0.7489557208,-0.7477980905,-0.7466381823,-0.7454759997,
-	-0.7443115462,-0.7431448255,-0.7419758410,-0.7408045963,-0.7396310950,
-	-0.7384553406,-0.7372773368,-0.7360970871,-0.7349145951,-0.7337298645,
-	-0.7325428988,-0.7313537016,-0.7301622766,-0.7289686274,-0.7277727577,
-	-0.7265746710,-0.7253743710,-0.7241718614,-0.7229671459,-0.7217602281,
-	-0.7205511117,-0.7193398003,-0.7181262978,-0.7169106077,-0.7156927337,
-	-0.7144726796,-0.7132504492,-0.7120260460,-0.7107994739,-0.7095707365,
-	-0.7083398377,-0.7071067812,-0.7058715707,-0.7046342100,-0.7033947028,
-	-0.7021530530,-0.7009092643,-0.6996633405,-0.6984152854,-0.6971651029,
-	-0.6959127966,-0.6946583705,-0.6934018283,-0.6921431739,-0.6908824111,
-	-0.6896195437,-0.6883545757,-0.6870875108,-0.6858183529,-0.6845471059,
-	-0.6832737737,-0.6819983601,-0.6807208690,-0.6794413043,-0.6781596699,
-	-0.6768759697,-0.6755902076,-0.6743023876,-0.6730125135,-0.6717205893,
-	-0.6704266190,-0.6691306064,-0.6678325555,-0.6665324702,-0.6652303547,
-	-0.6639262127,-0.6626200482,-0.6613118653,-0.6600016680,-0.6586894601,
-	-0.6573752458,-0.6560590290,-0.6547408137,-0.6534206040,-0.6520984038,
-	-0.6507742173,-0.6494480483,-0.6481199011,-0.6467897795,-0.6454576877,
-	-0.6441236298,-0.6427876097,-0.6414496316,-0.6401096995,-0.6387678175,
-	-0.6374239897,-0.6360782203,-0.6347305132,-0.6333808726,-0.6320293027,
-	-0.6306758074,-0.6293203910,-0.6279630576,-0.6266038114,-0.6252426563,
-	-0.6238795967,-0.6225146366,-0.6211477803,-0.6197790318,-0.6184083954,
-	-0.6170358751,-0.6156614753,-0.6142852001,-0.6129070537,-0.6115270402,
-	-0.6101451639,-0.6087614290,-0.6073758397,-0.6059884003,-0.6045991149,
-	-0.6032079877,-0.6018150232,-0.6004202253,-0.5990235985,-0.5976251470,
-	-0.5962248750,-0.5948227868,-0.5934188866,-0.5920131788,-0.5906056676,
-	-0.5891963574,-0.5877852523,-0.5863723567,-0.5849576750,-0.5835412114,
-	-0.5821229702,-0.5807029557,-0.5792811723,-0.5778576244,-0.5764323162,
-	-0.5750052520,-0.5735764364,-0.5721458734,-0.5707135677,-0.5692795234,
-	-0.5678437451,-0.5664062369,-0.5649670034,-0.5635260489,-0.5620833779,
-	-0.5606389946,-0.5591929035,-0.5577451090,-0.5562956155,-0.5548444274,
-	-0.5533915492,-0.5519369853,-0.5504807401,-0.5490228180,-0.5475632235,
-	-0.5461019610,-0.5446390350,-0.5431744500,-0.5417082103,-0.5402403205,
-	-0.5387707850,-0.5372996083,-0.5358267950,-0.5343523494,-0.5328762761,
-	-0.5313985795,-0.5299192642,-0.5284383347,-0.5269557955,-0.5254716511,
-	-0.5239859060,-0.5224985647,-0.5210096318,-0.5195191119,-0.5180270094,
-	-0.5165333289,-0.5150380749,-0.5135412521,-0.5120428649,-0.5105429179,
-	-0.5090414158,-0.5075383630,-0.5060337641,-0.5045276238,-0.5030199466,
-	-0.5015107372,-0.5000000000,-0.4984877398,-0.4969739610,-0.4954586684,
-	-0.4939418666,-0.4924235601,-0.4909037536,-0.4893824517,-0.4878596591,
-	-0.4863353804,-0.4848096202,-0.4832823833,-0.4817536741,-0.4802234974,
-	-0.4786918579,-0.4771587603,-0.4756242091,-0.4740882090,-0.4725507649,
-	-0.4710118812,-0.4694715628,-0.4679298143,-0.4663866403,-0.4648420457,
-	-0.4632960351,-0.4617486132,-0.4601997848,-0.4586495545,-0.4570979271,
-	-0.4555449072,-0.4539904997,-0.4524347093,-0.4508775407,-0.4493189986,
-	-0.4477590878,-0.4461978131,-0.4446351792,-0.4430711908,-0.4415058528,
-	-0.4399391699,-0.4383711468,-0.4368017884,-0.4352310994,-0.4336590846,
-	-0.4320857488,-0.4305110968,-0.4289351334,-0.4273578634,-0.4257792916,
-	-0.4241994227,-0.4226182617,-0.4210358134,-0.4194520824,-0.4178670738,
-	-0.4162807923,-0.4146932427,-0.4131044298,-0.4115143586,-0.4099230338,
-	-0.4083304604,-0.4067366431,-0.4051415868,-0.4035452964,-0.4019477767,
-	-0.4003490326,-0.3987490689,-0.3971478906,-0.3955455026,-0.3939419096,
-	-0.3923371166,-0.3907311285,-0.3891239501,-0.3875155865,-0.3859060423,
-	-0.3842953227,-0.3826834324,-0.3810703764,-0.3794561595,-0.3778407868,
-	-0.3762242631,-0.3746065934,-0.3729877826,-0.3713678356,-0.3697467573,
-	-0.3681245527,-0.3665012267,-0.3648767843,-0.3632512305,-0.3616245701,
-	-0.3599968081,-0.3583679495,-0.3567379993,-0.3551069624,-0.3534748438,
-	-0.3518416484,-0.3502073813,-0.3485720473,-0.3469356516,-0.3452981990,
-	-0.3436596946,-0.3420201433,-0.3403795502,-0.3387379202,-0.3370952584,
-	-0.3354515698,-0.3338068592,-0.3321611319,-0.3305143927,-0.3288666467,
-	-0.3272178990,-0.3255681545,-0.3239174182,-0.3222656952,-0.3206129906,
-	-0.3189593093,-0.3173046564,-0.3156490369,-0.3139924560,-0.3123349185,
-	-0.3106764296,-0.3090169944,-0.3073566178,-0.3056953050,-0.3040330609,
-	-0.3023698908,-0.3007057995,-0.2990407923,-0.2973748741,-0.2957080500,
-	-0.2940403252,-0.2923717047,-0.2907021936,-0.2890317969,-0.2873605198,
-	-0.2856883674,-0.2840153447,-0.2823414568,-0.2806667089,-0.2789911060,
-	-0.2773146533,-0.2756373558,-0.2739592187,-0.2722802470,-0.2706004460,
-	-0.2689198206,-0.2672383761,-0.2655561175,-0.2638730500,-0.2621891786,
-	-0.2605045086,-0.2588190451,-0.2571327932,-0.2554457579,-0.2537579446,
-	-0.2520693582,-0.2503800041,-0.2486898872,-0.2469990127,-0.2453073859,
-	-0.2436150118,-0.2419218956,-0.2402280425,-0.2385334576,-0.2368381461,
-	-0.2351421131,-0.2334453639,-0.2317479035,-0.2300497372,-0.2283508701,
-	-0.2266513074,-0.2249510543,-0.2232501160,-0.2215484976,-0.2198462044,
-	-0.2181432414,-0.2164396139,-0.2147353272,-0.2130303863,-0.2113247965,
-	-0.2096185629,-0.2079116908,-0.2062041854,-0.2044960518,-0.2027872954,
-	-0.2010779211,-0.1993679344,-0.1976573404,-0.1959461442,-0.1942343512,
-	-0.1925219665,-0.1908089954,-0.1890954430,-0.1873813146,-0.1856666154,
-	-0.1839513506,-0.1822355255,-0.1805191453,-0.1788022151,-0.1770847403,
-	-0.1753667261,-0.1736481777,-0.1719291003,-0.1702094992,-0.1684893796,
-	-0.1667687467,-0.1650476059,-0.1633259622,-0.1616038211,-0.1598811877,
-	-0.1581580673,-0.1564344650,-0.1547103863,-0.1529858363,-0.1512608202,
-	-0.1495353434,-0.1478094111,-0.1460830286,-0.1443562010,-0.1426289337,
-	-0.1409012319,-0.1391731010,-0.1374445460,-0.1357155724,-0.1339861854,
-	-0.1322563903,-0.1305261922,-0.1287955966,-0.1270646086,-0.1253332336,
-	-0.1236014767,-0.1218693434,-0.1201368388,-0.1184039683,-0.1166707371,
-	-0.1149371505,-0.1132032138,-0.1114689322,-0.1097343111,-0.1079993557,
-	-0.1062640713,-0.1045284633,-0.1027925368,-0.1010562972,-0.0993197497,
-	-0.0975828998,-0.0958457525,-0.0941083133,-0.0923705874,-0.0906325802,
-	-0.0888942969,-0.0871557427,-0.0854169231,-0.0836778433,-0.0819385086,
-	-0.0801989243,-0.0784590957,-0.0767190281,-0.0749787268,-0.0732381971,
-	-0.0714974443,-0.0697564737,-0.0680152907,-0.0662739004,-0.0645323083,
-	-0.0627905195,-0.0610485395,-0.0593063736,-0.0575640270,-0.0558215050,
-	-0.0540788130,-0.0523359562,-0.0505929401,-0.0488497698,-0.0471064507,
-	-0.0453629881,-0.0436193874,-0.0418756537,-0.0401317925,-0.0383878091,
-	-0.0366437087,-0.0348994967,-0.0331551784,-0.0314107591,-0.0296662441,
-	-0.0279216387,-0.0261769483,-0.0244321782,-0.0226873336,-0.0209424199,
-	-0.0191974424,-0.0174524064,-0.0157073173,-0.0139621803,-0.0122170008,
-	-0.0104717841,-0.0087265355,-0.0069812603,-0.0052359638,-0.0034906514,
-	-0.0017453284}
-#endif	
- ;
-
-eda_global float fcosinus[3600]
-#if defined MAIN
- = {
-	1.0000000000,0.9999984769,0.9999939077,0.9999862922,
-	0.9999756307,0.9999619231,0.9999451694,0.9999253697,0.9999025240,
-	0.9998766325,0.9998476952,0.9998157121,0.9997806835,0.9997426093,
-	0.9997014898,0.9996573250,0.9996101150,0.9995598601,0.9995065604,
-	0.9994502159,0.9993908270,0.9993283938,0.9992629164,0.9991943951,
-	0.9991228301,0.9990482216,0.9989705698,0.9988898750,0.9988061373,
-	0.9987193572,0.9986295348,0.9985366703,0.9984407642,0.9983418166,
-	0.9982398279,0.9981347984,0.9980267284,0.9979156183,0.9978014683,
-	0.9976842788,0.9975640503,0.9974407829,0.9973144772,0.9971851335,
-	0.9970527522,0.9969173337,0.9967788785,0.9966373868,0.9964928592,
-	0.9963452962,0.9961946981,0.9960410654,0.9958843986,0.9957246982,
-	0.9955619646,0.9953961984,0.9952274000,0.9950555700,0.9948807088,
-	0.9947028171,0.9945218954,0.9943379441,0.9941509640,0.9939609555,
-	0.9937679192,0.9935718557,0.9933727656,0.9931706495,0.9929655081,
-	0.9927573419,0.9925461516,0.9923319379,0.9921147013,0.9918944426,
-	0.9916711624,0.9914448614,0.9912155403,0.9909831997,0.9907478405,
-	0.9905094632,0.9902680687,0.9900236577,0.9897762309,0.9895257891,
-	0.9892723330,0.9890158634,0.9887563810,0.9884938868,0.9882283814,
-	0.9879598658,0.9876883406,0.9874138068,0.9871362651,0.9868557164,
-	0.9865721616,0.9862856015,0.9859960371,0.9857034691,0.9854078985,
-	0.9851093262,0.9848077530,0.9845031800,0.9841956080,0.9838850379,
-	0.9835714708,0.9832549076,0.9829353491,0.9826127965,0.9822872507,
-	0.9819587127,0.9816271834,0.9812926640,0.9809551553,0.9806146585,
-	0.9802711746,0.9799247046,0.9795752496,0.9792228106,0.9788673888,
-	0.9785089851,0.9781476007,0.9777832368,0.9774158943,0.9770455744,
-	0.9766722783,0.9762960071,0.9759167619,0.9755345439,0.9751493543,
-	0.9747611942,0.9743700648,0.9739759673,0.9735789029,0.9731788728,
-	0.9727758782,0.9723699204,0.9719610006,0.9715491200,0.9711342799,
-	0.9707164816,0.9702957263,0.9698720153,0.9694453499,0.9690157314,
-	0.9685831611,0.9681476404,0.9677091705,0.9672677528,0.9668233886,
-	0.9663760793,0.9659258263,0.9654726309,0.9650164945,0.9645574185,
-	0.9640954042,0.9636304532,0.9631625668,0.9626917464,0.9622179935,
-	0.9617413095,0.9612616959,0.9607791542,0.9602936857,0.9598052920,
-	0.9593139745,0.9588197349,0.9583225745,0.9578224948,0.9573194975,
-	0.9568135841,0.9563047560,0.9557930148,0.9552783621,0.9547607995,
-	0.9542403285,0.9537169507,0.9531906678,0.9526614813,0.9521293927,
-	0.9515944039,0.9510565163,0.9505157316,0.9499720515,0.9494254776,
-	0.9488760116,0.9483236552,0.9477684100,0.9472102777,0.9466492601,
-	0.9460853588,0.9455185756,0.9449489122,0.9443763702,0.9438009516,
-	0.9432226579,0.9426414911,0.9420574528,0.9414705448,0.9408807690,
-	0.9402881270,0.9396926208,0.9390942521,0.9384930228,0.9378889346,
-	0.9372819895,0.9366721892,0.9360595357,0.9354440308,0.9348256764,
-	0.9342044743,0.9335804265,0.9329535348,0.9323238012,0.9316912276,
-	0.9310558159,0.9304175680,0.9297764859,0.9291325715,0.9284858269,
-	0.9278362539,0.9271838546,0.9265286309,0.9258705848,0.9252097184,
-	0.9245460336,0.9238795325,0.9232102171,0.9225380895,0.9218631516,
-	0.9211854056,0.9205048535,0.9198214973,0.9191353393,0.9184463813,
-	0.9177546257,0.9170600744,0.9163627296,0.9156625933,0.9149596678,
-	0.9142539552,0.9135454576,0.9128341772,0.9121201162,0.9114032766,
-	0.9106836608,0.9099612709,0.9092361090,0.9085081775,0.9077774785,
-	0.9070440143,0.9063077870,0.9055687990,0.9048270525,0.9040825497,
-	0.9033352929,0.9025852843,0.9018325264,0.9010770213,0.9003187714,
-	0.8995577790,0.8987940463,0.8980275758,0.8972583697,0.8964864304,
-	0.8957117602,0.8949343616,0.8941542368,0.8933713883,0.8925858185,
-	0.8917975296,0.8910065242,0.8902128046,0.8894163733,0.8886172327,
-	0.8878153851,0.8870108332,0.8862035792,0.8853936258,0.8845809752,
-	0.8837656301,0.8829475929,0.8821268660,0.8813034521,0.8804773535,
-	0.8796485729,0.8788171127,0.8779829754,0.8771461637,0.8763066800,
-	0.8754645270,0.8746197071,0.8737722230,0.8729220773,0.8720692724,
-	0.8712138111,0.8703556959,0.8694949295,0.8686315144,0.8677654534,
-	0.8668967489,0.8660254038,0.8651514206,0.8642748020,0.8633955506,
-	0.8625136692,0.8616291604,0.8607420270,0.8598522716,0.8589598969,
-	0.8580649057,0.8571673007,0.8562670846,0.8553642602,0.8544588301,
-	0.8535507973,0.8526401644,0.8517269341,0.8508111094,0.8498926930,
-	0.8489716876,0.8480480962,0.8471219214,0.8461931661,0.8452618332,
-	0.8443279255,0.8433914458,0.8424523970,0.8415107819,0.8405666035,
-	0.8396198645,0.8386705679,0.8377187166,0.8367643135,0.8358073614,
-	0.8348478633,0.8338858221,0.8329212407,0.8319541221,0.8309844693,
-	0.8300122851,0.8290375726,0.8280603346,0.8270805743,0.8260982945,
-	0.8251134983,0.8241261886,0.8231363685,0.8221440410,0.8211492091,
-	0.8201518759,0.8191520443,0.8181497174,0.8171448983,0.8161375901,
-	0.8151277957,0.8141155184,0.8131007610,0.8120835269,0.8110638190,
-	0.8100416404,0.8090169944,0.8079898839,0.8069603121,0.8059282822,
-	0.8048937974,0.8038568606,0.8028174752,0.8017756442,0.8007313709,
-	0.7996846585,0.7986355100,0.7975839288,0.7965299180,0.7954734809,
-	0.7944146205,0.7933533403,0.7922896434,0.7912235330,0.7901550124,
-	0.7890840848,0.7880107536,0.7869350220,0.7858568932,0.7847763705,
-	0.7836934573,0.7826081569,0.7815204724,0.7804304073,0.7793379649,
-	0.7782431485,0.7771459615,0.7760464071,0.7749444887,0.7738402097,
-	0.7727335735,0.7716245834,0.7705132428,0.7693995550,0.7682835236,
-	0.7671651518,0.7660444431,0.7649214009,0.7637960286,0.7626683297,
-	0.7615383075,0.7604059656,0.7592713073,0.7581343362,0.7569950557,
-	0.7558534692,0.7547095802,0.7535633923,0.7524149089,0.7512641335,
-	0.7501110696,0.7489557208,0.7477980905,0.7466381823,0.7454759997,
-	0.7443115462,0.7431448255,0.7419758410,0.7408045963,0.7396310950,
-	0.7384553406,0.7372773368,0.7360970871,0.7349145951,0.7337298645,
-	0.7325428988,0.7313537016,0.7301622766,0.7289686274,0.7277727577,
-	0.7265746710,0.7253743710,0.7241718614,0.7229671459,0.7217602281,
-	0.7205511117,0.7193398003,0.7181262978,0.7169106077,0.7156927337,
-	0.7144726796,0.7132504492,0.7120260460,0.7107994739,0.7095707365,
-	0.7083398377,0.7071067812,0.7058715707,0.7046342100,0.7033947028,
-	0.7021530530,0.7009092643,0.6996633405,0.6984152854,0.6971651029,
-	0.6959127966,0.6946583705,0.6934018283,0.6921431739,0.6908824111,
-	0.6896195437,0.6883545757,0.6870875108,0.6858183529,0.6845471059,
-	0.6832737737,0.6819983601,0.6807208690,0.6794413043,0.6781596699,
-	0.6768759697,0.6755902076,0.6743023876,0.6730125135,0.6717205893,
-	0.6704266190,0.6691306064,0.6678325555,0.6665324702,0.6652303547,
-	0.6639262127,0.6626200482,0.6613118653,0.6600016680,0.6586894601,
-	0.6573752458,0.6560590290,0.6547408137,0.6534206040,0.6520984038,
-	0.6507742173,0.6494480483,0.6481199011,0.6467897795,0.6454576877,
-	0.6441236298,0.6427876097,0.6414496316,0.6401096995,0.6387678175,
-	0.6374239897,0.6360782203,0.6347305132,0.6333808726,0.6320293027,
-	0.6306758074,0.6293203910,0.6279630576,0.6266038114,0.6252426563,
-	0.6238795967,0.6225146366,0.6211477803,0.6197790318,0.6184083954,
-	0.6170358751,0.6156614753,0.6142852001,0.6129070537,0.6115270402,
-	0.6101451639,0.6087614290,0.6073758397,0.6059884003,0.6045991149,
-	0.6032079877,0.6018150232,0.6004202253,0.5990235985,0.5976251470,
-	0.5962248750,0.5948227868,0.5934188866,0.5920131788,0.5906056676,
-	0.5891963574,0.5877852523,0.5863723567,0.5849576750,0.5835412114,
-	0.5821229702,0.5807029557,0.5792811723,0.5778576244,0.5764323162,
-	0.5750052520,0.5735764364,0.5721458734,0.5707135677,0.5692795234,
-	0.5678437451,0.5664062369,0.5649670034,0.5635260489,0.5620833779,
-	0.5606389946,0.5591929035,0.5577451090,0.5562956155,0.5548444274,
-	0.5533915492,0.5519369853,0.5504807401,0.5490228180,0.5475632235,
-	0.5461019610,0.5446390350,0.5431744500,0.5417082103,0.5402403205,
-	0.5387707850,0.5372996083,0.5358267950,0.5343523494,0.5328762761,
-	0.5313985795,0.5299192642,0.5284383347,0.5269557955,0.5254716511,
-	0.5239859060,0.5224985647,0.5210096318,0.5195191119,0.5180270094,
-	0.5165333289,0.5150380749,0.5135412521,0.5120428649,0.5105429179,
-	0.5090414158,0.5075383630,0.5060337641,0.5045276238,0.5030199466,
-	0.5015107372,0.5000000000,0.4984877398,0.4969739610,0.4954586684,
-	0.4939418666,0.4924235601,0.4909037536,0.4893824517,0.4878596591,
-	0.4863353804,0.4848096202,0.4832823833,0.4817536741,0.4802234974,
-	0.4786918579,0.4771587603,0.4756242091,0.4740882090,0.4725507649,
-	0.4710118812,0.4694715628,0.4679298143,0.4663866403,0.4648420457,
-	0.4632960351,0.4617486132,0.4601997848,0.4586495545,0.4570979271,
-	0.4555449072,0.4539904997,0.4524347093,0.4508775407,0.4493189986,
-	0.4477590878,0.4461978131,0.4446351792,0.4430711908,0.4415058528,
-	0.4399391699,0.4383711468,0.4368017884,0.4352310994,0.4336590846,
-	0.4320857488,0.4305110968,0.4289351334,0.4273578634,0.4257792916,
-	0.4241994227,0.4226182617,0.4210358134,0.4194520824,0.4178670738,
-	0.4162807923,0.4146932427,0.4131044298,0.4115143586,0.4099230338,
-	0.4083304604,0.4067366431,0.4051415868,0.4035452964,0.4019477767,
-	0.4003490326,0.3987490689,0.3971478906,0.3955455026,0.3939419096,
-	0.3923371166,0.3907311285,0.3891239501,0.3875155865,0.3859060423,
-	0.3842953227,0.3826834324,0.3810703764,0.3794561595,0.3778407868,
-	0.3762242631,0.3746065934,0.3729877826,0.3713678356,0.3697467573,
-	0.3681245527,0.3665012267,0.3648767843,0.3632512305,0.3616245701,
-	0.3599968081,0.3583679495,0.3567379993,0.3551069624,0.3534748438,
-	0.3518416484,0.3502073813,0.3485720473,0.3469356516,0.3452981990,
-	0.3436596946,0.3420201433,0.3403795502,0.3387379202,0.3370952584,
-	0.3354515698,0.3338068592,0.3321611319,0.3305143927,0.3288666467,
-	0.3272178990,0.3255681545,0.3239174182,0.3222656952,0.3206129906,
-	0.3189593093,0.3173046564,0.3156490369,0.3139924560,0.3123349185,
-	0.3106764296,0.3090169944,0.3073566178,0.3056953050,0.3040330609,
-	0.3023698908,0.3007057995,0.2990407923,0.2973748741,0.2957080500,
-	0.2940403252,0.2923717047,0.2907021936,0.2890317969,0.2873605198,
-	0.2856883674,0.2840153447,0.2823414568,0.2806667089,0.2789911060,
-	0.2773146533,0.2756373558,0.2739592187,0.2722802470,0.2706004460,
-	0.2689198206,0.2672383761,0.2655561175,0.2638730500,0.2621891786,
-	0.2605045086,0.2588190451,0.2571327932,0.2554457579,0.2537579446,
-	0.2520693582,0.2503800041,0.2486898872,0.2469990127,0.2453073859,
-	0.2436150118,0.2419218956,0.2402280425,0.2385334576,0.2368381461,
-	0.2351421131,0.2334453639,0.2317479035,0.2300497372,0.2283508701,
-	0.2266513074,0.2249510543,0.2232501160,0.2215484976,0.2198462044,
-	0.2181432414,0.2164396139,0.2147353272,0.2130303863,0.2113247965,
-	0.2096185629,0.2079116908,0.2062041854,0.2044960518,0.2027872954,
-	0.2010779211,0.1993679344,0.1976573404,0.1959461442,0.1942343512,
-	0.1925219665,0.1908089954,0.1890954430,0.1873813146,0.1856666154,
-	0.1839513506,0.1822355255,0.1805191453,0.1788022151,0.1770847403,
-	0.1753667261,0.1736481777,0.1719291003,0.1702094992,0.1684893796,
-	0.1667687467,0.1650476059,0.1633259622,0.1616038211,0.1598811877,
-	0.1581580673,0.1564344650,0.1547103863,0.1529858363,0.1512608202,
-	0.1495353434,0.1478094111,0.1460830286,0.1443562010,0.1426289337,
-	0.1409012319,0.1391731010,0.1374445460,0.1357155724,0.1339861854,
-	0.1322563903,0.1305261922,0.1287955966,0.1270646086,0.1253332336,
-	0.1236014767,0.1218693434,0.1201368388,0.1184039683,0.1166707371,
-	0.1149371505,0.1132032138,0.1114689322,0.1097343111,0.1079993557,
-	0.1062640713,0.1045284633,0.1027925368,0.1010562972,0.0993197497,
-	0.0975828998,0.0958457525,0.0941083133,0.0923705874,0.0906325802,
-	0.0888942969,0.0871557427,0.0854169231,0.0836778433,0.0819385086,
-	0.0801989243,0.0784590957,0.0767190281,0.0749787268,0.0732381971,
-	0.0714974443,0.0697564737,0.0680152907,0.0662739004,0.0645323083,
-	0.0627905195,0.0610485395,0.0593063736,0.0575640270,0.0558215050,
-	0.0540788130,0.0523359562,0.0505929401,0.0488497698,0.0471064507,
-	0.0453629881,0.0436193874,0.0418756537,0.0401317925,0.0383878091,
-	0.0366437087,0.0348994967,0.0331551784,0.0314107591,0.0296662441,
-	0.0279216387,0.0261769483,0.0244321782,0.0226873336,0.0209424199,
-	0.0191974424,0.0174524064,0.0157073173,0.0139621803,0.0122170008,
-	0.0104717841,0.0087265355,0.0069812603,0.0052359638,0.0034906514,
-	0.0017453284,0.0000000000,-0.0017453284,-0.0034906514,-0.0052359638,
-	-0.0069812603,-0.0087265355,-0.0104717841,-0.0122170008,-0.0139621803,
-	-0.0157073173,-0.0174524064,-0.0191974424,-0.0209424199,-0.0226873336,
-	-0.0244321782,-0.0261769483,-0.0279216387,-0.0296662441,-0.0314107591,
-	-0.0331551784,-0.0348994967,-0.0366437087,-0.0383878091,-0.0401317925,
-	-0.0418756537,-0.0436193874,-0.0453629881,-0.0471064507,-0.0488497698,
-	-0.0505929401,-0.0523359562,-0.0540788130,-0.0558215050,-0.0575640270,
-	-0.0593063736,-0.0610485395,-0.0627905195,-0.0645323083,-0.0662739004,
-	-0.0680152907,-0.0697564737,-0.0714974443,-0.0732381971,-0.0749787268,
-	-0.0767190281,-0.0784590957,-0.0801989243,-0.0819385086,-0.0836778433,
-	-0.0854169231,-0.0871557427,-0.0888942969,-0.0906325802,-0.0923705874,
-	-0.0941083133,-0.0958457525,-0.0975828998,-0.0993197497,-0.1010562972,
-	-0.1027925368,-0.1045284633,-0.1062640713,-0.1079993557,-0.1097343111,
-	-0.1114689322,-0.1132032138,-0.1149371505,-0.1166707371,-0.1184039683,
-	-0.1201368388,-0.1218693434,-0.1236014767,-0.1253332336,-0.1270646086,
-	-0.1287955966,-0.1305261922,-0.1322563903,-0.1339861854,-0.1357155724,
-	-0.1374445460,-0.1391731010,-0.1409012319,-0.1426289337,-0.1443562010,
-	-0.1460830286,-0.1478094111,-0.1495353434,-0.1512608202,-0.1529858363,
-	-0.1547103863,-0.1564344650,-0.1581580673,-0.1598811877,-0.1616038211,
-	-0.1633259622,-0.1650476059,-0.1667687467,-0.1684893796,-0.1702094992,
-	-0.1719291003,-0.1736481777,-0.1753667261,-0.1770847403,-0.1788022151,
-	-0.1805191453,-0.1822355255,-0.1839513506,-0.1856666154,-0.1873813146,
-	-0.1890954430,-0.1908089954,-0.1925219665,-0.1942343512,-0.1959461442,
-	-0.1976573404,-0.1993679344,-0.2010779211,-0.2027872954,-0.2044960518,
-	-0.2062041854,-0.2079116908,-0.2096185629,-0.2113247965,-0.2130303863,
-	-0.2147353272,-0.2164396139,-0.2181432414,-0.2198462044,-0.2215484976,
-	-0.2232501160,-0.2249510543,-0.2266513074,-0.2283508701,-0.2300497372,
-	-0.2317479035,-0.2334453639,-0.2351421131,-0.2368381461,-0.2385334576,
-	-0.2402280425,-0.2419218956,-0.2436150118,-0.2453073859,-0.2469990127,
-	-0.2486898872,-0.2503800041,-0.2520693582,-0.2537579446,-0.2554457579,
-	-0.2571327932,-0.2588190451,-0.2605045086,-0.2621891786,-0.2638730500,
-	-0.2655561175,-0.2672383761,-0.2689198206,-0.2706004460,-0.2722802470,
-	-0.2739592187,-0.2756373558,-0.2773146533,-0.2789911060,-0.2806667089,
-	-0.2823414568,-0.2840153447,-0.2856883674,-0.2873605198,-0.2890317969,
-	-0.2907021936,-0.2923717047,-0.2940403252,-0.2957080500,-0.2973748741,
-	-0.2990407923,-0.3007057995,-0.3023698908,-0.3040330609,-0.3056953050,
-	-0.3073566178,-0.3090169944,-0.3106764296,-0.3123349185,-0.3139924560,
-	-0.3156490369,-0.3173046564,-0.3189593093,-0.3206129906,-0.3222656952,
-	-0.3239174182,-0.3255681545,-0.3272178990,-0.3288666467,-0.3305143927,
-	-0.3321611319,-0.3338068592,-0.3354515698,-0.3370952584,-0.3387379202,
-	-0.3403795502,-0.3420201433,-0.3436596946,-0.3452981990,-0.3469356516,
-	-0.3485720473,-0.3502073813,-0.3518416484,-0.3534748438,-0.3551069624,
-	-0.3567379993,-0.3583679495,-0.3599968081,-0.3616245701,-0.3632512305,
-	-0.3648767843,-0.3665012267,-0.3681245527,-0.3697467573,-0.3713678356,
-	-0.3729877826,-0.3746065934,-0.3762242631,-0.3778407868,-0.3794561595,
-	-0.3810703764,-0.3826834324,-0.3842953227,-0.3859060423,-0.3875155865,
-	-0.3891239501,-0.3907311285,-0.3923371166,-0.3939419096,-0.3955455026,
-	-0.3971478906,-0.3987490689,-0.4003490326,-0.4019477767,-0.4035452964,
-	-0.4051415868,-0.4067366431,-0.4083304604,-0.4099230338,-0.4115143586,
-	-0.4131044298,-0.4146932427,-0.4162807923,-0.4178670738,-0.4194520824,
-	-0.4210358134,-0.4226182617,-0.4241994227,-0.4257792916,-0.4273578634,
-	-0.4289351334,-0.4305110968,-0.4320857488,-0.4336590846,-0.4352310994,
-	-0.4368017884,-0.4383711468,-0.4399391699,-0.4415058528,-0.4430711908,
-	-0.4446351792,-0.4461978131,-0.4477590878,-0.4493189986,-0.4508775407,
-	-0.4524347093,-0.4539904997,-0.4555449072,-0.4570979271,-0.4586495545,
-	-0.4601997848,-0.4617486132,-0.4632960351,-0.4648420457,-0.4663866403,
-	-0.4679298143,-0.4694715628,-0.4710118812,-0.4725507649,-0.4740882090,
-	-0.4756242091,-0.4771587603,-0.4786918579,-0.4802234974,-0.4817536741,
-	-0.4832823833,-0.4848096202,-0.4863353804,-0.4878596591,-0.4893824517,
-	-0.4909037536,-0.4924235601,-0.4939418666,-0.4954586684,-0.4969739610,
-	-0.4984877398,-0.5000000000,-0.5015107372,-0.5030199466,-0.5045276238,
-	-0.5060337641,-0.5075383630,-0.5090414158,-0.5105429179,-0.5120428649,
-	-0.5135412521,-0.5150380749,-0.5165333289,-0.5180270094,-0.5195191119,
-	-0.5210096318,-0.5224985647,-0.5239859060,-0.5254716511,-0.5269557955,
-	-0.5284383347,-0.5299192642,-0.5313985795,-0.5328762761,-0.5343523494,
-	-0.5358267950,-0.5372996083,-0.5387707850,-0.5402403205,-0.5417082103,
-	-0.5431744500,-0.5446390350,-0.5461019610,-0.5475632235,-0.5490228180,
-	-0.5504807401,-0.5519369853,-0.5533915492,-0.5548444274,-0.5562956155,
-	-0.5577451090,-0.5591929035,-0.5606389946,-0.5620833779,-0.5635260489,
-	-0.5649670034,-0.5664062369,-0.5678437451,-0.5692795234,-0.5707135677,
-	-0.5721458734,-0.5735764364,-0.5750052520,-0.5764323162,-0.5778576244,
-	-0.5792811723,-0.5807029557,-0.5821229702,-0.5835412114,-0.5849576750,
-	-0.5863723567,-0.5877852523,-0.5891963574,-0.5906056676,-0.5920131788,
-	-0.5934188866,-0.5948227868,-0.5962248750,-0.5976251470,-0.5990235985,
-	-0.6004202253,-0.6018150232,-0.6032079877,-0.6045991149,-0.6059884003,
-	-0.6073758397,-0.6087614290,-0.6101451639,-0.6115270402,-0.6129070537,
-	-0.6142852001,-0.6156614753,-0.6170358751,-0.6184083954,-0.6197790318,
-	-0.6211477803,-0.6225146366,-0.6238795967,-0.6252426563,-0.6266038114,
-	-0.6279630576,-0.6293203910,-0.6306758074,-0.6320293027,-0.6333808726,
-	-0.6347305132,-0.6360782203,-0.6374239897,-0.6387678175,-0.6401096995,
-	-0.6414496316,-0.6427876097,-0.6441236298,-0.6454576877,-0.6467897795,
-	-0.6481199011,-0.6494480483,-0.6507742173,-0.6520984038,-0.6534206040,
-	-0.6547408137,-0.6560590290,-0.6573752458,-0.6586894601,-0.6600016680,
-	-0.6613118653,-0.6626200482,-0.6639262127,-0.6652303547,-0.6665324702,
-	-0.6678325555,-0.6691306064,-0.6704266190,-0.6717205893,-0.6730125135,
-	-0.6743023876,-0.6755902076,-0.6768759697,-0.6781596699,-0.6794413043,
-	-0.6807208690,-0.6819983601,-0.6832737737,-0.6845471059,-0.6858183529,
-	-0.6870875108,-0.6883545757,-0.6896195437,-0.6908824111,-0.6921431739,
-	-0.6934018283,-0.6946583705,-0.6959127966,-0.6971651029,-0.6984152854,
-	-0.6996633405,-0.7009092643,-0.7021530530,-0.7033947028,-0.7046342100,
-	-0.7058715707,-0.7071067812,-0.7083398377,-0.7095707365,-0.7107994739,
-	-0.7120260460,-0.7132504492,-0.7144726796,-0.7156927337,-0.7169106077,
-	-0.7181262978,-0.7193398003,-0.7205511117,-0.7217602281,-0.7229671459,
-	-0.7241718614,-0.7253743710,-0.7265746710,-0.7277727577,-0.7289686274,
-	-0.7301622766,-0.7313537016,-0.7325428988,-0.7337298645,-0.7349145951,
-	-0.7360970871,-0.7372773368,-0.7384553406,-0.7396310950,-0.7408045963,
-	-0.7419758410,-0.7431448255,-0.7443115462,-0.7454759997,-0.7466381823,
-	-0.7477980905,-0.7489557208,-0.7501110696,-0.7512641335,-0.7524149089,
-	-0.7535633923,-0.7547095802,-0.7558534692,-0.7569950557,-0.7581343362,
-	-0.7592713073,-0.7604059656,-0.7615383075,-0.7626683297,-0.7637960286,
-	-0.7649214009,-0.7660444431,-0.7671651518,-0.7682835236,-0.7693995550,
-	-0.7705132428,-0.7716245834,-0.7727335735,-0.7738402097,-0.7749444887,
-	-0.7760464071,-0.7771459615,-0.7782431485,-0.7793379649,-0.7804304073,
-	-0.7815204724,-0.7826081569,-0.7836934573,-0.7847763705,-0.7858568932,
-	-0.7869350220,-0.7880107536,-0.7890840848,-0.7901550124,-0.7912235330,
-	-0.7922896434,-0.7933533403,-0.7944146205,-0.7954734809,-0.7965299180,
-	-0.7975839288,-0.7986355100,-0.7996846585,-0.8007313709,-0.8017756442,
-	-0.8028174752,-0.8038568606,-0.8048937974,-0.8059282822,-0.8069603121,
-	-0.8079898839,-0.8090169944,-0.8100416404,-0.8110638190,-0.8120835269,
-	-0.8131007610,-0.8141155184,-0.8151277957,-0.8161375901,-0.8171448983,
-	-0.8181497174,-0.8191520443,-0.8201518759,-0.8211492091,-0.8221440410,
-	-0.8231363685,-0.8241261886,-0.8251134983,-0.8260982945,-0.8270805743,
-	-0.8280603346,-0.8290375726,-0.8300122851,-0.8309844693,-0.8319541221,
-	-0.8329212407,-0.8338858221,-0.8348478633,-0.8358073614,-0.8367643135,
-	-0.8377187166,-0.8386705679,-0.8396198645,-0.8405666035,-0.8415107819,
-	-0.8424523970,-0.8433914458,-0.8443279255,-0.8452618332,-0.8461931661,
-	-0.8471219214,-0.8480480962,-0.8489716876,-0.8498926930,-0.8508111094,
-	-0.8517269341,-0.8526401644,-0.8535507973,-0.8544588301,-0.8553642602,
-	-0.8562670846,-0.8571673007,-0.8580649057,-0.8589598969,-0.8598522716,
-	-0.8607420270,-0.8616291604,-0.8625136692,-0.8633955506,-0.8642748020,
-	-0.8651514206,-0.8660254038,-0.8668967489,-0.8677654534,-0.8686315144,
-	-0.8694949295,-0.8703556959,-0.8712138111,-0.8720692724,-0.8729220773,
-	-0.8737722230,-0.8746197071,-0.8754645270,-0.8763066800,-0.8771461637,
-	-0.8779829754,-0.8788171127,-0.8796485729,-0.8804773535,-0.8813034521,
-	-0.8821268660,-0.8829475929,-0.8837656301,-0.8845809752,-0.8853936258,
-	-0.8862035792,-0.8870108332,-0.8878153851,-0.8886172327,-0.8894163733,
-	-0.8902128046,-0.8910065242,-0.8917975296,-0.8925858185,-0.8933713883,
-	-0.8941542368,-0.8949343616,-0.8957117602,-0.8964864304,-0.8972583697,
-	-0.8980275758,-0.8987940463,-0.8995577790,-0.9003187714,-0.9010770213,
-	-0.9018325264,-0.9025852843,-0.9033352929,-0.9040825497,-0.9048270525,
-	-0.9055687990,-0.9063077870,-0.9070440143,-0.9077774785,-0.9085081775,
-	-0.9092361090,-0.9099612709,-0.9106836608,-0.9114032766,-0.9121201162,
-	-0.9128341772,-0.9135454576,-0.9142539552,-0.9149596678,-0.9156625933,
-	-0.9163627296,-0.9170600744,-0.9177546257,-0.9184463813,-0.9191353393,
-	-0.9198214973,-0.9205048535,-0.9211854056,-0.9218631516,-0.9225380895,
-	-0.9232102171,-0.9238795325,-0.9245460336,-0.9252097184,-0.9258705848,
-	-0.9265286309,-0.9271838546,-0.9278362539,-0.9284858269,-0.9291325715,
-	-0.9297764859,-0.9304175680,-0.9310558159,-0.9316912276,-0.9323238012,
-	-0.9329535348,-0.9335804265,-0.9342044743,-0.9348256764,-0.9354440308,
-	-0.9360595357,-0.9366721892,-0.9372819895,-0.9378889346,-0.9384930228,
-	-0.9390942521,-0.9396926208,-0.9402881270,-0.9408807690,-0.9414705448,
-	-0.9420574528,-0.9426414911,-0.9432226579,-0.9438009516,-0.9443763702,
-	-0.9449489122,-0.9455185756,-0.9460853588,-0.9466492601,-0.9472102777,
-	-0.9477684100,-0.9483236552,-0.9488760116,-0.9494254776,-0.9499720515,
-	-0.9505157316,-0.9510565163,-0.9515944039,-0.9521293927,-0.9526614813,
-	-0.9531906678,-0.9537169507,-0.9542403285,-0.9547607995,-0.9552783621,
-	-0.9557930148,-0.9563047560,-0.9568135841,-0.9573194975,-0.9578224948,
-	-0.9583225745,-0.9588197349,-0.9593139745,-0.9598052920,-0.9602936857,
-	-0.9607791542,-0.9612616959,-0.9617413095,-0.9622179935,-0.9626917464,
-	-0.9631625668,-0.9636304532,-0.9640954042,-0.9645574185,-0.9650164945,
-	-0.9654726309,-0.9659258263,-0.9663760793,-0.9668233886,-0.9672677528,
-	-0.9677091705,-0.9681476404,-0.9685831611,-0.9690157314,-0.9694453499,
-	-0.9698720153,-0.9702957263,-0.9707164816,-0.9711342799,-0.9715491200,
-	-0.9719610006,-0.9723699204,-0.9727758782,-0.9731788728,-0.9735789029,
-	-0.9739759673,-0.9743700648,-0.9747611942,-0.9751493543,-0.9755345439,
-	-0.9759167619,-0.9762960071,-0.9766722783,-0.9770455744,-0.9774158943,
-	-0.9777832368,-0.9781476007,-0.9785089851,-0.9788673888,-0.9792228106,
-	-0.9795752496,-0.9799247046,-0.9802711746,-0.9806146585,-0.9809551553,
-	-0.9812926640,-0.9816271834,-0.9819587127,-0.9822872507,-0.9826127965,
-	-0.9829353491,-0.9832549076,-0.9835714708,-0.9838850379,-0.9841956080,
-	-0.9845031800,-0.9848077530,-0.9851093262,-0.9854078985,-0.9857034691,
-	-0.9859960371,-0.9862856015,-0.9865721616,-0.9868557164,-0.9871362651,
-	-0.9874138068,-0.9876883406,-0.9879598658,-0.9882283814,-0.9884938868,
-	-0.9887563810,-0.9890158634,-0.9892723330,-0.9895257891,-0.9897762309,
-	-0.9900236577,-0.9902680687,-0.9905094632,-0.9907478405,-0.9909831997,
-	-0.9912155403,-0.9914448614,-0.9916711624,-0.9918944426,-0.9921147013,
-	-0.9923319379,-0.9925461516,-0.9927573419,-0.9929655081,-0.9931706495,
-	-0.9933727656,-0.9935718557,-0.9937679192,-0.9939609555,-0.9941509640,
-	-0.9943379441,-0.9945218954,-0.9947028171,-0.9948807088,-0.9950555700,
-	-0.9952274000,-0.9953961984,-0.9955619646,-0.9957246982,-0.9958843986,
-	-0.9960410654,-0.9961946981,-0.9963452962,-0.9964928592,-0.9966373868,
-	-0.9967788785,-0.9969173337,-0.9970527522,-0.9971851335,-0.9973144772,
-	-0.9974407829,-0.9975640503,-0.9976842788,-0.9978014683,-0.9979156183,
-	-0.9980267284,-0.9981347984,-0.9982398279,-0.9983418166,-0.9984407642,
-	-0.9985366703,-0.9986295348,-0.9987193572,-0.9988061373,-0.9988898750,
-	-0.9989705698,-0.9990482216,-0.9991228301,-0.9991943951,-0.9992629164,
-	-0.9993283938,-0.9993908270,-0.9994502159,-0.9995065604,-0.9995598601,
-	-0.9996101150,-0.9996573250,-0.9997014898,-0.9997426093,-0.9997806835,
-	-0.9998157121,-0.9998476952,-0.9998766325,-0.9999025240,-0.9999253697,
-	-0.9999451694,-0.9999619231,-0.9999756307,-0.9999862922,-0.9999939077,
-	-0.9999984769,-1.0000000000,-0.9999984769,-0.9999939077,-0.9999862922,
-	-0.9999756307,-0.9999619231,-0.9999451694,-0.9999253697,-0.9999025240,
-	-0.9998766325,-0.9998476952,-0.9998157121,-0.9997806835,-0.9997426093,
-	-0.9997014898,-0.9996573250,-0.9996101150,-0.9995598601,-0.9995065604,
-	-0.9994502159,-0.9993908270,-0.9993283938,-0.9992629164,-0.9991943951,
-	-0.9991228301,-0.9990482216,-0.9989705698,-0.9988898750,-0.9988061373,
-	-0.9987193572,-0.9986295348,-0.9985366703,-0.9984407642,-0.9983418166,
-	-0.9982398279,-0.9981347984,-0.9980267284,-0.9979156183,-0.9978014683,
-	-0.9976842788,-0.9975640503,-0.9974407829,-0.9973144772,-0.9971851335,
-	-0.9970527522,-0.9969173337,-0.9967788785,-0.9966373868,-0.9964928592,
-	-0.9963452962,-0.9961946981,-0.9960410654,-0.9958843986,-0.9957246982,
-	-0.9955619646,-0.9953961984,-0.9952274000,-0.9950555700,-0.9948807088,
-	-0.9947028171,-0.9945218954,-0.9943379441,-0.9941509640,-0.9939609555,
-	-0.9937679192,-0.9935718557,-0.9933727656,-0.9931706495,-0.9929655081,
-	-0.9927573419,-0.9925461516,-0.9923319379,-0.9921147013,-0.9918944426,
-	-0.9916711624,-0.9914448614,-0.9912155403,-0.9909831997,-0.9907478405,
-	-0.9905094632,-0.9902680687,-0.9900236577,-0.9897762309,-0.9895257891,
-	-0.9892723330,-0.9890158634,-0.9887563810,-0.9884938868,-0.9882283814,
-	-0.9879598658,-0.9876883406,-0.9874138068,-0.9871362651,-0.9868557164,
-	-0.9865721616,-0.9862856015,-0.9859960371,-0.9857034691,-0.9854078985,
-	-0.9851093262,-0.9848077530,-0.9845031800,-0.9841956080,-0.9838850379,
-	-0.9835714708,-0.9832549076,-0.9829353491,-0.9826127965,-0.9822872507,
-	-0.9819587127,-0.9816271834,-0.9812926640,-0.9809551553,-0.9806146585,
-	-0.9802711746,-0.9799247046,-0.9795752496,-0.9792228106,-0.9788673888,
-	-0.9785089851,-0.9781476007,-0.9777832368,-0.9774158943,-0.9770455744,
-	-0.9766722783,-0.9762960071,-0.9759167619,-0.9755345439,-0.9751493543,
-	-0.9747611942,-0.9743700648,-0.9739759673,-0.9735789029,-0.9731788728,
-	-0.9727758782,-0.9723699204,-0.9719610006,-0.9715491200,-0.9711342799,
-	-0.9707164816,-0.9702957263,-0.9698720153,-0.9694453499,-0.9690157314,
-	-0.9685831611,-0.9681476404,-0.9677091705,-0.9672677528,-0.9668233886,
-	-0.9663760793,-0.9659258263,-0.9654726309,-0.9650164945,-0.9645574185,
-	-0.9640954042,-0.9636304532,-0.9631625668,-0.9626917464,-0.9622179935,
-	-0.9617413095,-0.9612616959,-0.9607791542,-0.9602936857,-0.9598052920,
-	-0.9593139745,-0.9588197349,-0.9583225745,-0.9578224948,-0.9573194975,
-	-0.9568135841,-0.9563047560,-0.9557930148,-0.9552783621,-0.9547607995,
-	-0.9542403285,-0.9537169507,-0.9531906678,-0.9526614813,-0.9521293927,
-	-0.9515944039,-0.9510565163,-0.9505157316,-0.9499720515,-0.9494254776,
-	-0.9488760116,-0.9483236552,-0.9477684100,-0.9472102777,-0.9466492601,
-	-0.9460853588,-0.9455185756,-0.9449489122,-0.9443763702,-0.9438009516,
-	-0.9432226579,-0.9426414911,-0.9420574528,-0.9414705448,-0.9408807690,
-	-0.9402881270,-0.9396926208,-0.9390942521,-0.9384930228,-0.9378889346,
-	-0.9372819895,-0.9366721892,-0.9360595357,-0.9354440308,-0.9348256764,
-	-0.9342044743,-0.9335804265,-0.9329535348,-0.9323238012,-0.9316912276,
-	-0.9310558159,-0.9304175680,-0.9297764859,-0.9291325715,-0.9284858269,
-	-0.9278362539,-0.9271838546,-0.9265286309,-0.9258705848,-0.9252097184,
-	-0.9245460336,-0.9238795325,-0.9232102171,-0.9225380895,-0.9218631516,
-	-0.9211854056,-0.9205048535,-0.9198214973,-0.9191353393,-0.9184463813,
-	-0.9177546257,-0.9170600744,-0.9163627296,-0.9156625933,-0.9149596678,
-	-0.9142539552,-0.9135454576,-0.9128341772,-0.9121201162,-0.9114032766,
-	-0.9106836608,-0.9099612709,-0.9092361090,-0.9085081775,-0.9077774785,
-	-0.9070440143,-0.9063077870,-0.9055687990,-0.9048270525,-0.9040825497,
-	-0.9033352929,-0.9025852843,-0.9018325264,-0.9010770213,-0.9003187714,
-	-0.8995577790,-0.8987940463,-0.8980275758,-0.8972583697,-0.8964864304,
-	-0.8957117602,-0.8949343616,-0.8941542368,-0.8933713883,-0.8925858185,
-	-0.8917975296,-0.8910065242,-0.8902128046,-0.8894163733,-0.8886172327,
-	-0.8878153851,-0.8870108332,-0.8862035792,-0.8853936258,-0.8845809752,
-	-0.8837656301,-0.8829475929,-0.8821268660,-0.8813034521,-0.8804773535,
-	-0.8796485729,-0.8788171127,-0.8779829754,-0.8771461637,-0.8763066800,
-	-0.8754645270,-0.8746197071,-0.8737722230,-0.8729220773,-0.8720692724,
-	-0.8712138111,-0.8703556959,-0.8694949295,-0.8686315144,-0.8677654534,
-	-0.8668967489,-0.8660254038,-0.8651514206,-0.8642748020,-0.8633955506,
-	-0.8625136692,-0.8616291604,-0.8607420270,-0.8598522716,-0.8589598969,
-	-0.8580649057,-0.8571673007,-0.8562670846,-0.8553642602,-0.8544588301,
-	-0.8535507973,-0.8526401644,-0.8517269341,-0.8508111094,-0.8498926930,
-	-0.8489716876,-0.8480480962,-0.8471219214,-0.8461931661,-0.8452618332,
-	-0.8443279255,-0.8433914458,-0.8424523970,-0.8415107819,-0.8405666035,
-	-0.8396198645,-0.8386705679,-0.8377187166,-0.8367643135,-0.8358073614,
-	-0.8348478633,-0.8338858221,-0.8329212407,-0.8319541221,-0.8309844693,
-	-0.8300122851,-0.8290375726,-0.8280603346,-0.8270805743,-0.8260982945,
-	-0.8251134983,-0.8241261886,-0.8231363685,-0.8221440410,-0.8211492091,
-	-0.8201518759,-0.8191520443,-0.8181497174,-0.8171448983,-0.8161375901,
-	-0.8151277957,-0.8141155184,-0.8131007610,-0.8120835269,-0.8110638190,
-	-0.8100416404,-0.8090169944,-0.8079898839,-0.8069603121,-0.8059282822,
-	-0.8048937974,-0.8038568606,-0.8028174752,-0.8017756442,-0.8007313709,
-	-0.7996846585,-0.7986355100,-0.7975839288,-0.7965299180,-0.7954734809,
-	-0.7944146205,-0.7933533403,-0.7922896434,-0.7912235330,-0.7901550124,
-	-0.7890840848,-0.7880107536,-0.7869350220,-0.7858568932,-0.7847763705,
-	-0.7836934573,-0.7826081569,-0.7815204724,-0.7804304073,-0.7793379649,
-	-0.7782431485,-0.7771459615,-0.7760464071,-0.7749444887,-0.7738402097,
-	-0.7727335735,-0.7716245834,-0.7705132428,-0.7693995550,-0.7682835236,
-	-0.7671651518,-0.7660444431,-0.7649214009,-0.7637960286,-0.7626683297,
-	-0.7615383075,-0.7604059656,-0.7592713073,-0.7581343362,-0.7569950557,
-	-0.7558534692,-0.7547095802,-0.7535633923,-0.7524149089,-0.7512641335,
-	-0.7501110696,-0.7489557208,-0.7477980905,-0.7466381823,-0.7454759997,
-	-0.7443115462,-0.7431448255,-0.7419758410,-0.7408045963,-0.7396310950,
-	-0.7384553406,-0.7372773368,-0.7360970871,-0.7349145951,-0.7337298645,
-	-0.7325428988,-0.7313537016,-0.7301622766,-0.7289686274,-0.7277727577,
-	-0.7265746710,-0.7253743710,-0.7241718614,-0.7229671459,-0.7217602281,
-	-0.7205511117,-0.7193398003,-0.7181262978,-0.7169106077,-0.7156927337,
-	-0.7144726796,-0.7132504492,-0.7120260460,-0.7107994739,-0.7095707365,
-	-0.7083398377,-0.7071067812,-0.7058715707,-0.7046342100,-0.7033947028,
-	-0.7021530530,-0.7009092643,-0.6996633405,-0.6984152854,-0.6971651029,
-	-0.6959127966,-0.6946583705,-0.6934018283,-0.6921431739,-0.6908824111,
-	-0.6896195437,-0.6883545757,-0.6870875108,-0.6858183529,-0.6845471059,
-	-0.6832737737,-0.6819983601,-0.6807208690,-0.6794413043,-0.6781596699,
-	-0.6768759697,-0.6755902076,-0.6743023876,-0.6730125135,-0.6717205893,
-	-0.6704266190,-0.6691306064,-0.6678325555,-0.6665324702,-0.6652303547,
-	-0.6639262127,-0.6626200482,-0.6613118653,-0.6600016680,-0.6586894601,
-	-0.6573752458,-0.6560590290,-0.6547408137,-0.6534206040,-0.6520984038,
-	-0.6507742173,-0.6494480483,-0.6481199011,-0.6467897795,-0.6454576877,
-	-0.6441236298,-0.6427876097,-0.6414496316,-0.6401096995,-0.6387678175,
-	-0.6374239897,-0.6360782203,-0.6347305132,-0.6333808726,-0.6320293027,
-	-0.6306758074,-0.6293203910,-0.6279630576,-0.6266038114,-0.6252426563,
-	-0.6238795967,-0.6225146366,-0.6211477803,-0.6197790318,-0.6184083954,
-	-0.6170358751,-0.6156614753,-0.6142852001,-0.6129070537,-0.6115270402,
-	-0.6101451639,-0.6087614290,-0.6073758397,-0.6059884003,-0.6045991149,
-	-0.6032079877,-0.6018150232,-0.6004202253,-0.5990235985,-0.5976251470,
-	-0.5962248750,-0.5948227868,-0.5934188866,-0.5920131788,-0.5906056676,
-	-0.5891963574,-0.5877852523,-0.5863723567,-0.5849576750,-0.5835412114,
-	-0.5821229702,-0.5807029557,-0.5792811723,-0.5778576244,-0.5764323162,
-	-0.5750052520,-0.5735764364,-0.5721458734,-0.5707135677,-0.5692795234,
-	-0.5678437451,-0.5664062369,-0.5649670034,-0.5635260489,-0.5620833779,
-	-0.5606389946,-0.5591929035,-0.5577451090,-0.5562956155,-0.5548444274,
-	-0.5533915492,-0.5519369853,-0.5504807401,-0.5490228180,-0.5475632235,
-	-0.5461019610,-0.5446390350,-0.5431744500,-0.5417082103,-0.5402403205,
-	-0.5387707850,-0.5372996083,-0.5358267950,-0.5343523494,-0.5328762761,
-	-0.5313985795,-0.5299192642,-0.5284383347,-0.5269557955,-0.5254716511,
-	-0.5239859060,-0.5224985647,-0.5210096318,-0.5195191119,-0.5180270094,
-	-0.5165333289,-0.5150380749,-0.5135412521,-0.5120428649,-0.5105429179,
-	-0.5090414158,-0.5075383630,-0.5060337641,-0.5045276238,-0.5030199466,
-	-0.5015107372,-0.5000000000,-0.4984877398,-0.4969739610,-0.4954586684,
-	-0.4939418666,-0.4924235601,-0.4909037536,-0.4893824517,-0.4878596591,
-	-0.4863353804,-0.4848096202,-0.4832823833,-0.4817536741,-0.4802234974,
-	-0.4786918579,-0.4771587603,-0.4756242091,-0.4740882090,-0.4725507649,
-	-0.4710118812,-0.4694715628,-0.4679298143,-0.4663866403,-0.4648420457,
-	-0.4632960351,-0.4617486132,-0.4601997848,-0.4586495545,-0.4570979271,
-	-0.4555449072,-0.4539904997,-0.4524347093,-0.4508775407,-0.4493189986,
-	-0.4477590878,-0.4461978131,-0.4446351792,-0.4430711908,-0.4415058528,
-	-0.4399391699,-0.4383711468,-0.4368017884,-0.4352310994,-0.4336590846,
-	-0.4320857488,-0.4305110968,-0.4289351334,-0.4273578634,-0.4257792916,
-	-0.4241994227,-0.4226182617,-0.4210358134,-0.4194520824,-0.4178670738,
-	-0.4162807923,-0.4146932427,-0.4131044298,-0.4115143586,-0.4099230338,
-	-0.4083304604,-0.4067366431,-0.4051415868,-0.4035452964,-0.4019477767,
-	-0.4003490326,-0.3987490689,-0.3971478906,-0.3955455026,-0.3939419096,
-	-0.3923371166,-0.3907311285,-0.3891239501,-0.3875155865,-0.3859060423,
-	-0.3842953227,-0.3826834324,-0.3810703764,-0.3794561595,-0.3778407868,
-	-0.3762242631,-0.3746065934,-0.3729877826,-0.3713678356,-0.3697467573,
-	-0.3681245527,-0.3665012267,-0.3648767843,-0.3632512305,-0.3616245701,
-	-0.3599968081,-0.3583679495,-0.3567379993,-0.3551069624,-0.3534748438,
-	-0.3518416484,-0.3502073813,-0.3485720473,-0.3469356516,-0.3452981990,
-	-0.3436596946,-0.3420201433,-0.3403795502,-0.3387379202,-0.3370952584,
-	-0.3354515698,-0.3338068592,-0.3321611319,-0.3305143927,-0.3288666467,
-	-0.3272178990,-0.3255681545,-0.3239174182,-0.3222656952,-0.3206129906,
-	-0.3189593093,-0.3173046564,-0.3156490369,-0.3139924560,-0.3123349185,
-	-0.3106764296,-0.3090169944,-0.3073566178,-0.3056953050,-0.3040330609,
-	-0.3023698908,-0.3007057995,-0.2990407923,-0.2973748741,-0.2957080500,
-	-0.2940403252,-0.2923717047,-0.2907021936,-0.2890317969,-0.2873605198,
-	-0.2856883674,-0.2840153447,-0.2823414568,-0.2806667089,-0.2789911060,
-	-0.2773146533,-0.2756373558,-0.2739592187,-0.2722802470,-0.2706004460,
-	-0.2689198206,-0.2672383761,-0.2655561175,-0.2638730500,-0.2621891786,
-	-0.2605045086,-0.2588190451,-0.2571327932,-0.2554457579,-0.2537579446,
-	-0.2520693582,-0.2503800041,-0.2486898872,-0.2469990127,-0.2453073859,
-	-0.2436150118,-0.2419218956,-0.2402280425,-0.2385334576,-0.2368381461,
-	-0.2351421131,-0.2334453639,-0.2317479035,-0.2300497372,-0.2283508701,
-	-0.2266513074,-0.2249510543,-0.2232501160,-0.2215484976,-0.2198462044,
-	-0.2181432414,-0.2164396139,-0.2147353272,-0.2130303863,-0.2113247965,
-	-0.2096185629,-0.2079116908,-0.2062041854,-0.2044960518,-0.2027872954,
-	-0.2010779211,-0.1993679344,-0.1976573404,-0.1959461442,-0.1942343512,
-	-0.1925219665,-0.1908089954,-0.1890954430,-0.1873813146,-0.1856666154,
-	-0.1839513506,-0.1822355255,-0.1805191453,-0.1788022151,-0.1770847403,
-	-0.1753667261,-0.1736481777,-0.1719291003,-0.1702094992,-0.1684893796,
-	-0.1667687467,-0.1650476059,-0.1633259622,-0.1616038211,-0.1598811877,
-	-0.1581580673,-0.1564344650,-0.1547103863,-0.1529858363,-0.1512608202,
-	-0.1495353434,-0.1478094111,-0.1460830286,-0.1443562010,-0.1426289337,
-	-0.1409012319,-0.1391731010,-0.1374445460,-0.1357155724,-0.1339861854,
-	-0.1322563903,-0.1305261922,-0.1287955966,-0.1270646086,-0.1253332336,
-	-0.1236014767,-0.1218693434,-0.1201368388,-0.1184039683,-0.1166707371,
-	-0.1149371505,-0.1132032138,-0.1114689322,-0.1097343111,-0.1079993557,
-	-0.1062640713,-0.1045284633,-0.1027925368,-0.1010562972,-0.0993197497,
-	-0.0975828998,-0.0958457525,-0.0941083133,-0.0923705874,-0.0906325802,
-	-0.0888942969,-0.0871557427,-0.0854169231,-0.0836778433,-0.0819385086,
-	-0.0801989243,-0.0784590957,-0.0767190281,-0.0749787268,-0.0732381971,
-	-0.0714974443,-0.0697564737,-0.0680152907,-0.0662739004,-0.0645323083,
-	-0.0627905195,-0.0610485395,-0.0593063736,-0.0575640270,-0.0558215050,
-	-0.0540788130,-0.0523359562,-0.0505929401,-0.0488497698,-0.0471064507,
-	-0.0453629881,-0.0436193874,-0.0418756537,-0.0401317925,-0.0383878091,
-	-0.0366437087,-0.0348994967,-0.0331551784,-0.0314107591,-0.0296662441,
-	-0.0279216387,-0.0261769483,-0.0244321782,-0.0226873336,-0.0209424199,
-	-0.0191974424,-0.0174524064,-0.0157073173,-0.0139621803,-0.0122170008,
-	-0.0104717841,-0.0087265355,-0.0069812603,-0.0052359638,-0.0034906514,
-	-0.0017453284,-0.0000000000,0.0017453284,0.0034906514,0.0052359638,
-	0.0069812603,0.0087265355,0.0104717841,0.0122170008,0.0139621803,
-	0.0157073173,0.0174524064,0.0191974424,0.0209424199,0.0226873336,
-	0.0244321782,0.0261769483,0.0279216387,0.0296662441,0.0314107591,
-	0.0331551784,0.0348994967,0.0366437087,0.0383878091,0.0401317925,
-	0.0418756537,0.0436193874,0.0453629881,0.0471064507,0.0488497698,
-	0.0505929401,0.0523359562,0.0540788130,0.0558215050,0.0575640270,
-	0.0593063736,0.0610485395,0.0627905195,0.0645323083,0.0662739004,
-	0.0680152907,0.0697564737,0.0714974443,0.0732381971,0.0749787268,
-	0.0767190281,0.0784590957,0.0801989243,0.0819385086,0.0836778433,
-	0.0854169231,0.0871557427,0.0888942969,0.0906325802,0.0923705874,
-	0.0941083133,0.0958457525,0.0975828998,0.0993197497,0.1010562972,
-	0.1027925368,0.1045284633,0.1062640713,0.1079993557,0.1097343111,
-	0.1114689322,0.1132032138,0.1149371505,0.1166707371,0.1184039683,
-	0.1201368388,0.1218693434,0.1236014767,0.1253332336,0.1270646086,
-	0.1287955966,0.1305261922,0.1322563903,0.1339861854,0.1357155724,
-	0.1374445460,0.1391731010,0.1409012319,0.1426289337,0.1443562010,
-	0.1460830286,0.1478094111,0.1495353434,0.1512608202,0.1529858363,
-	0.1547103863,0.1564344650,0.1581580673,0.1598811877,0.1616038211,
-	0.1633259622,0.1650476059,0.1667687467,0.1684893796,0.1702094992,
-	0.1719291003,0.1736481777,0.1753667261,0.1770847403,0.1788022151,
-	0.1805191453,0.1822355255,0.1839513506,0.1856666154,0.1873813146,
-	0.1890954430,0.1908089954,0.1925219665,0.1942343512,0.1959461442,
-	0.1976573404,0.1993679344,0.2010779211,0.2027872954,0.2044960518,
-	0.2062041854,0.2079116908,0.2096185629,0.2113247965,0.2130303863,
-	0.2147353272,0.2164396139,0.2181432414,0.2198462044,0.2215484976,
-	0.2232501160,0.2249510543,0.2266513074,0.2283508701,0.2300497372,
-	0.2317479035,0.2334453639,0.2351421131,0.2368381461,0.2385334576,
-	0.2402280425,0.2419218956,0.2436150118,0.2453073859,0.2469990127,
-	0.2486898872,0.2503800041,0.2520693582,0.2537579446,0.2554457579,
-	0.2571327932,0.2588190451,0.2605045086,0.2621891786,0.2638730500,
-	0.2655561175,0.2672383761,0.2689198206,0.2706004460,0.2722802470,
-	0.2739592187,0.2756373558,0.2773146533,0.2789911060,0.2806667089,
-	0.2823414568,0.2840153447,0.2856883674,0.2873605198,0.2890317969,
-	0.2907021936,0.2923717047,0.2940403252,0.2957080500,0.2973748741,
-	0.2990407923,0.3007057995,0.3023698908,0.3040330609,0.3056953050,
-	0.3073566178,0.3090169944,0.3106764296,0.3123349185,0.3139924560,
-	0.3156490369,0.3173046564,0.3189593093,0.3206129906,0.3222656952,
-	0.3239174182,0.3255681545,0.3272178990,0.3288666467,0.3305143927,
-	0.3321611319,0.3338068592,0.3354515698,0.3370952584,0.3387379202,
-	0.3403795502,0.3420201433,0.3436596946,0.3452981990,0.3469356516,
-	0.3485720473,0.3502073813,0.3518416484,0.3534748438,0.3551069624,
-	0.3567379993,0.3583679495,0.3599968081,0.3616245701,0.3632512305,
-	0.3648767843,0.3665012267,0.3681245527,0.3697467573,0.3713678356,
-	0.3729877826,0.3746065934,0.3762242631,0.3778407868,0.3794561595,
-	0.3810703764,0.3826834324,0.3842953227,0.3859060423,0.3875155865,
-	0.3891239501,0.3907311285,0.3923371166,0.3939419096,0.3955455026,
-	0.3971478906,0.3987490689,0.4003490326,0.4019477767,0.4035452964,
-	0.4051415868,0.4067366431,0.4083304604,0.4099230338,0.4115143586,
-	0.4131044298,0.4146932427,0.4162807923,0.4178670738,0.4194520824,
-	0.4210358134,0.4226182617,0.4241994227,0.4257792916,0.4273578634,
-	0.4289351334,0.4305110968,0.4320857488,0.4336590846,0.4352310994,
-	0.4368017884,0.4383711468,0.4399391699,0.4415058528,0.4430711908,
-	0.4446351792,0.4461978131,0.4477590878,0.4493189986,0.4508775407,
-	0.4524347093,0.4539904997,0.4555449072,0.4570979271,0.4586495545,
-	0.4601997848,0.4617486132,0.4632960351,0.4648420457,0.4663866403,
-	0.4679298143,0.4694715628,0.4710118812,0.4725507649,0.4740882090,
-	0.4756242091,0.4771587603,0.4786918579,0.4802234974,0.4817536741,
-	0.4832823833,0.4848096202,0.4863353804,0.4878596591,0.4893824517,
-	0.4909037536,0.4924235601,0.4939418666,0.4954586684,0.4969739610,
-	0.4984877398,0.5000000000,0.5015107372,0.5030199466,0.5045276238,
-	0.5060337641,0.5075383630,0.5090414158,0.5105429179,0.5120428649,
-	0.5135412521,0.5150380749,0.5165333289,0.5180270094,0.5195191119,
-	0.5210096318,0.5224985647,0.5239859060,0.5254716511,0.5269557955,
-	0.5284383347,0.5299192642,0.5313985795,0.5328762761,0.5343523494,
-	0.5358267950,0.5372996083,0.5387707850,0.5402403205,0.5417082103,
-	0.5431744500,0.5446390350,0.5461019610,0.5475632235,0.5490228180,
-	0.5504807401,0.5519369853,0.5533915492,0.5548444274,0.5562956155,
-	0.5577451090,0.5591929035,0.5606389946,0.5620833779,0.5635260489,
-	0.5649670034,0.5664062369,0.5678437451,0.5692795234,0.5707135677,
-	0.5721458734,0.5735764364,0.5750052520,0.5764323162,0.5778576244,
-	0.5792811723,0.5807029557,0.5821229702,0.5835412114,0.5849576750,
-	0.5863723567,0.5877852523,0.5891963574,0.5906056676,0.5920131788,
-	0.5934188866,0.5948227868,0.5962248750,0.5976251470,0.5990235985,
-	0.6004202253,0.6018150232,0.6032079877,0.6045991149,0.6059884003,
-	0.6073758397,0.6087614290,0.6101451639,0.6115270402,0.6129070537,
-	0.6142852001,0.6156614753,0.6170358751,0.6184083954,0.6197790318,
-	0.6211477803,0.6225146366,0.6238795967,0.6252426563,0.6266038114,
-	0.6279630576,0.6293203910,0.6306758074,0.6320293027,0.6333808726,
-	0.6347305132,0.6360782203,0.6374239897,0.6387678175,0.6401096995,
-	0.6414496316,0.6427876097,0.6441236298,0.6454576877,0.6467897795,
-	0.6481199011,0.6494480483,0.6507742173,0.6520984038,0.6534206040,
-	0.6547408137,0.6560590290,0.6573752458,0.6586894601,0.6600016680,
-	0.6613118653,0.6626200482,0.6639262127,0.6652303547,0.6665324702,
-	0.6678325555,0.6691306064,0.6704266190,0.6717205893,0.6730125135,
-	0.6743023876,0.6755902076,0.6768759697,0.6781596699,0.6794413043,
-	0.6807208690,0.6819983601,0.6832737737,0.6845471059,0.6858183529,
-	0.6870875108,0.6883545757,0.6896195437,0.6908824111,0.6921431739,
-	0.6934018283,0.6946583705,0.6959127966,0.6971651029,0.6984152854,
-	0.6996633405,0.7009092643,0.7021530530,0.7033947028,0.7046342100,
-	0.7058715707,0.7071067812,0.7083398377,0.7095707365,0.7107994739,
-	0.7120260460,0.7132504492,0.7144726796,0.7156927337,0.7169106077,
-	0.7181262978,0.7193398003,0.7205511117,0.7217602281,0.7229671459,
-	0.7241718614,0.7253743710,0.7265746710,0.7277727577,0.7289686274,
-	0.7301622766,0.7313537016,0.7325428988,0.7337298645,0.7349145951,
-	0.7360970871,0.7372773368,0.7384553406,0.7396310950,0.7408045963,
-	0.7419758410,0.7431448255,0.7443115462,0.7454759997,0.7466381823,
-	0.7477980905,0.7489557208,0.7501110696,0.7512641335,0.7524149089,
-	0.7535633923,0.7547095802,0.7558534692,0.7569950557,0.7581343362,
-	0.7592713073,0.7604059656,0.7615383075,0.7626683297,0.7637960286,
-	0.7649214009,0.7660444431,0.7671651518,0.7682835236,0.7693995550,
-	0.7705132428,0.7716245834,0.7727335735,0.7738402097,0.7749444887,
-	0.7760464071,0.7771459615,0.7782431485,0.7793379649,0.7804304073,
-	0.7815204724,0.7826081569,0.7836934573,0.7847763705,0.7858568932,
-	0.7869350220,0.7880107536,0.7890840848,0.7901550124,0.7912235330,
-	0.7922896434,0.7933533403,0.7944146205,0.7954734809,0.7965299180,
-	0.7975839288,0.7986355100,0.7996846585,0.8007313709,0.8017756442,
-	0.8028174752,0.8038568606,0.8048937974,0.8059282822,0.8069603121,
-	0.8079898839,0.8090169944,0.8100416404,0.8110638190,0.8120835269,
-	0.8131007610,0.8141155184,0.8151277957,0.8161375901,0.8171448983,
-	0.8181497174,0.8191520443,0.8201518759,0.8211492091,0.8221440410,
-	0.8231363685,0.8241261886,0.8251134983,0.8260982945,0.8270805743,
-	0.8280603346,0.8290375726,0.8300122851,0.8309844693,0.8319541221,
-	0.8329212407,0.8338858221,0.8348478633,0.8358073614,0.8367643135,
-	0.8377187166,0.8386705679,0.8396198645,0.8405666035,0.8415107819,
-	0.8424523970,0.8433914458,0.8443279255,0.8452618332,0.8461931661,
-	0.8471219214,0.8480480962,0.8489716876,0.8498926930,0.8508111094,
-	0.8517269341,0.8526401644,0.8535507973,0.8544588301,0.8553642602,
-	0.8562670846,0.8571673007,0.8580649057,0.8589598969,0.8598522716,
-	0.8607420270,0.8616291604,0.8625136692,0.8633955506,0.8642748020,
-	0.8651514206,0.8660254038,0.8668967489,0.8677654534,0.8686315144,
-	0.8694949295,0.8703556959,0.8712138111,0.8720692724,0.8729220773,
-	0.8737722230,0.8746197071,0.8754645270,0.8763066800,0.8771461637,
-	0.8779829754,0.8788171127,0.8796485729,0.8804773535,0.8813034521,
-	0.8821268660,0.8829475929,0.8837656301,0.8845809752,0.8853936258,
-	0.8862035792,0.8870108332,0.8878153851,0.8886172327,0.8894163733,
-	0.8902128046,0.8910065242,0.8917975296,0.8925858185,0.8933713883,
-	0.8941542368,0.8949343616,0.8957117602,0.8964864304,0.8972583697,
-	0.8980275758,0.8987940463,0.8995577790,0.9003187714,0.9010770213,
-	0.9018325264,0.9025852843,0.9033352929,0.9040825497,0.9048270525,
-	0.9055687990,0.9063077870,0.9070440143,0.9077774785,0.9085081775,
-	0.9092361090,0.9099612709,0.9106836608,0.9114032766,0.9121201162,
-	0.9128341772,0.9135454576,0.9142539552,0.9149596678,0.9156625933,
-	0.9163627296,0.9170600744,0.9177546257,0.9184463813,0.9191353393,
-	0.9198214973,0.9205048535,0.9211854056,0.9218631516,0.9225380895,
-	0.9232102171,0.9238795325,0.9245460336,0.9252097184,0.9258705848,
-	0.9265286309,0.9271838546,0.9278362539,0.9284858269,0.9291325715,
-	0.9297764859,0.9304175680,0.9310558159,0.9316912276,0.9323238012,
-	0.9329535348,0.9335804265,0.9342044743,0.9348256764,0.9354440308,
-	0.9360595357,0.9366721892,0.9372819895,0.9378889346,0.9384930228,
-	0.9390942521,0.9396926208,0.9402881270,0.9408807690,0.9414705448,
-	0.9420574528,0.9426414911,0.9432226579,0.9438009516,0.9443763702,
-	0.9449489122,0.9455185756,0.9460853588,0.9466492601,0.9472102777,
-	0.9477684100,0.9483236552,0.9488760116,0.9494254776,0.9499720515,
-	0.9505157316,0.9510565163,0.9515944039,0.9521293927,0.9526614813,
-	0.9531906678,0.9537169507,0.9542403285,0.9547607995,0.9552783621,
-	0.9557930148,0.9563047560,0.9568135841,0.9573194975,0.9578224948,
-	0.9583225745,0.9588197349,0.9593139745,0.9598052920,0.9602936857,
-	0.9607791542,0.9612616959,0.9617413095,0.9622179935,0.9626917464,
-	0.9631625668,0.9636304532,0.9640954042,0.9645574185,0.9650164945,
-	0.9654726309,0.9659258263,0.9663760793,0.9668233886,0.9672677528,
-	0.9677091705,0.9681476404,0.9685831611,0.9690157314,0.9694453499,
-	0.9698720153,0.9702957263,0.9707164816,0.9711342799,0.9715491200,
-	0.9719610006,0.9723699204,0.9727758782,0.9731788728,0.9735789029,
-	0.9739759673,0.9743700648,0.9747611942,0.9751493543,0.9755345439,
-	0.9759167619,0.9762960071,0.9766722783,0.9770455744,0.9774158943,
-	0.9777832368,0.9781476007,0.9785089851,0.9788673888,0.9792228106,
-	0.9795752496,0.9799247046,0.9802711746,0.9806146585,0.9809551553,
-	0.9812926640,0.9816271834,0.9819587127,0.9822872507,0.9826127965,
-	0.9829353491,0.9832549076,0.9835714708,0.9838850379,0.9841956080,
-	0.9845031800,0.9848077530,0.9851093262,0.9854078985,0.9857034691,
-	0.9859960371,0.9862856015,0.9865721616,0.9868557164,0.9871362651,
-	0.9874138068,0.9876883406,0.9879598658,0.9882283814,0.9884938868,
-	0.9887563810,0.9890158634,0.9892723330,0.9895257891,0.9897762309,
-	0.9900236577,0.9902680687,0.9905094632,0.9907478405,0.9909831997,
-	0.9912155403,0.9914448614,0.9916711624,0.9918944426,0.9921147013,
-	0.9923319379,0.9925461516,0.9927573419,0.9929655081,0.9931706495,
-	0.9933727656,0.9935718557,0.9937679192,0.9939609555,0.9941509640,
-	0.9943379441,0.9945218954,0.9947028171,0.9948807088,0.9950555700,
-	0.9952274000,0.9953961984,0.9955619646,0.9957246982,0.9958843986,
-	0.9960410654,0.9961946981,0.9963452962,0.9964928592,0.9966373868,
-	0.9967788785,0.9969173337,0.9970527522,0.9971851335,0.9973144772,
-	0.9974407829,0.9975640503,0.9976842788,0.9978014683,0.9979156183,
-	0.9980267284,0.9981347984,0.9982398279,0.9983418166,0.9984407642,
-	0.9985366703,0.9986295348,0.9987193572,0.9988061373,0.9988898750,
-	0.9989705698,0.9990482216,0.9991228301,0.9991943951,0.9992629164,
-	0.9993283938,0.9993908270,0.9994502159,0.9995065604,0.9995598601,
-	0.9996101150,0.9996573250,0.9997014898,0.9997426093,0.9997806835,
-	0.9998157121,0.9998476952,0.9998766325,0.9999025240,0.9999253697,
-	0.9999451694,0.9999619231,0.9999756307,0.9999862922,0.9999939077,
-	0.9999984769}
-#endif	
- ;
+extern float fsinus[];
+extern float fcosinus[];
 
 #endif
-
-
diff --git a/include/wxEeschemaStruct.h b/include/wxEeschemaStruct.h
index f128746c93..a670c8c57f 100644
--- a/include/wxEeschemaStruct.h
+++ b/include/wxEeschemaStruct.h
@@ -6,7 +6,13 @@
 #ifndef  WX_EESCHEMA_STRUCT_H
 #define  WX_EESCHEMA_STRUCT_H
 
+#include "wxstruct.h"
 
+
+class WinEDA_LibeditFrame;
+class WinEDA_ViewlibFrame;
+class SCH_SCREEN;
+class DRAWSEGMENT;
 class DrawPickedStruct;
 class SCH_ITEM;
 class DrawNoConnectStruct;
diff --git a/include/wxPcbStruct.h b/include/wxPcbStruct.h
index 4948a8da69..35f79031eb 100644
--- a/include/wxPcbStruct.h
+++ b/include/wxPcbStruct.h
@@ -9,6 +9,8 @@
 
 #include <vector>
 
+#include "wxstruct.h"
+#include "base_struct.h"
 
 #ifndef PCB_INTERNAL_UNIT
 #define PCB_INTERNAL_UNIT 10000
@@ -16,19 +18,12 @@
 
 
 /*  Forward declarations of classes. */
-class WinEDA_DrawPanel;
-class WinEDA_DrawFrame;
-
-#include "base_struct.h"
-
 class PCB_SCREEN;
 class WinEDA_GerberFrame;       // GERBER viewer main frame
 class WinEDA_Toolbar;
 class WinEDA_CvpcbFrame;
 class WinEDA_PcbFrame;
 class WinEDA_ModuleEditFrame;
-
-// Used but not defined here:
 class BOARD;
 class TEXTE_PCB;
 class MODULE;
@@ -43,6 +38,9 @@ class EDGE_MODULE;
 class WinEDA3D_DrawFrame;
 class DRC;
 class ZONE_CONTAINER;
+class DRAWSEGMENT;
+class GENERAL_COLLECTOR;
+class GENERAL_COLLECTORS_GUIDE;
 
 
 /******************************************************************/
diff --git a/include/wxstruct.h b/include/wxstruct.h
index f122161027..c5101edd0a 100644
--- a/include/wxstruct.h
+++ b/include/wxstruct.h
@@ -13,17 +13,13 @@
 
 #include <vector>
 
+
 #include <wx/socket.h>
 #include "wx/log.h"
 #include "wx/config.h"
 #include <wx/wxhtml.h>
 #include <wx/laywin.h>
-#include <wx/snglinst.h>
 
-#include "base_struct.h"
-#include "appl_wxstruct.h"
-#include "class_drawpanel.h"
-#include "class_base_screen.h"
 
 //C++ guarantees that operator delete checks its argument for null-ness
 #ifndef SAFE_DELETE
@@ -43,40 +39,17 @@
 
 #define KICAD_DEFAULT_DRAWFRAME_STYLE wxDEFAULT_FRAME_STYLE | wxWANTS_CHARS
 
-class wxMyDialogModalData;
-
 /*  Forward declarations of classes. */
+class EDA_BaseStruct;
+class EDA_Rect;
 class WinEDA_DrawPanel;
-class WinEDA_DrawFrame;
-
-class WinEDA_App;
 class WinEDA_MsgPanel;
-class COMMAND;
-class WinEDA_MainFrame;
 class BASE_SCREEN;
-class SCH_SCREEN;
-class PCB_SCREEN;
-class WinEDA_SchematicFrame;    // Schematic main frame
-class WinEDA_LibeditFrame;      // Component creation and edition main frame
-class WinEDA_ViewlibFrame;      // Component viewer main frame
-class WinEDA_GerberFrame;       // GERBER viewer main frame
 class WinEDA_Toolbar;
-class WinEDA_CvpcbFrame;
-class WinEDA_PcbFrame;
-class WinEDA_ModuleEditFrame;
 class WinEDAChoiceBox;
-#define WinEDA_MenuBar  wxMenuBar
-#define WinEDA_Menu     wxMenu
-#define WinEDA_MenuItem wxMenuItem
-
-// Used but not defined here:
-class DRAWSEGMENT;
-class WinEDA3D_DrawFrame;
 class PARAM_CFG_BASE;
 class Ki_PageDescr;
 class Ki_HotkeyInfo;
-class GENERAL_COLLECTOR;
-class GENERAL_COLLECTORS_GUIDE;
 
 enum id_librarytype {
     LIBRARY_TYPE_EESCHEMA,
diff --git a/kicad/buildmnu.cpp b/kicad/buildmnu.cpp
index 4d9fe37c8b..ac8a74e2fc 100644
--- a/kicad/buildmnu.cpp
+++ b/kicad/buildmnu.cpp
@@ -7,11 +7,10 @@
 /*****************************************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
-
 #include "kicad.h"
 #include "macros.h"
-
 #include "bitmaps.h"        // Common bitmaps
 #include "id.h"
 
diff --git a/kicad/files-io.cpp b/kicad/files-io.cpp
index c5164d59e2..0d8ba9ac2e 100644
--- a/kicad/files-io.cpp
+++ b/kicad/files-io.cpp
@@ -7,16 +7,18 @@
 #endif
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include <wx/fs_zip.h>
 #include <wx/docview.h>
 #include <wx/wfstream.h>
 #include <wx/zstream.h>
 
 #include "common.h"
-
 #include "bitmaps.h"
-#include "protos.h"
+#include "confirm.h"
+#include "gestfich.h"
 
+#include "protos.h"
 #include "id.h"
 
 #include "kicad.h"
diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp
index 800d2e404d..37879cb5cb 100644
--- a/kicad/kicad.cpp
+++ b/kicad/kicad.cpp
@@ -12,9 +12,12 @@
 #endif
 
 #define MAIN
-#define eda_global
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
+#include "common.h"
+#include "bitmaps.h"
+#include "colors.h"
 
 #ifdef USE_SPLASH_IMAGE
   #define SPLASH_IMAGE logo_kicad.png
@@ -22,8 +25,6 @@
   #include "wx/mediactrl.h"
 #endif
 
-#include "common.h"
-#include "bitmaps.h"
 #include "kicad.h"
 #include "macros.h"
 
@@ -31,6 +32,12 @@
  #include <pyhandler.h>
 #endif
 
+/* Global definitions for Kicad */
+wxString g_Main_Title = wxT( "KiCad" );
+wxString g_SchematicRootFileName;
+wxString g_BoardFileName;
+
+
 /* Export functions */
 
 /* Import functions */
diff --git a/kicad/kicad.h b/kicad/kicad.h
index 16693ef56b..c9533a4e4a 100644
--- a/kicad/kicad.h
+++ b/kicad/kicad.h
@@ -13,12 +13,11 @@
 #include <vector>
 #include <wx/dragimag.h>
 
+#include "wxstruct.h"
+
+
 /* Message de presentation */
-eda_global wxString g_Main_Title
-#ifdef MAIN
-= wxT( "KiCad" )
-#endif
-;
+extern wxString g_Main_Title;
 
 class WinEDA_CommandFrame;
 class WinEDA_TreePrj;
@@ -350,8 +349,8 @@ private:
 };
 
 
-eda_global wxString g_SchematicRootFileName;
-eda_global wxString g_BoardFileName;
+extern wxString g_SchematicRootFileName;
+extern wxString g_BoardFileName;
 
 #ifdef MAIN
 wxString            g_SchExtBuffer( wxT( ".sch" ) );
@@ -360,10 +359,10 @@ wxString            g_NetlistExtBuffer( wxT( ".net" ) );
 wxString            g_GerberExtBuffer( wxT( ".pho" ) );
 
 #else
-eda_global wxString g_SchExtBuffer;
-eda_global wxString g_BoardExtBuffer;
-eda_global wxString g_NetlistExtBuffer;
-eda_global wxString g_GerberExtBuffer;
+extern wxString g_SchExtBuffer;
+extern wxString g_BoardExtBuffer;
+extern wxString g_NetlistExtBuffer;
+extern wxString g_GerberExtBuffer;
 #endif
 
 #endif
diff --git a/kicad/mainframe.cpp b/kicad/mainframe.cpp
index ccd39ad3f4..120f15b3c2 100644
--- a/kicad/mainframe.cpp
+++ b/kicad/mainframe.cpp
@@ -11,8 +11,10 @@
 #endif
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 
 #include "bitmaps.h"
 #include "protos.h"
diff --git a/kicad/preferences.cpp b/kicad/preferences.cpp
index 4894b40503..fb6a0b3459 100644
--- a/kicad/preferences.cpp
+++ b/kicad/preferences.cpp
@@ -7,12 +7,13 @@
 #endif
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 
 #include "bitmaps.h"
 #include "protos.h"
-
 #include "id.h"
 
 #include "kicad.h"
diff --git a/kicad/prjconfig.cpp b/kicad/prjconfig.cpp
index c1cf85a638..4f6c212d19 100644
--- a/kicad/prjconfig.cpp
+++ b/kicad/prjconfig.cpp
@@ -8,13 +8,36 @@
 #endif
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "kicad.h"
 #include "protos.h"
 #include "prjconfig.h"
 
 
 /* Variables locales */
+PARAM_CFG_WXSTRING SchematicRootFileNameCfg
+(
+	wxT("RootSch"),			  /* identification */
+	&g_SchematicRootFileName /* Adresse du parametre */
+);
+
+PARAM_CFG_WXSTRING BoardFileNameCfg
+(
+	wxT("BoardNm"),		/* identification */
+	&g_BoardFileName	/* Adresse du parametre */
+);
+
+
+PARAM_CFG_BASE * CfgParamList[] =
+{
+	& SchematicRootFileNameCfg,
+	& BoardFileNameCfg,
+	NULL
+};
+
 
 
 /*******************************************/
diff --git a/kicad/prjconfig.h b/kicad/prjconfig.h
index b12533599c..7ff1de89b9 100644
--- a/kicad/prjconfig.h
+++ b/kicad/prjconfig.h
@@ -5,24 +5,5 @@
 
 
 /* Liste des parametres */
-
-static PARAM_CFG_WXSTRING SchematicRootFileNameCfg
-(
-	wxT("RootSch"),			  /* identification */
-	&g_SchematicRootFileName /* Adresse du parametre */
-);
-
-static PARAM_CFG_WXSTRING BoardFileNameCfg
-(
-	wxT("BoardNm"),		/* identification */
-	&g_BoardFileName	/* Adresse du parametre */
-);
-
-
-static PARAM_CFG_BASE * CfgParamList[] =
-{
-	& SchematicRootFileNameCfg,
-	& BoardFileNameCfg,
-	NULL
-};
+extern PARAM_CFG_BASE* CfgParamList[];
 
diff --git a/kicad/treeprj_datas.cpp b/kicad/treeprj_datas.cpp
index d3d2b8b670..b2b0b5c365 100644
--- a/kicad/treeprj_datas.cpp
+++ b/kicad/treeprj_datas.cpp
@@ -9,6 +9,7 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "gestfich.h"
 
 #include "kicad.h"
 #include "protos.h"
@@ -32,8 +33,9 @@ IMPLEMENT_ABSTRACT_CLASS( WinEDA_TreePrj, wxTreeCtrl )
 
 WinEDA_TreePrj::WinEDA_TreePrj( WinEDA_PrjFrame* parent ) :
     wxTreeCtrl( parent, ID_PROJECT_TREE,
-               wxDefaultPosition, wxDefaultSize,
-               wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS, wxDefaultValidator, wxT( "EDATreeCtrl" ) )
+                wxDefaultPosition, wxDefaultSize,
+                wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS, wxDefaultValidator,
+                wxT( "EDATreeCtrl" ) )
 {
     m_Parent = parent;
 
diff --git a/kicad/treeprj_frame.cpp b/kicad/treeprj_frame.cpp
index 4b450e3cb2..2025ec1986 100644
--- a/kicad/treeprj_frame.cpp
+++ b/kicad/treeprj_frame.cpp
@@ -11,6 +11,8 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 
 #include "kicad.h"
 #include "protos.h"
@@ -30,9 +32,9 @@
 #define ADD_FILES_IN_SUBDIRS
 
 // list of files extensions listed in the tree project window
-// *.sch files are always allowed, do not add here 
+// *.sch files are always allowed, do not add here
 // Add extensions in a compatible regex format to see others files types
-const wxChar * s_AllowedExtensionsToList[] =
+const wxChar* s_AllowedExtensionsToList[] =
 {
     wxT( "^.*\\.pro$" ),
     wxT( "^.*\\.pdf$" ),
@@ -48,7 +50,6 @@ const wxChar * s_AllowedExtensionsToList[] =
 };
 
 
-
 /**
  * @brief TODO
  */
@@ -56,30 +57,31 @@ const wxChar * s_AllowedExtensionsToList[] =
 WinEDA_PrjFrame::WinEDA_PrjFrame( WinEDA_MainFrame* parent,
                                   const wxPoint&    pos,
                                   const wxSize&     size ) :
-              wxSashLayoutWindow( parent,
-                                  ID_LEFT_FRAME,
-                                  pos,
-                                  size,
-                                  wxNO_BORDER | wxSW_3D )
+    wxSashLayoutWindow( parent,
+                        ID_LEFT_FRAME,
+                        pos,
+                        size,
+                        wxNO_BORDER | wxSW_3D )
 /******************************************************************/
 {
-  m_Parent      = parent;
-  m_TreeProject = NULL;
-  wxMenuItem* item;
-  m_PopupMenu = NULL;
+    m_Parent = parent;
+    m_TreeProject = NULL;
+    wxMenuItem* item;
+    m_PopupMenu = NULL;
 
-  /* 
-   * Filtering is now inverted: the filters are actually used to _enable_ support
-   * for a given file type.
-   */
+    /*
+     * Filtering is now inverted: the filters are actually used to _enable_ support
+     * for a given file type.
+     */
 
-  // NOTE: sch filter must be first because of a test in AddFile() below
-  m_Filters.push_back( wxT( "^.*\\.sch$" ) );
-  for ( int ii = 0; s_AllowedExtensionsToList[ii] != NULL; ii++ )
-  {
-    m_Filters.push_back( s_AllowedExtensionsToList[ii] );
-  }
-  m_Filters.push_back( wxT( "^no kicad files found" ) );
+    // NOTE: sch filter must be first because of a test in AddFile() below
+    m_Filters.push_back( wxT( "^.*\\.sch$" ) );
+    for( int ii = 0; s_AllowedExtensionsToList[ii] != NULL; ii++ )
+    {
+        m_Filters.push_back( s_AllowedExtensionsToList[ii] );
+    }
+
+    m_Filters.push_back( wxT( "^no kicad files found" ) );
 
 
   #ifdef KICAD_PYTHON
@@ -97,12 +99,12 @@ WinEDA_PrjFrame::WinEDA_PrjFrame( WinEDA_MainFrame* parent,
   #endif /* KICAD_PYTHON */
 
 
-  for( int i = 0; i < TREE_MAX; i++ )
-    m_ContextMenus.push_back( new wxMenu() );
+    for( int i = 0; i < TREE_MAX; i++ )
+        m_ContextMenus.push_back( new wxMenu() );
 
-  wxMenu* menu = m_ContextMenus[TREE_PY];
+    wxMenu* menu = m_ContextMenus[TREE_PY];
 
-  // Python script context menu
+    // Python script context menu
   #ifdef KICAD_PYTHON
     item = new wxMenuItem( menu, ID_PROJECT_RUNPY,
                            _( "&Run" ),
@@ -112,34 +114,34 @@ WinEDA_PrjFrame::WinEDA_PrjFrame( WinEDA_MainFrame* parent,
   #endif /* KICAD_PYTHON */
 
 
-  // ID_PROJECT_TXTEDIT
-  item = new wxMenuItem( menu,
-                         ID_PROJECT_TXTEDIT, 
-                         _( "&Edit in a text editor" ), 
-                         _( "&Open the file in a Text Editor" ) ); 
-  item->SetBitmap( icon_txt_xpm ); 
-  menu->Append( item ); 
+    // ID_PROJECT_TXTEDIT
+    item = new wxMenuItem( menu,
+                          ID_PROJECT_TXTEDIT,
+                          _( "&Edit in a text editor" ),
+                          _( "&Open the file in a Text Editor" ) );
+    item->SetBitmap( icon_txt_xpm );
+    menu->Append( item );
 
 
-  // New files context menu:
-  wxMenu* menus[2];
-  menus[0] = m_ContextMenus[TREE_DIRECTORY];
-  menus[1] = m_ContextMenus[TREE_PROJECT];
+    // New files context menu:
+    wxMenu* menus[2];
+    menus[0] = m_ContextMenus[TREE_DIRECTORY];
+    menus[1] = m_ContextMenus[TREE_PROJECT];
 
     for( int i = 0; i < 2; i++ )
     {
-      menu = menus[i];
+        menu = menus[i];
 
-      // ID_PROJECT_NEWDIR
-      item = new wxMenuItem( menu,
-                             ID_PROJECT_NEWDIR,
-                             _( "New D&irectory" ),
-                             _( "Create a New Directory" ) );
-      item->SetBitmap( directory_xpm );
-      menu->Append( item );
+        // ID_PROJECT_NEWDIR
+        item = new wxMenuItem( menu,
+                               ID_PROJECT_NEWDIR,
+                               _( "New D&irectory" ),
+                               _( "Create a New Directory" ) );
+        item->SetBitmap( directory_xpm );
+        menu->Append( item );
 
 
-      // ID_PROJECT_NEWPY
+        // ID_PROJECT_NEWPY
       #ifdef KICAD_PYTHON
         item = new wxMenuItem( menu,
                                ID_PROJECT_NEWPY,
@@ -150,38 +152,37 @@ WinEDA_PrjFrame::WinEDA_PrjFrame( WinEDA_MainFrame* parent,
       #endif /* KICAD_PYTHON */
 
 
-      // ID_PROJECT_NEWTXT
-      item = new wxMenuItem( menu,
-                             ID_PROJECT_NEWTXT,
-                             _( "New &Text File" ),
-                             _( "Create a New Txt File" ) );
-      item->SetBitmap( new_txt_xpm );
-      menu->Append( item );
+        // ID_PROJECT_NEWTXT
+        item = new wxMenuItem( menu,
+                               ID_PROJECT_NEWTXT,
+                               _( "New &Text File" ),
+                               _( "Create a New Txt File" ) );
+        item->SetBitmap( new_txt_xpm );
+        menu->Append( item );
 
 
-      // ID_PROJECT_NEWFILE 
-      item = new wxMenuItem( menu,
-                             ID_PROJECT_NEWFILE,
-                             _( "New &File" ),
-                             _( "Create a New File" ) );
-      item->SetBitmap( new_xpm );
-      menu->Append( item );
+        // ID_PROJECT_NEWFILE
+        item = new wxMenuItem( menu,
+                               ID_PROJECT_NEWFILE,
+                               _( "New &File" ),
+                               _( "Create a New File" ) );
+        item->SetBitmap( new_xpm );
+        menu->Append( item );
     }
 
 
     // Put the Rename and Delete file menu commands:
     for( int i = TREE_PROJECT + 1; i < TREE_MAX; i++ )
     {
-       menu = m_ContextMenus[i];
+        menu = m_ContextMenus[i];
 
-
-       // ID_PROJECT_RENAME
-       item = new wxMenuItem( menu,
+        // ID_PROJECT_RENAME
+        item = new wxMenuItem( menu,
                                ID_PROJECT_RENAME,
-                               TREE_DIRECTORY != i ? _ ("&Rename file") :
-                                                    _( "&Rename directory" ),
-                               TREE_DIRECTORY != i ? _ ("Rename file") :
-                                                    _( "&Rename directory" ) );
+                               TREE_DIRECTORY != i ? _( "&Rename file" ) :
+                               _( "&Rename directory" ),
+                               TREE_DIRECTORY != i ? _( "Rename file" ) :
+                               _( "&Rename directory" ) );
         item->SetBitmap( right_xpm );
         menu->Append( item );
 
@@ -201,39 +202,38 @@ WinEDA_PrjFrame::WinEDA_PrjFrame( WinEDA_MainFrame* parent,
         item = new wxMenuItem( menu,
                                ID_PROJECT_DELETE,
                                TREE_DIRECTORY != i ? _( "&Delete File" ) :
-                                                     _( "&Delete Directory" ),
+                               _( "&Delete Directory" ),
                                TREE_DIRECTORY != i ? _( "Delete the File" ) :
-                                                     _( "&Delete the Directory and its content" ) );
+                               _( "&Delete the Directory and its content" ) );
         item->SetBitmap( delete_xpm );
         menu->Append( item );
     }
 
-  ReCreateTreePrj();
+    ReCreateTreePrj();
 }
 
 
-
 /*****************************************************************************/
 BEGIN_EVENT_TABLE( WinEDA_PrjFrame, wxSashLayoutWindow )
 /*****************************************************************************/
 
-EVT_TREE_BEGIN_LABEL_EDIT( ID_PROJECT_TREE, WinEDA_PrjFrame::OnRenameAsk )
-EVT_TREE_END_LABEL_EDIT( ID_PROJECT_TREE, WinEDA_PrjFrame::OnRename )
-EVT_TREE_ITEM_ACTIVATED( ID_PROJECT_TREE, WinEDA_PrjFrame::OnSelect )
-EVT_TREE_ITEM_RIGHT_CLICK( ID_PROJECT_TREE, WinEDA_PrjFrame::OnRight )
-EVT_TREE_BEGIN_DRAG( ID_PROJECT_TREE, WinEDA_PrjFrame::OnDragStart )
-EVT_TREE_END_DRAG( ID_PROJECT_TREE, WinEDA_PrjFrame::OnDragEnd )
-EVT_MENU( ID_PROJECT_TXTEDIT, WinEDA_PrjFrame::OnTxtEdit )
-EVT_MENU( ID_PROJECT_NEWFILE, WinEDA_PrjFrame::OnNewFile )
-EVT_MENU( ID_PROJECT_NEWDIR, WinEDA_PrjFrame::OnNewDirectory )
-EVT_MENU( ID_PROJECT_NEWPY, WinEDA_PrjFrame::OnNewPyFile )
-EVT_MENU( ID_PROJECT_NEWTXT, WinEDA_PrjFrame::OnNewTxtFile )
-EVT_MENU( ID_PROJECT_DELETE, WinEDA_PrjFrame::OnDeleteFile )
-EVT_MENU( ID_PROJECT_RENAME, WinEDA_PrjFrame::OnRenameFile )
+    EVT_TREE_BEGIN_LABEL_EDIT( ID_PROJECT_TREE, WinEDA_PrjFrame::OnRenameAsk )
+    EVT_TREE_END_LABEL_EDIT( ID_PROJECT_TREE, WinEDA_PrjFrame::OnRename )
+    EVT_TREE_ITEM_ACTIVATED( ID_PROJECT_TREE, WinEDA_PrjFrame::OnSelect )
+    EVT_TREE_ITEM_RIGHT_CLICK( ID_PROJECT_TREE, WinEDA_PrjFrame::OnRight )
+    EVT_TREE_BEGIN_DRAG( ID_PROJECT_TREE, WinEDA_PrjFrame::OnDragStart )
+    EVT_TREE_END_DRAG( ID_PROJECT_TREE, WinEDA_PrjFrame::OnDragEnd )
+    EVT_MENU( ID_PROJECT_TXTEDIT, WinEDA_PrjFrame::OnTxtEdit )
+    EVT_MENU( ID_PROJECT_NEWFILE, WinEDA_PrjFrame::OnNewFile )
+    EVT_MENU( ID_PROJECT_NEWDIR, WinEDA_PrjFrame::OnNewDirectory )
+    EVT_MENU( ID_PROJECT_NEWPY, WinEDA_PrjFrame::OnNewPyFile )
+    EVT_MENU( ID_PROJECT_NEWTXT, WinEDA_PrjFrame::OnNewTxtFile )
+    EVT_MENU( ID_PROJECT_DELETE, WinEDA_PrjFrame::OnDeleteFile )
+    EVT_MENU( ID_PROJECT_RENAME, WinEDA_PrjFrame::OnRenameFile )
 
 
 #ifdef KICAD_PYTHON
-  EVT_MENU( ID_PROJECT_RUNPY, WinEDA_PrjFrame::OnRunPy )
+    EVT_MENU( ID_PROJECT_RUNPY, WinEDA_PrjFrame::OnRunPy )
 #endif /* KICAD_PYTHON */
 
 
@@ -242,7 +242,6 @@ END_EVENT_TABLE()
 /*****************************************************************************/
 
 
-
 /*****************************************************************************/
 WinEDA_TreePrj::~WinEDA_TreePrj()
 /*****************************************************************************/
@@ -250,7 +249,6 @@ WinEDA_TreePrj::~WinEDA_TreePrj()
 }
 
 
-
 /**
  * @brief Allowing drag & drop of file other than the currently opened project
  */
@@ -258,8 +256,8 @@ WinEDA_TreePrj::~WinEDA_TreePrj()
 void WinEDA_PrjFrame::OnDragStart( wxTreeEvent& event )
 /*****************************************************************************/
 {
-    /* Ensure item is selected 
-       (Under Windows start drag does not activate the item) */
+    /* Ensure item is selected
+     *  (Under Windows start drag does not activate the item) */
     wxTreeItemId     curr_item = event.GetItem();
 
     m_TreeProject->SelectItem( curr_item );
@@ -269,15 +267,14 @@ void WinEDA_PrjFrame::OnDragStart( wxTreeEvent& event )
 
     wxTreeItemId id = m_TreeProject->GetSelection();
 
-    wxImage      img = m_TreeProject->GetImageList()->GetBitmap( data->GetType() -
-                                                                 1 ).ConvertToImage();
+    wxImage      img =
+        m_TreeProject->GetImageList()->GetBitmap( data->GetType() - 1 ).ConvertToImage();
     m_DragCursor = wxCursor( img );
     m_Parent->wxWindow::SetCursor( (wxCursor &)m_DragCursor );
     event.Allow();
 }
 
 
-
 /*****************************************************************************/
 void WinEDA_PrjFrame::OnDragEnd( wxTreeEvent& event )
 /*****************************************************************************/
@@ -289,19 +286,23 @@ void WinEDA_PrjFrame::OnDragEnd( wxTreeEvent& event )
     wxTreeItemId     dest = event.GetItem();
     if( !dest.IsOk() )
         return;                // Cancelled ...
-    TreePrjItemData* destData = dynamic_cast<TreePrjItemData*>( m_TreeProject->GetItemData( dest ) );
+    TreePrjItemData* destData =
+        dynamic_cast<TreePrjItemData*>( m_TreeProject->GetItemData( dest ) );
     if( !destData )
         return;
 
     // the item can be a member of the selected directory; get the directory itself
-    if( TREE_DIRECTORY != destData->GetType() && !m_TreeProject->ItemHasChildren( dest ) )
-    {   // the item is a member of the selected directory; get the directory itself
+    if( TREE_DIRECTORY != destData->GetType()
+       && !m_TreeProject->ItemHasChildren( dest ) )
+    {
+        // the item is a member of the selected directory; get the directory itself
         dest = m_TreeProject->GetItemParent( dest );
         if( !dest.IsOk() )
             return;                // no parent ?
 
         // Select the right destData:
-        destData = dynamic_cast<TreePrjItemData*>( m_TreeProject->GetItemData( dest ) );
+        destData =
+            dynamic_cast<TreePrjItemData*>( m_TreeProject->GetItemData( dest ) );
         if( !destData )
             return;
     }
@@ -315,12 +316,11 @@ void WinEDA_PrjFrame::OnDragEnd( wxTreeEvent& event )
 }
 
 
-
 /*****************************************************************************/
 void WinEDA_PrjFrame::ClearFilters()
 /*****************************************************************************/
 {
-  m_Filters.clear();
+    m_Filters.clear();
 }
 
 
@@ -339,32 +339,30 @@ void WinEDA_PrjFrame::RemoveFilter( const wxString& filter )
 }
 
 
-
 #ifdef KICAD_PYTHON
 
 
-
 /**
  * @brief Return the data corresponding to the file, or NULL
  */
 /*****************************************************************************/
-TreePrjItemData* WinEDA_PrjFrame::FindItemData(const boost::python::str& name)
+TreePrjItemData* WinEDA_PrjFrame::FindItemData( const boost::python::str& name )
 /*****************************************************************************/
 {
     // (Interative tree parsing)
-    std::vector< wxTreeItemId >   roots1, roots2;
-    std::vector< wxTreeItemId > * root, * reserve;
+    std::vector< wxTreeItemId >  roots1, roots2;
+    std::vector< wxTreeItemId >* root, * reserve;
     wxString filename = PyHandler::MakeStr( name );
 
     root    = &roots1;
     reserve = &roots2;
-    
+
     root->push_back( m_TreeProject->GetRootItem() );
 
     // if we look for the root, return it ...
-    TreePrjItemData* data = dynamic_cast< TreePrjItemData*>( 
-                            m_TreeProject->GetItemData( root->at( 0 ) ) );
-    
+    TreePrjItemData* data = dynamic_cast< TreePrjItemData*>(
+        m_TreeProject->GetItemData( root->at( 0 ) ) );
+
     if( data->GetFileName() == filename )
         return data;
 
@@ -379,12 +377,12 @@ TreePrjItemData* WinEDA_PrjFrame::FindItemData(const boost::python::str& name)
             // for each root check any child:
             void*        cookie = NULL;
             wxTreeItemId child  = m_TreeProject->GetFirstChild( id, cookie );
-            
+
             while( child.IsOk() )
             {
                 TreePrjItemData* data = dynamic_cast< TreePrjItemData*>(
-                     m_TreeProject->GetItemData( child ) );
-                
+                    m_TreeProject->GetItemData( child ) );
+
                 if( data )
                 {
                     if( data->GetFileName() == filename )
@@ -398,29 +396,27 @@ TreePrjItemData* WinEDA_PrjFrame::FindItemData(const boost::python::str& name)
 
         // Swap the roots
         root->clear();
-        std::vector< wxTreeItemId > * tmp;
+        std::vector< wxTreeItemId >* tmp;
         tmp     = root;
         root    = reserve;
         reserve = tmp;
     }
 
-  return NULL;
+    return NULL;
 }
 
 
-
 /**
  * @brief TODO
  */
 /*****************************************************************************/
-void WinEDA_PrjFrame::RemoveFilterPy(const boost::python::str& filter)
+void WinEDA_PrjFrame::RemoveFilterPy( const boost::python::str& filter )
 /*****************************************************************************/
 {
-  RemoveFilter( PyHandler::MakeStr( filter ) );
+    RemoveFilter( PyHandler::MakeStr( filter ) );
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -428,16 +424,16 @@ void WinEDA_PrjFrame::RemoveFilterPy(const boost::python::str& filter)
 void WinEDA_PrjFrame::AddFilter( const boost::python::str& filter )
 /*****************************************************************************/
 {
-  wxRegEx  reg;
-  wxString text = PyHandler::MakeStr( filter );
+    wxRegEx  reg;
+    wxString text = PyHandler::MakeStr( filter );
 
-  if( !reg.Compile( text ) )
-    return;
-  m_Filters.push_back( text );
+    if( !reg.Compile( text ) )
+        return;
+    m_Filters.push_back( text );
 }
 
-#endif /* KICAD_PYTHON */
 
+#endif /* KICAD_PYTHON */
 
 
 /**
@@ -447,11 +443,10 @@ void WinEDA_PrjFrame::AddFilter( const boost::python::str& filter )
 const std::vector<wxString>& WinEDA_PrjFrame::GetFilters()
 /*****************************************************************************/
 {
-  return m_Filters;
+    return m_Filters;
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -459,11 +454,10 @@ const std::vector<wxString>& WinEDA_PrjFrame::GetFilters()
 wxMenu* WinEDA_PrjFrame::GetContextMenu( int type )
 /*****************************************************************************/
 {
-  return m_ContextMenus[type];
+    return m_ContextMenus[type];
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -475,7 +469,6 @@ void WinEDA_PrjFrame::OnNewDirectory( wxCommandEvent& event )
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -483,11 +476,10 @@ void WinEDA_PrjFrame::OnNewDirectory( wxCommandEvent& event )
 void WinEDA_PrjFrame::OnNewFile( wxCommandEvent& event )
 /*****************************************************************************/
 {
-  NewFile( TREE_UNKNOWN );
+    NewFile( TREE_UNKNOWN );
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -495,11 +487,10 @@ void WinEDA_PrjFrame::OnNewFile( wxCommandEvent& event )
 void WinEDA_PrjFrame::OnNewPyFile( wxCommandEvent& event )
 /*****************************************************************************/
 {
-  NewFile( TREE_PY );
+    NewFile( TREE_PY );
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -507,11 +498,10 @@ void WinEDA_PrjFrame::OnNewPyFile( wxCommandEvent& event )
 void WinEDA_PrjFrame::OnNewTxtFile( wxCommandEvent& event )
 /*****************************************************************************/
 {
-  NewFile( TREE_TXT );
+    NewFile( TREE_TXT );
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -519,26 +509,27 @@ void WinEDA_PrjFrame::OnNewTxtFile( wxCommandEvent& event )
 void WinEDA_PrjFrame::NewFile( TreeFileType type )
 /*****************************************************************************/
 {
-  wxString         filename;
-  wxString         mask = GetFileExt( type );
-  const wxString   sep  = wxFileName().GetPathSeparator();
+    wxString         filename;
+    wxString         mask = GetFileExt( type );
+    const wxString   sep  = wxFileName().GetPathSeparator();
 
-  // Get the directory:
-  wxString         dir;
+    // Get the directory:
+    wxString         dir;
 
-  TreePrjItemData* treeData;
-  wxString         FullFileName;
+    TreePrjItemData* treeData;
+    wxString         FullFileName;
 
 
-  treeData = GetSelectedData();
-  if( !treeData )
-    return;
+    treeData = GetSelectedData();
+    if( !treeData )
+        return;
 
-  dir = treeData->GetDir();
+    dir = treeData->GetDir();
 
-  // Ask for the new file name
-  filename = EDA_FileSelector( TREE_DIRECTORY !=
-                                 type ? _( "Create New File:" ) : _( "Create New Directory" ),
+    // Ask for the new file name
+    filename = EDA_FileSelector( TREE_DIRECTORY !=
+                                 type ? _( "Create New File:" ) : _(
+                                     "Create New Directory" ),
                                  wxGetCwd() + sep + dir,    /* Chemin par defaut */
                                  _( "noname" ) + mask,      /* nom fichier par defaut */
                                  mask,                      /* extension par defaut */
@@ -547,62 +538,60 @@ void WinEDA_PrjFrame::NewFile( TreeFileType type )
                                  wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
                                  TRUE
                                  );
-  if( filename.IsEmpty() )
-    return;
+    if( filename.IsEmpty() )
+        return;
 
-  TreeFileType rootType = treeData->GetType();
-  wxTreeItemId      root;
+    TreeFileType rootType = treeData->GetType();
+    wxTreeItemId root;
 
-  if( TREE_DIRECTORY == rootType )
-  {
-    root = m_TreeProject->GetSelection();
-  }
-  else
-  {
-    root = m_TreeProject->GetItemParent( m_TreeProject->GetSelection() );
+    if( TREE_DIRECTORY == rootType )
+    {
+        root = m_TreeProject->GetSelection();
+    }
+    else
+    {
+        root = m_TreeProject->GetItemParent( m_TreeProject->GetSelection() );
 
-    if( !root.IsOk() )
-      root = m_TreeProject->GetSelection();
-  }
+        if( !root.IsOk() )
+            root = m_TreeProject->GetSelection();
+    }
 
-  NewFile( filename, type, root );
+    NewFile( filename, type, root );
 }
 
 
-
 /**
  * @brief TODO
  */
 /*****************************************************************************/
 void WinEDA_PrjFrame::NewFile( const wxString& name,
-                               TreeFileType type,
-                               wxTreeItemId& root )
+                               TreeFileType    type,
+                               wxTreeItemId&   root )
 /*****************************************************************************/
 {
-  if( TREE_DIRECTORY != type )
-  {
-    wxFile( name, wxFile::write );
+    if( TREE_DIRECTORY != type )
+    {
+        wxFile( name, wxFile::write );
 
     #ifdef KICAD_PYTHON
-      PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::NewFile" ),
-                                              PyHandler::Convert( name ) );
+        PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::NewFile" ),
+                                                PyHandler::Convert( name ) );
     #endif /* KICAD_PYTHON */
-  }
-  else
-  {
-    wxMkdir( name );
+    }
+    else
+    {
+        wxMkdir( name );
 
     #ifdef KICAD_PYTHON
-      PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::NewDirectory" ), 
-                                              PyHandler::Convert( name ) );
+        PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::NewDirectory" ),
+                                                PyHandler::Convert( name ) );
     #endif /* KICAD_PYTHON */
-  }
+    }
 
-  AddFile( name, root );
+    AddFile( name, root );
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -657,7 +646,6 @@ wxString WinEDA_PrjFrame::GetFileExt( TreeFileType type )
 }
 
 
-
 /**
  * @brief  Add filename "name" to the tree \n
  *         if name is a directory, add the sub directory file names
@@ -670,32 +658,33 @@ bool WinEDA_PrjFrame::AddFile( const wxString& name, wxTreeItemId& root )
     wxTreeItemId cellule;
 
     // Check the file type
-    TreeFileType  type = TREE_UNKNOWN;
+    TreeFileType type = TREE_UNKNOWN;
 
     if( wxDirExists( name ) )
     {
-      type = TREE_DIRECTORY;
+        type = TREE_DIRECTORY;
     }
     else
     {
         // Filter
-        wxRegEx      reg;
+        wxRegEx reg;
 
-        bool isSchematic=false;
-        bool addFile=false;
-        for( unsigned i=0; i < m_Filters.size(); i++ )
+        bool    isSchematic = false;
+        bool    addFile     = false;
+        for( unsigned i = 0; i < m_Filters.size(); i++ )
         {
             reg.Compile( m_Filters[i], wxRE_ICASE );
             if( reg.Matches( name ) )
             {
-                addFile=true;
+                addFile = true;
                 if( i==0 )
                     isSchematic = true;
             }
         }
+
         if( !addFile )
             return false;
-        
+
         // only show the schematic if it is a top level schematic.  eeschema
         // cannot open a schematic and display it properly unless it starts
         // at the top of the hierarchy.  The schematic is top level only if
@@ -703,11 +692,11 @@ bool WinEDA_PrjFrame::AddFile( const wxString& name, wxTreeItemId& root )
         // "Sheet 1 "
         if( isSchematic )
         {
-            char    line[128];  // small because we just need a few bytes from the start of a line
-            FILE*   fp;
-            
-            wxString FullFileName =  name;
-            
+            char     line[128]; // small because we just need a few bytes from the start of a line
+            FILE*    fp;
+
+            wxString FullFileName = name;
+
             fp = wxFopen( FullFileName, wxT( "rt" ) );
             if( fp == NULL )
             {
@@ -715,11 +704,11 @@ bool WinEDA_PrjFrame::AddFile( const wxString& name, wxTreeItemId& root )
             }
 
             addFile = false;
-            for( int i=0;  i<20;  ++i )
+            for( int i = 0;  i<20;  ++i )
             {
                 if( !fgets( line, sizeof(line), fp ) )
                     break;
-                
+
                 if( !strncmp( line, "Sheet 1 ", 8 ) )
                 {
                     addFile = true;
@@ -727,12 +716,12 @@ bool WinEDA_PrjFrame::AddFile( const wxString& name, wxTreeItemId& root )
                 }
             }
 
-            fclose(fp);
-            
+            fclose( fp );
+
             if( !addFile )
                 return false;     // it is a non-top-level schematic
         }
-        
+
         for( int i = TREE_PROJECT; i < TREE_MAX; i++ )
         {
             wxString ext = GetFileExt( (TreeFileType) i );
@@ -740,9 +729,9 @@ bool WinEDA_PrjFrame::AddFile( const wxString& name, wxTreeItemId& root )
             if( ext == wxT( "" ) )
                 continue;
 
-            reg.Compile( wxString::FromAscii( "^.*\\" ) + ext + 
-                         wxString::FromAscii("$" ), wxRE_ICASE );
-            
+            reg.Compile( wxString::FromAscii( "^.*\\" ) + ext +
+                         wxString::FromAscii( "$" ), wxRE_ICASE );
+
             if( reg.Matches( name ) )
             {
                 type = (TreeFileType) i;
@@ -750,20 +739,23 @@ bool WinEDA_PrjFrame::AddFile( const wxString& name, wxTreeItemId& root )
             }
         }
     }
-	//also check to see if it is already there. 
-	wxTreeItemIdValue cookie; 
-	wxTreeItemId kid = m_TreeProject->GetFirstChild(root, cookie); 
-	while(kid.IsOk())
-	{
-		TreePrjItemData* itemData = (TreePrjItemData*) 
-			m_TreeProject->GetItemData(kid); 
-		if( itemData ){
-			if( itemData->m_FileName == name ){
-				return true; //well, we would have added it, but it is already here!
-			}
-		}
-		kid = m_TreeProject->GetNextChild(root, cookie); 
-	}
+
+    //also check to see if it is already there.
+    wxTreeItemIdValue cookie;
+    wxTreeItemId      kid = m_TreeProject->GetFirstChild( root, cookie );
+    while( kid.IsOk() )
+    {
+        TreePrjItemData* itemData = (TreePrjItemData*)
+                                    m_TreeProject->GetItemData( kid );
+        if( itemData )
+        {
+            if( itemData->m_FileName == name )
+            {
+                return true; //well, we would have added it, but it is already here!
+            }
+        }
+        kid = m_TreeProject->GetNextChild( root, cookie );
+    }
 
     // Append the item (only appending the filename not the full path):
     wxString         file = wxFileNameFromPath( name );
@@ -775,8 +767,8 @@ bool WinEDA_PrjFrame::AddFile( const wxString& name, wxTreeItemId& root )
     data->SetState( 0 );
 
     /* Mark root files (files which have the same name as the project) */
-    wxFileName  project( m_Parent->m_PrjFileName );
-    wxFileName  currfile( file );
+    wxFileName project( m_Parent->m_PrjFileName );
+    wxFileName currfile( file );
 
     if( currfile.GetName().CmpNoCase( project.GetName() ) == 0 )
         data->m_IsRootFile = true;
@@ -785,40 +777,38 @@ bool WinEDA_PrjFrame::AddFile( const wxString& name, wxTreeItemId& root )
 
 
     #ifdef KICAD_PYTHON
-      PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::TreeAddFile" ),
-                                              PyHandler::Convert( name ) );
+    PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::TreeAddFile" ),
+                                            PyHandler::Convert( name ) );
     #endif /* KICAD_YTHON */
 
 
     // When enabled This section adds dirs and files found in the subdirs
     // in this case AddFile is recursive.
     #ifdef ADD_FILES_IN_SUBDIRS
-      if( TREE_DIRECTORY == type )
-      {
+    if( TREE_DIRECTORY == type )
+    {
         const wxString sep = wxFileName().GetPathSeparator();
-        wxDir dir( name );
+        wxDir          dir( name );
         wxString       dir_filename;
 
         if( dir.GetFirst( &dir_filename ) )
         {
-         do
-         {
-           AddFile( name + sep + dir_filename, cellule );
-         }
-          while( dir.GetNext( &dir_filename ) );
+            do
+            {
+                AddFile( name + sep + dir_filename, cellule );
+            } while( dir.GetNext( &dir_filename ) );
         }
 
         /* Sort filenames by alphabetic order */
         m_TreeProject->SortChildren( cellule );
-      }
+    }
     #endif /* ADD_FILES_IN_SUBDIRS */
 
 
-  return true; 
+    return true;
 }
 
 
-
 /**
  * @brief  Create or modify the tree showing project file names
  * @return TODO
@@ -837,7 +827,7 @@ void WinEDA_PrjFrame::ReCreateTreePrj()
         m_TreeProject->DeleteAllItems();
 
     m_TreeProject->SetFont( *g_StdFont );
-    
+
     if( m_Parent->m_PrjFileName.IsEmpty() )
         Text = wxT( "noname" );
     else
@@ -846,13 +836,17 @@ void WinEDA_PrjFrame::ReCreateTreePrj()
     prjOpened = wxFileExists( Text );
 
     // root tree:
-    m_root = rootcellule = m_TreeProject->AddRoot( Text, TREE_PROJECT - 1, TREE_PROJECT - 1 );
-    
+    m_root = rootcellule = m_TreeProject->AddRoot( Text,
+                                                   TREE_PROJECT - 1,
+                                                   TREE_PROJECT - 1 );
+
     m_TreeProject->SetItemBold( rootcellule, TRUE );
-    
+
     m_TreeProject->SetItemData( rootcellule,
-         new TreePrjItemData( TREE_PROJECT, wxEmptyString, m_TreeProject ) );
-    
+                                new TreePrjItemData( TREE_PROJECT,
+                                                     wxEmptyString,
+                                                     m_TreeProject ) );
+
     m_TreeProject->SetItemFont( rootcellule, *g_StdFont );
 
     ChangeFileNameExt( Text, wxEmptyString );
@@ -860,27 +854,26 @@ void WinEDA_PrjFrame::ReCreateTreePrj()
     // Add at least a .sch / .brd if not existing:
     if( !wxFileExists( Text + g_SchExtBuffer ) )
         AddFile( Text + g_SchExtBuffer, m_root );
-    
+
     if( !wxFileExists( Text + g_BoardExtBuffer ) )
         AddFile( Text + g_BoardExtBuffer, m_root );
 
     // Now adding all current files if available
     if( prjOpened )
     {
-        wxDir dir( wxGetCwd() );
-		wxString dir_str = dir.GetName(); 
-		wxString sep = wxFileName().GetPathSeparator();
+        wxDir    dir( wxGetCwd() );
+        wxString dir_str = dir.GetName();
+        wxString sep     = wxFileName().GetPathSeparator();
         wxString filename;
-        
+
         if( dir.GetFirst( &filename ) )
         {
             do
             {
                 if( filename == Text + wxT( ".pro" ) )
                     continue;
-                
-                AddFile(dir_str + sep + filename, m_root );
-                
+
+                AddFile( dir_str + sep + filename, m_root );
             } while( dir.GetNext( &filename ) );
         }
     }
@@ -892,7 +885,6 @@ void WinEDA_PrjFrame::ReCreateTreePrj()
 }
 
 
-
 /**
  * @brief  Opens *popup* the context menu
  */
@@ -900,7 +892,7 @@ void WinEDA_PrjFrame::ReCreateTreePrj()
 void WinEDA_PrjFrame::OnRight( wxTreeEvent& Event )
 /*****************************************************************************/
 {
-    int              tree_id;
+    int tree_id;
     TreePrjItemData* tree_data;
     wxString         FullFileName;
     wxTreeItemId     curr_item = Event.GetItem();
@@ -909,7 +901,7 @@ void WinEDA_PrjFrame::OnRight( wxTreeEvent& Event )
     m_TreeProject->SelectItem( curr_item );
 
     // Delete and recreate the context menu
-    delete( m_PopupMenu );
+    delete ( m_PopupMenu );
     m_PopupMenu = new wxMenu();
 
     // Get the current filename:
@@ -917,7 +909,7 @@ void WinEDA_PrjFrame::OnRight( wxTreeEvent& Event )
     if( !tree_data )
         return;
 
-    tree_id      = tree_data->GetType();
+    tree_id = tree_data->GetType();
     FullFileName = tree_data->GetFileName();
 
     // copy menu contents in order of the next array:
@@ -927,12 +919,12 @@ void WinEDA_PrjFrame::OnRight( wxTreeEvent& Event )
         const_cast<wxMenu*>( tree_data->GetMenu() )
     };
 
-    for( unsigned int j=0;  j < sizeof(menus)/sizeof(wxMenu*);  j++ )
+    for( unsigned int j = 0;  j < sizeof(menus) / sizeof(wxMenu*);  j++ )
     {
-        wxMenu*        menu = menus[j];
+        wxMenu* menu = menus[j];
         if( !menu )
             continue;
-        
+
         wxMenuItemList list = menu->GetMenuItems();
 
         for( unsigned int i = 0; i < list.GetCount(); i++ )
@@ -944,7 +936,8 @@ void WinEDA_PrjFrame::OnRight( wxTreeEvent& Event )
             // for obscure reasons, the & is translated into _ ... so replace it
             label.Replace( wxT( "_" ), wxT( "&" ), true );
             wxMenuItem* item = new wxMenuItem( m_PopupMenu, src->GetId(),
-                        label, src->GetHelp(), src->GetKind() );
+                                               label,
+                                               src->GetHelp(), src->GetKind() );
 
             item->SetBitmap( src->GetBitmap() );
             m_PopupMenu->Append( item );
@@ -956,16 +949,15 @@ void WinEDA_PrjFrame::OnRight( wxTreeEvent& Event )
 
   #ifdef KICAD_PYTHON
     PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::TreeContextMenu" ),
-                                           PyHandler::Convert( FullFileName ) );
+                                            PyHandler::Convert( FullFileName ) );
   #endif /* KICAD_PYTHON */
 
 
-  if( m_PopupMenu )
-    PopupMenu( m_PopupMenu );
+    if( m_PopupMenu )
+        PopupMenu( m_PopupMenu );
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -984,18 +976,16 @@ void WinEDA_PrjFrame::OnTxtEdit( wxCommandEvent& event )
 
     if( !editorname.IsEmpty() )
     {
-
       #ifdef KICAD_PYTHON
         PyHandler::GetInstance()->TriggerEvent( wxT( "kicad::EditScript" ),
                                                 PyHandler::Convert( FullFileName ) );
       #endif
 
-      ExecuteFile( this, editorname, FullFileName );
+        ExecuteFile( this, editorname, FullFileName );
     }
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -1003,15 +993,14 @@ void WinEDA_PrjFrame::OnTxtEdit( wxCommandEvent& event )
 void WinEDA_PrjFrame::OnDeleteFile( wxCommandEvent& )
 /*****************************************************************************/
 {
-  TreePrjItemData* tree_data = GetSelectedData();
+    TreePrjItemData* tree_data = GetSelectedData();
 
-  if( !tree_data )
-    return;
-  tree_data->Delete();
+    if( !tree_data )
+        return;
+    tree_data->Delete();
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -1019,24 +1008,23 @@ void WinEDA_PrjFrame::OnDeleteFile( wxCommandEvent& )
 void WinEDA_PrjFrame::OnRenameFile( wxCommandEvent& )
 /*****************************************************************************/
 {
-  wxTreeItemId     curr_item = m_TreeProject->GetSelection();
-  TreePrjItemData* tree_data = GetSelectedData();
+    wxTreeItemId     curr_item = m_TreeProject->GetSelection();
+    TreePrjItemData* tree_data = GetSelectedData();
 
-  if( !tree_data )
-    return;
+    if( !tree_data )
+        return;
 
-  wxString buffer = m_TreeProject->GetItemText( curr_item );
-  wxString msg    = _( "Change filename: " ) + tree_data->m_FileName;
+    wxString buffer = m_TreeProject->GetItemText( curr_item );
+    wxString msg    = _( "Change filename: " ) + tree_data->m_FileName;
 
-  if( Get_Message(msg, _("Change filename"), buffer, this ) != 0 )
-    return; //Abort command
+    if( Get_Message( msg, _( "Change filename" ), buffer, this ) != 0 )
+        return; //Abort command
 
-  if( tree_data->Rename( buffer, true ) )
-    m_TreeProject->SetItemText( curr_item, buffer );
+    if( tree_data->Rename( buffer, true ) )
+        m_TreeProject->SetItemText( curr_item, buffer );
 }
 
 
-
 #ifdef KICAD_PYTHON
 
 /**
@@ -1058,7 +1046,6 @@ void WinEDA_PrjFrame::OnRunPy( wxCommandEvent& event )
 }
 
 
-
 /**
  * @brief Add a state to the image list
  */
@@ -1068,7 +1055,7 @@ int WinEDA_PrjFrame::AddStatePy( boost::python::object& bitmap )
 {
     wxBitmap* image;
     bool      success = wxPyConvertSwigPtr( bitmap.ptr(),
-                        (void**) &image, _T( "wxBitmap" ) );
+                                            (void**) &image, _T( "wxBitmap" ) );
 
     if( !success )
         return -1;
@@ -1078,7 +1065,7 @@ int WinEDA_PrjFrame::AddStatePy( boost::python::object& bitmap )
 
     for( int i = 0; i < TREE_MAX - 1; i++ )
     {
-        wxBitmap composed( list->GetBitmap ( i ) );
+        wxBitmap   composed( list->GetBitmap( i ) );
 
         wxMemoryDC dc;
         dc.SelectObject( composed );
@@ -1089,8 +1076,8 @@ int WinEDA_PrjFrame::AddStatePy( boost::python::object& bitmap )
     return ret;
 }
 
-#endif /* KICAD_PYTHON */
 
+#endif /* KICAD_PYTHON */
 
 
 /**
@@ -1109,7 +1096,6 @@ void WinEDA_PrjFrame::OnRenameAsk( wxTreeEvent& event )
 }
 
 
-
 /**
  * @brief Rename a tree item on demand of the context menu
  */
@@ -1126,7 +1112,6 @@ void WinEDA_PrjFrame::OnRename( wxTreeEvent& event )
 }
 
 
-
 /**
  * @brief TODO
  */
@@ -1134,11 +1119,11 @@ void WinEDA_PrjFrame::OnRename( wxTreeEvent& event )
 void WinEDA_PrjFrame::OnSelect( wxTreeEvent& Event )
 /*****************************************************************************/
 {
-  wxString FullFileName;
+    wxString         FullFileName;
 
-  TreePrjItemData* tree_data = GetSelectedData();
+    TreePrjItemData* tree_data = GetSelectedData();
 
-  if( !tree_data )
-    return;
-  tree_data->Activate(this);
+    if( !tree_data )
+        return;
+    tree_data->Activate( this );
 }
diff --git a/pcbnew/attribut.cpp b/pcbnew/attribut.cpp
index 00e8faab8b..eb6dba3437 100644
--- a/pcbnew/attribut.cpp
+++ b/pcbnew/attribut.cpp
@@ -3,11 +3,11 @@
 /******************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
-
 #include "protos.h"
 
 
diff --git a/pcbnew/automove.cpp b/pcbnew/automove.cpp
index e3042b14c6..a855ec370b 100644
--- a/pcbnew/automove.cpp
+++ b/pcbnew/automove.cpp
@@ -8,11 +8,13 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
 #include "pcbnew.h"
 #include "autorout.h"
 #include "cell.h"
 #include "id.h"
-
 #include "protos.h"
 
 
diff --git a/pcbnew/autoplac.cpp b/pcbnew/autoplac.cpp
index ca97f13df2..115dba7100 100644
--- a/pcbnew/autoplac.cpp
+++ b/pcbnew/autoplac.cpp
@@ -7,6 +7,8 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "autorout.h"
 #include "zones.h"
diff --git a/pcbnew/autorout.cpp b/pcbnew/autorout.cpp
index 04c479e415..57fd53cf58 100644
--- a/pcbnew/autorout.cpp
+++ b/pcbnew/autorout.cpp
@@ -5,6 +5,8 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "autorout.h"
 #include "cell.h"
diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp
index 48cf5e680a..17a1da369c 100644
--- a/pcbnew/basepcbframe.cpp
+++ b/pcbnew/basepcbframe.cpp
@@ -9,14 +9,15 @@
 #include "fctsys.h"
 #include "wxstruct.h"
 #include "common.h"
+#include "confirm.h"
 
 #include "pcbnew.h"
-
 #include "bitmaps.h"
 #include "protos.h"
 #include "id.h"
 
 #include "collectors.h"
+#include "class_drawpanel.h"
 
 
 /*******************************/
diff --git a/pcbnew/block.cpp b/pcbnew/block.cpp
index 859b6b1228..f9be20a748 100644
--- a/pcbnew/block.cpp
+++ b/pcbnew/block.cpp
@@ -5,8 +5,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "block_commande.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
 #include "pcbplot.h"
diff --git a/pcbnew/block_module_editor.cpp b/pcbnew/block_module_editor.cpp
index 29debbb733..576614c5b7 100644
--- a/pcbnew/block_module_editor.cpp
+++ b/pcbnew/block_module_editor.cpp
@@ -4,9 +4,13 @@
 /****************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "block_commande.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
 #include "pcbplot.h"
diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp
index cbdc424348..2f2f946f5a 100644
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@@ -6,8 +6,8 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "autorout.h"
 #include "zones.h"
diff --git a/pcbnew/class_cotation.cpp b/pcbnew/class_cotation.cpp
index f9fce1c300..b1d219ff75 100644
--- a/pcbnew/class_cotation.cpp
+++ b/pcbnew/class_cotation.cpp
@@ -4,11 +4,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
 #include "pcbnew.h"
 #include "trigo.h"
 #include "wxstruct.h"
+#include "class_drawpanel.h"
+#include "kicad_string.h"
 
 
 COTATION::COTATION( BOARD_ITEM* aParent ) :
diff --git a/pcbnew/class_drawsegment.cpp b/pcbnew/class_drawsegment.cpp
index 423d02255b..f3a5c8b878 100644
--- a/pcbnew/class_drawsegment.cpp
+++ b/pcbnew/class_drawsegment.cpp
@@ -4,10 +4,11 @@
 
 #include "fctsys.h"
 #include "wxstruct.h"
-
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "kicad_string.h"
+
 #include "pcbnew.h"
 
 #ifdef CVPCB
diff --git a/pcbnew/class_edge_mod.cpp b/pcbnew/class_edge_mod.cpp
index 62d6ab11e3..fba588f427 100644
--- a/pcbnew/class_edge_mod.cpp
+++ b/pcbnew/class_edge_mod.cpp
@@ -4,10 +4,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "wxstruct.h"
 #include "common.h"
 #include "trigo.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
 
 #ifdef PCBNEW
 #include "pcbnew.h"
@@ -17,7 +19,6 @@
 
 #ifdef CVPCB
 #include "cvpcb.h"
-
 #endif
 
 #include "protos.h"
diff --git a/pcbnew/class_equipot.cpp b/pcbnew/class_equipot.cpp
index 522443b5a9..ad8c252ae2 100644
--- a/pcbnew/class_equipot.cpp
+++ b/pcbnew/class_equipot.cpp
@@ -4,10 +4,8 @@
 
 #include "fctsys.h"
 #include "wxstruct.h"
-
 #include "gr_basic.h"
-
-#include "common.h"
+#include "kicad_string.h"
 #include "pcbnew.h"
 
 #ifdef CVPCB
diff --git a/pcbnew/class_marker.cpp b/pcbnew/class_marker.cpp
index e82601c29a..7c4cb31fee 100644
--- a/pcbnew/class_marker.cpp
+++ b/pcbnew/class_marker.cpp
@@ -6,8 +6,9 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "pcbnew.h"
 #include "class_marker.h"
 
diff --git a/pcbnew/class_mire.cpp b/pcbnew/class_mire.cpp
index 2d74a53897..bcbd40908b 100644
--- a/pcbnew/class_mire.cpp
+++ b/pcbnew/class_mire.cpp
@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "kicad_string.h"
+
 #include "pcbnew.h"
 
 
diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp
index 9aced11a90..f42c561a73 100644
--- a/pcbnew/class_module.cpp
+++ b/pcbnew/class_module.cpp
@@ -4,12 +4,15 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "wxstruct.h"
 #include "common.h"
 #include "plot_common.h"
-#include "pcbnew.h"
+#include "class_drawpanel.h"
 #include "trigo.h"
+#include "confirm.h"
+#include "kicad_string.h"
+
+#include "pcbnew.h"
 
 #ifdef PCBNEW
 #include "autorout.h"
diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index 60f0d5507b..5c6062636e 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -3,8 +3,10 @@
 /************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+
 #include "pcbnew.h"
 #include "trigo.h"
 #include "id.h"             // ID_TRACK_BUTT
diff --git a/pcbnew/class_pad_draw_functions.cpp b/pcbnew/class_pad_draw_functions.cpp
index 2252b2d34a..eb428090f0 100644
--- a/pcbnew/class_pad_draw_functions.cpp
+++ b/pcbnew/class_pad_draw_functions.cpp
@@ -4,11 +4,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
-#include "pcbnew.h"
 #include "trigo.h"
 #include "id.h"             // ID_TRACK_BUTT
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+
+#include "pcbnew.h"
 
 
 /*******************************************************************************************/
diff --git a/pcbnew/class_pcb_text.cpp b/pcbnew/class_pcb_text.cpp
index aafc1ee883..aa3e815403 100644
--- a/pcbnew/class_pcb_text.cpp
+++ b/pcbnew/class_pcb_text.cpp
@@ -4,10 +4,10 @@
 
 #include "fctsys.h"
 #include "wxstruct.h"
-
 #include "gr_basic.h"
-
 #include "common.h"
+#include "kicad_string.h"
+
 #include "pcbnew.h"
 
 
diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp
index d76f639bbc..ed30af3ac1 100644
--- a/pcbnew/class_text_mod.cpp
+++ b/pcbnew/class_text_mod.cpp
@@ -4,11 +4,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "wxstruct.h"
 #include "common.h"
 #include "pcbnew.h"
 #include "trigo.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+#include "kicad_string.h"
 
 #ifdef PCBNEW
 #include "autorout.h"
@@ -17,7 +19,6 @@
 
 #ifdef CVPCB
 #include "cvpcb.h"
-
 #endif
 
 #include "protos.h"
diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp
index 2f20cd6690..82cc46c6c8 100644
--- a/pcbnew/class_track.cpp
+++ b/pcbnew/class_track.cpp
@@ -5,15 +5,17 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "trigo.h"
+#include "class_drawpanel.h"
+#include "drawtxt.h"
+
 #include "pcbnew.h"
 
 #ifdef CVPCB
 #include "cvpcb.h"
 #endif
 
-#include "trigo.h"
 #include "protos.h"
 
 
diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp
index dc34800817..580be1d91c 100644
--- a/pcbnew/class_zone.cpp
+++ b/pcbnew/class_zone.cpp
@@ -4,13 +4,14 @@
 
 #include "fctsys.h"
 #include "wxstruct.h"
-
 #include "gr_basic.h"
-
 #include "common.h"
+#include "trigo.h"
+#include "class_drawpanel.h"
+#include "kicad_string.h"
+
 #include "PolyLine.h"
 #include "pcbnew.h"
-#include "trigo.h"
 #include "zones.h"
 
 
diff --git a/pcbnew/clean.cpp b/pcbnew/clean.cpp
index 80320faacf..ee25595cb3 100644
--- a/pcbnew/clean.cpp
+++ b/pcbnew/clean.cpp
@@ -7,11 +7,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
-
 #include "protos.h"
 
 /* Position of messages on the bottom display */
diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp
index 4260eeebc1..c565cd8d1c 100644
--- a/pcbnew/controle.cpp
+++ b/pcbnew/controle.cpp
@@ -5,8 +5,8 @@
 /* controle.cpp */
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
 #include "pcbnew.h"
 #include "protos.h"
 
diff --git a/pcbnew/cotation.cpp b/pcbnew/cotation.cpp
index 803ad562a8..719f5efb42 100644
--- a/pcbnew/cotation.cpp
+++ b/pcbnew/cotation.cpp
@@ -3,10 +3,9 @@
 /*****************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
 #include "pcbnew.h"
-
 #include "protos.h"
 
 /* Routines Locales */
diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp
index a10144b568..5e883802af 100644
--- a/pcbnew/cross-probing.cpp
+++ b/pcbnew/cross-probing.cpp
@@ -12,14 +12,12 @@
  */
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "pcbnew.h"
 #include "eda_dde.h"
-
 #include "id.h"
 #include "collectors.h"
-
 #include "protos.h"
 
 
diff --git a/pcbnew/deltrack.cpp b/pcbnew/deltrack.cpp
index 7d12b9f495..e85e21a9af 100644
--- a/pcbnew/deltrack.cpp
+++ b/pcbnew/deltrack.cpp
@@ -5,10 +5,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
-
 #include "protos.h"
 
 /* Routines Locales */
diff --git a/pcbnew/dialog_SVG_print.cpp b/pcbnew/dialog_SVG_print.cpp
index 39a2be87f3..b8e34b3339 100644
--- a/pcbnew/dialog_SVG_print.cpp
+++ b/pcbnew/dialog_SVG_print.cpp
@@ -7,8 +7,11 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 
 #include "dialog_SVG_print_base.h"
 
diff --git a/pcbnew/dialog_copper_zones.cpp b/pcbnew/dialog_copper_zones.cpp
index 108705f808..89c7d4b94d 100644
--- a/pcbnew/dialog_copper_zones.cpp
+++ b/pcbnew/dialog_copper_zones.cpp
@@ -10,21 +10,10 @@
 #pragma implementation "zones.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
-#include "wxstruct.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "confirm.h"
 #include "PolyLine.h"
 #include "pcbnew.h"
 #include "trigo.h"
diff --git a/pcbnew/dialog_edit_module.cpp b/pcbnew/dialog_edit_module.cpp
index 71fed7352f..90f7be1c29 100644
--- a/pcbnew/dialog_edit_module.cpp
+++ b/pcbnew/dialog_edit_module.cpp
@@ -4,6 +4,7 @@
 /* include in modedit.cpp						*/
 /************************************************/
 
+#include "confirm.h"
 #include "dialog_edit_module.h"
 #include <wx/version.h>
 
diff --git a/pcbnew/dialog_edit_module_text.cpp b/pcbnew/dialog_edit_module_text.cpp
index 112091d561..f5a1d4dc00 100644
--- a/pcbnew/dialog_edit_module_text.cpp
+++ b/pcbnew/dialog_edit_module_text.cpp
@@ -7,8 +7,8 @@
 
 #include "fctsys.h"
 #include "macros.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
 #include "pcbnew.h"
 
 #include "dialog_edit_module_text_base.h"
diff --git a/pcbnew/dialog_freeroute_exchange.cpp b/pcbnew/dialog_freeroute_exchange.cpp
index 6cf7731317..5ff7390afd 100644
--- a/pcbnew/dialog_freeroute_exchange.cpp
+++ b/pcbnew/dialog_freeroute_exchange.cpp
@@ -12,22 +12,13 @@
 
 // Generated by DialogBlocks (unregistered), 14/03/2008 09:19:27
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 
 #include "dialog_freeroute_exchange.h"
diff --git a/pcbnew/dialog_general_options.cpp b/pcbnew/dialog_general_options.cpp
index 31857e3565..15bb38ef6c 100644
--- a/pcbnew/dialog_general_options.cpp
+++ b/pcbnew/dialog_general_options.cpp
@@ -7,8 +7,9 @@
 	Prefernces/display
 */
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 
 #include "id.h"
diff --git a/pcbnew/dialog_graphic_item_properties.cpp b/pcbnew/dialog_graphic_item_properties.cpp
index 50be139f14..112299549f 100644
--- a/pcbnew/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialog_graphic_item_properties.cpp
@@ -12,8 +12,8 @@
  */
 #include "fctsys.h"
 #include "macros.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
 #include "pcbnew.h"
 
 #include "dialog_graphic_item_properties_base.h"
diff --git a/pcbnew/dialog_orient_footprints.cpp b/pcbnew/dialog_orient_footprints.cpp
index b92e0fc8a9..79b6fd8550 100644
--- a/pcbnew/dialog_orient_footprints.cpp
+++ b/pcbnew/dialog_orient_footprints.cpp
@@ -11,23 +11,13 @@
 
 // Generated by DialogBlocks (unregistered), 11/07/2008 13:32:12
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 
 #include "fctsys.h"
-
-#include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
 #include "pcbnew.h"
 
 #include "dialog_orient_footprints.h"
diff --git a/pcbnew/dialog_pad_properties.cpp b/pcbnew/dialog_pad_properties.cpp
index a1407b2d4a..2c6b07849e 100644
--- a/pcbnew/dialog_pad_properties.cpp
+++ b/pcbnew/dialog_pad_properties.cpp
@@ -5,6 +5,8 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "trigo.h"
 
diff --git a/pcbnew/dialog_pcb_text_properties.cpp b/pcbnew/dialog_pcb_text_properties.cpp
index 506358e743..d8bad3732c 100644
--- a/pcbnew/dialog_pcb_text_properties.cpp
+++ b/pcbnew/dialog_pcb_text_properties.cpp
@@ -4,8 +4,8 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
 #include "pcbnew.h"
 
 enum id_TextPCB_properties {
diff --git a/pcbnew/dialog_print_using_printer.cpp b/pcbnew/dialog_print_using_printer.cpp
index 5575a6ebd3..d57ecc9b0e 100644
--- a/pcbnew/dialog_print_using_printer.cpp
+++ b/pcbnew/dialog_print_using_printer.cpp
@@ -6,7 +6,10 @@
 #define wxTEST_POSTSCRIPT_IN_MSW 1
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 
 #include <wx/dcps.h>
 
diff --git a/pcbnew/dialog_setup_libs.cpp b/pcbnew/dialog_setup_libs.cpp
index b35cede5b0..61160a5bdd 100644
--- a/pcbnew/dialog_setup_libs.cpp
+++ b/pcbnew/dialog_setup_libs.cpp
@@ -17,20 +17,12 @@
 #pragma implementation "dialog_pcbnew_config.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 
 ////@begin includes
diff --git a/pcbnew/dragsegm.cpp b/pcbnew/dragsegm.cpp
index 5c72d8af0d..9a28151370 100644
--- a/pcbnew/dragsegm.cpp
+++ b/pcbnew/dragsegm.cpp
@@ -6,11 +6,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
 #include "pcbnew.h"
 #include "autorout.h"
-#include "trigo.h"
 
 #include "protos.h"
 
diff --git a/pcbnew/drc.cpp b/pcbnew/drc.cpp
index 5c0d42beb8..5a3e076706 100644
--- a/pcbnew/drc.cpp
+++ b/pcbnew/drc.cpp
@@ -30,11 +30,12 @@
 /****************************/
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "pcbnew.h"
+#include "class_drawpanel.h"
 #include "autorout.h"
 #include "trigo.h"
+#include "gestfich.h"
 
 #include "protos.h"
 
diff --git a/pcbnew/edgemod.cpp b/pcbnew/edgemod.cpp
index 0041c45437..f689d970bc 100644
--- a/pcbnew/edgemod.cpp
+++ b/pcbnew/edgemod.cpp
@@ -12,10 +12,11 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "trigo.h"
-
 #include "common.h"
-#include "pcbnew.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 
+#include "pcbnew.h"
 #include "protos.h"
 
 
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index 46d1501121..88a3984346 100644
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@@ -3,8 +3,11 @@
 /******************************************************/
 
 #include "fctsys.h"
-
-#include "common.h"
+#include "appl_wxstruct.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "eda_doc.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "autorout.h"
 
diff --git a/pcbnew/edit_pcb_text.cpp b/pcbnew/edit_pcb_text.cpp
index 10be58c49f..0429db072b 100644
--- a/pcbnew/edit_pcb_text.cpp
+++ b/pcbnew/edit_pcb_text.cpp
@@ -4,10 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
-#include "pcbnew.h"
+#include "class_drawpanel.h"
 
+#include "pcbnew.h"
 #include "protos.h"
 
 /* Local functions */
diff --git a/pcbnew/edit_track_width.cpp b/pcbnew/edit_track_width.cpp
index 6d073e6f95..ff8a0f0709 100644
--- a/pcbnew/edit_track_width.cpp
+++ b/pcbnew/edit_track_width.cpp
@@ -5,11 +5,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
-
 #include "protos.h"
 
 /* Routines Locales */
diff --git a/pcbnew/editedge.cpp b/pcbnew/editedge.cpp
index 2f8bb2899a..4f9845235e 100644
--- a/pcbnew/editedge.cpp
+++ b/pcbnew/editedge.cpp
@@ -6,10 +6,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
-#include "pcbnew.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 
+#include "pcbnew.h"
 #include "protos.h"
 
 /* Routines Locales */
diff --git a/pcbnew/editmod.cpp b/pcbnew/editmod.cpp
index 2583db6926..3d65ba5d05 100644
--- a/pcbnew/editmod.cpp
+++ b/pcbnew/editmod.cpp
@@ -4,8 +4,10 @@
 /************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "autorout.h"
 #include "trigo.h"
diff --git a/pcbnew/editrack-part2.cpp b/pcbnew/editrack-part2.cpp
index 6f53374216..cc41e6c144 100644
--- a/pcbnew/editrack-part2.cpp
+++ b/pcbnew/editrack-part2.cpp
@@ -5,11 +5,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
-
 #include "protos.h"
 
 
diff --git a/pcbnew/editrack.cpp b/pcbnew/editrack.cpp
index e9afd675e4..08531301b2 100644
--- a/pcbnew/editrack.cpp
+++ b/pcbnew/editrack.cpp
@@ -5,8 +5,9 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
 
diff --git a/pcbnew/edtxtmod.cpp b/pcbnew/edtxtmod.cpp
index c9ccc6736c..9c523defb2 100644
--- a/pcbnew/edtxtmod.cpp
+++ b/pcbnew/edtxtmod.cpp
@@ -7,11 +7,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "pcbnew.h"
 #include "trigo.h"
-
 #include "protos.h"
 
 
diff --git a/pcbnew/export_gencad.cpp b/pcbnew/export_gencad.cpp
index 0bd6fccd75..36f1ef17ad 100644
--- a/pcbnew/export_gencad.cpp
+++ b/pcbnew/export_gencad.cpp
@@ -3,8 +3,11 @@
 /***************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
+
 #include "pcbnew.h"
 #include "trigo.h"
 
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 2c23b9e55d..2cd932bc19 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -3,8 +3,11 @@
 /***************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "protos.h"
 #include "id.h"
diff --git a/pcbnew/find.cpp b/pcbnew/find.cpp
index dca58a352d..b3ce0f0750 100644
--- a/pcbnew/find.cpp
+++ b/pcbnew/find.cpp
@@ -12,8 +12,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
 #include "pcbnew.h"
 
 #include "id.h"
diff --git a/pcbnew/gen_drill_report_files.cpp b/pcbnew/gen_drill_report_files.cpp
index 493d6c88de..eba825fee1 100644
--- a/pcbnew/gen_drill_report_files.cpp
+++ b/pcbnew/gen_drill_report_files.cpp
@@ -10,6 +10,11 @@ using namespace std;
 
 #include "common.h"
 #include "plot_common.h"
+#include "base_struct.h"
+#include "colors.h"
+#include "drawtxt.h"
+#include "confirm.h"
+#include "kicad_string.h"
 #include "pcbnew.h"
 #include "pcbplot.h"
 #include "macros.h"
diff --git a/pcbnew/gen_modules_placefile.cpp b/pcbnew/gen_modules_placefile.cpp
index 02887fcfbb..7d4ff45fbb 100644
--- a/pcbnew/gen_modules_placefile.cpp
+++ b/pcbnew/gen_modules_placefile.cpp
@@ -7,8 +7,10 @@
  *  2 - create a module report (pos and module descr) (ascii file)
  */
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "trigo.h"
 
diff --git a/pcbnew/gendrill.cpp b/pcbnew/gendrill.cpp
index b159c110c7..d5149fe656 100644
--- a/pcbnew/gendrill.cpp
+++ b/pcbnew/gendrill.cpp
@@ -3,6 +3,7 @@
 /***************************************************************/
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 
 using namespace std;
 
@@ -11,6 +12,9 @@ using namespace std;
 #include "common.h"
 #include "plot_common.h"
 #include "trigo.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "pcbplot.h"
 #include "macros.h"
diff --git a/pcbnew/globaleditpad.cpp b/pcbnew/globaleditpad.cpp
index 99a99d04ef..30bc67fd4f 100644
--- a/pcbnew/globaleditpad.cpp
+++ b/pcbnew/globaleditpad.cpp
@@ -5,6 +5,8 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "autorout.h"
 #include "trigo.h"
diff --git a/pcbnew/gpcb_exchange.cpp b/pcbnew/gpcb_exchange.cpp
index e64c72d6d1..222ccb702c 100644
--- a/pcbnew/gpcb_exchange.cpp
+++ b/pcbnew/gpcb_exchange.cpp
@@ -3,9 +3,8 @@
 /**********************************************************************/
 
 #include "fctsys.h"
-
 #include "wxstruct.h"
-#include "common.h"
+#include "kicad_string.h"
 #include "pcbnew.h"
 #include "trigo.h"
 
diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp
index 87c422b65f..c6b85b3f74 100644
--- a/pcbnew/hotkeys.cpp
+++ b/pcbnew/hotkeys.cpp
@@ -3,10 +3,11 @@
 /***************/
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "pcbnew.h"
 #include "id.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "hotkeys.h"
 
 #include "protos.h"
diff --git a/pcbnew/initpcb.cpp b/pcbnew/initpcb.cpp
index c9814a162d..9e75b03f78 100644
--- a/pcbnew/initpcb.cpp
+++ b/pcbnew/initpcb.cpp
@@ -4,8 +4,9 @@
 
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "autorout.h"
 
diff --git a/pcbnew/ioascii.cpp b/pcbnew/ioascii.cpp
index ae6926e989..ef03881be1 100644
--- a/pcbnew/ioascii.cpp
+++ b/pcbnew/ioascii.cpp
@@ -7,12 +7,13 @@
 /* ioascii.cpp */
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+
 #include "pcbnew.h"
 
 #ifdef PCBNEW
-#include "pcbnew.h"
 #include "autorout.h"
 #include "zones.h"
 #endif
diff --git a/pcbnew/librairi.cpp b/pcbnew/librairi.cpp
index 082e046f5d..1f76392f9b 100644
--- a/pcbnew/librairi.cpp
+++ b/pcbnew/librairi.cpp
@@ -5,10 +5,13 @@
 /* Fichier LIBRAIRI.CPP */
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "pcbnew.h"
-
 #include "protos.h"
 
 /*
diff --git a/pcbnew/loadcmp.cpp b/pcbnew/loadcmp.cpp
index 8ed7677c7e..f7be00abd2 100644
--- a/pcbnew/loadcmp.cpp
+++ b/pcbnew/loadcmp.cpp
@@ -4,10 +4,15 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
-#include "pcbnew.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "eda_doc.h"
+#include "kicad_string.h"
+#include "gestfich.h"
+#include "get_component_dialog.h"
 
+#include "pcbnew.h"
 #include "protos.h"
 
 class ModList
diff --git a/pcbnew/menubarpcb.cpp b/pcbnew/menubarpcb.cpp
index d010ffc3a3..5a4b28e0dc 100644
--- a/pcbnew/menubarpcb.cpp
+++ b/pcbnew/menubarpcb.cpp
@@ -2,10 +2,9 @@
 /* menubarpcb.cpp - creation du menu general de l'editeur de board*/
 /******************************************************************/
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
-
 #include "pcbnew.h"
-
 #include "bitmaps.h"
 #include "protos.h"
 #include "hotkeys.h"
diff --git a/pcbnew/mirepcb.cpp b/pcbnew/mirepcb.cpp
index 22f9bfa43f..9050d1f2f6 100644
--- a/pcbnew/mirepcb.cpp
+++ b/pcbnew/mirepcb.cpp
@@ -4,10 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
-#include "pcbnew.h"
+#include "class_drawpanel.h"
 
+#include "pcbnew.h"
 #include "protos.h"
 
 
diff --git a/pcbnew/modedit.cpp b/pcbnew/modedit.cpp
index 3ea511a719..7c72a293af 100644
--- a/pcbnew/modedit.cpp
+++ b/pcbnew/modedit.cpp
@@ -7,7 +7,9 @@
 #endif
 
 #include "fctsys.h"
-#include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 
 #include "pcbnew.h"
 #include "trigo.h"
diff --git a/pcbnew/modedit_onclick.cpp b/pcbnew/modedit_onclick.cpp
index b41ee92d2d..fd42cd7d82 100644
--- a/pcbnew/modedit_onclick.cpp
+++ b/pcbnew/modedit_onclick.cpp
@@ -8,6 +8,8 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 
 #include "pcbnew.h"
 
diff --git a/pcbnew/modeditoptions.cpp b/pcbnew/modeditoptions.cpp
index 48b09f99aa..472cc58194 100644
--- a/pcbnew/modeditoptions.cpp
+++ b/pcbnew/modeditoptions.cpp
@@ -10,8 +10,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "pcbnew.h"
 #include "pcbplot.h"
 #include "autorout.h"
diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index 2c6ee8e5d0..5670db77d6 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -7,10 +7,11 @@
 #endif
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "common.h"
-
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
-
 #include "bitmaps.h"
 #include "protos.h"
 #include "id.h"
@@ -349,7 +350,7 @@ void WinEDA_ModuleEditFrame::SetToolbars()
         unsigned jj;
         if( m_SelZoomBox )
         {
-            for( jj = 0; jj < GetScreen()->m_ZoomList.GetCount(); jj++ )
+            for( jj = 0; jj < (int)GetScreen()->m_ZoomList.GetCount(); jj++ )
             {
                 if( GetScreen()->GetZoom() == GetScreen()->m_ZoomList[jj] )
                 {
diff --git a/pcbnew/modules.cpp b/pcbnew/modules.cpp
index dccf6a89ca..5ab122ea3f 100644
--- a/pcbnew/modules.cpp
+++ b/pcbnew/modules.cpp
@@ -6,8 +6,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
 #include "trigo.h"
diff --git a/pcbnew/move-drag_pads.cpp b/pcbnew/move-drag_pads.cpp
index 879bcb6085..acb4e5fd1c 100644
--- a/pcbnew/move-drag_pads.cpp
+++ b/pcbnew/move-drag_pads.cpp
@@ -5,6 +5,8 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "autorout.h"
 #include "trigo.h"
diff --git a/pcbnew/move_or_drag_track.cpp b/pcbnew/move_or_drag_track.cpp
index 318f325b2d..eed7cea3f3 100644
--- a/pcbnew/move_or_drag_track.cpp
+++ b/pcbnew/move_or_drag_track.cpp
@@ -5,8 +5,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
 #include "trigo.h"
diff --git a/pcbnew/muonde.cpp b/pcbnew/muonde.cpp
index cd9d238ced..83ff04a603 100644
--- a/pcbnew/muonde.cpp
+++ b/pcbnew/muonde.cpp
@@ -5,16 +5,13 @@
 /* File MUONDE.CPP */
 
 #include "fctsys.h"
-//#include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "trigo.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "pcbnew.h"
-//#include "autorout.h"
-
-//#include "drag.h"
-
-//#include <string.h>
 #include "protos.h"
 
 /* Fonctions locales */
diff --git a/pcbnew/muwave_command.cpp b/pcbnew/muwave_command.cpp
index 4192e4da4a..d06c458a78 100644
--- a/pcbnew/muwave_command.cpp
+++ b/pcbnew/muwave_command.cpp
@@ -3,8 +3,9 @@
 	/*****************************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 
 #include "id.h"
diff --git a/pcbnew/netlist.cpp b/pcbnew/netlist.cpp
index b3f5ea3628..1a077d601b 100644
--- a/pcbnew/netlist.cpp
+++ b/pcbnew/netlist.cpp
@@ -22,6 +22,10 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "autorout.h"
 
diff --git a/pcbnew/onleftclick.cpp b/pcbnew/onleftclick.cpp
index 4aa8ef91fd..3f16d56d5d 100644
--- a/pcbnew/onleftclick.cpp
+++ b/pcbnew/onleftclick.cpp
@@ -5,10 +5,10 @@
 /**************************************************************/
 
 #include "fctsys.h"
-
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "autorout.h"
 
diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp
index c4d7b30739..b023f1b9e7 100644
--- a/pcbnew/onrightclick.cpp
+++ b/pcbnew/onrightclick.cpp
@@ -3,11 +3,12 @@
 /**************************************************/
 
 #include "fctsys.h"
-
 #include "gr_basic.h"
 #include "macros.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
 #include "id.h"
diff --git a/pcbnew/pcbcfg.cpp b/pcbnew/pcbcfg.cpp
index f6ddac3e6b..4d1eb225f3 100644
--- a/pcbnew/pcbcfg.cpp
+++ b/pcbnew/pcbcfg.cpp
@@ -5,15 +5,17 @@
 /* lit ou met a jour la configuration de PCBNEW */
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "pcbplot.h"
 #include "pcbcfg.h"
 #include "worksheet.h"
 #include "id.h"
 #include "hotkeys.h"
-
 #include "protos.h"
 
 /* Routines Locales */
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index 0b2c9a2e34..bb32fd5d65 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -3,11 +3,11 @@
 /****************************************************************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
 #include "pcbnew.h"
 #include "collectors.h"
-
 #include "bitmaps.h"
 #include "protos.h"
 #include "id.h"
diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp
index f01a9b9af2..8ef865f8a2 100644
--- a/pcbnew/pcbnew.cpp
+++ b/pcbnew/pcbnew.cpp
@@ -6,15 +6,18 @@
 #define eda_global
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
+#include "confirm.h"
 
 #include <wx/file.h>
+#include <wx/snglinst.h>
 
 #include "common.h"
 #include "pcbnew.h"
 #include "plot_common.h"
+#include "gestfich.h"
 #include "pcbplot.h"
 #include "autorout.h"
-#include "trigo.h"
 #include "cell.h"
 #include "worksheet.h"
 #include "zones.h"
diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp
index 932f985ea3..122e375d13 100644
--- a/pcbnew/pcbplot.cpp
+++ b/pcbnew/pcbplot.cpp
@@ -3,14 +3,15 @@
 /***********************/
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
 #include "plot_common.h"
+#include "confirm.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "pcbplot.h"
 #include "worksheet.h"
 #include "id.h"
-
 #include "protos.h"
 
 #define PLOT_DEFAULT_MARGE 300      // mils
diff --git a/pcbnew/plot_rtn.cpp b/pcbnew/plot_rtn.cpp
index 1a5a1fd6aa..5693428268 100644
--- a/pcbnew/plot_rtn.cpp
+++ b/pcbnew/plot_rtn.cpp
@@ -5,9 +5,11 @@
 /* Fichier PLOT_RTN.CPP*/
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "plot_common.h"
+#include "base_struct.h"
+#include "drawtxt.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "pcbplot.h"
 #include "trigo.h"
diff --git a/pcbnew/plotgerb.cpp b/pcbnew/plotgerb.cpp
index 832726888c..624012104e 100644
--- a/pcbnew/plotgerb.cpp
+++ b/pcbnew/plotgerb.cpp
@@ -10,9 +10,9 @@
  */
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "plot_common.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "pcbplot.h"
 #include "trigo.h"
diff --git a/pcbnew/plothpgl.cpp b/pcbnew/plothpgl.cpp
index 58f0deb8b4..30eb2b34f2 100644
--- a/pcbnew/plothpgl.cpp
+++ b/pcbnew/plothpgl.cpp
@@ -3,9 +3,9 @@
 /*******************************/
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "plot_common.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "pcbplot.h"
 #include "trigo.h"
diff --git a/pcbnew/plotps.cpp b/pcbnew/plotps.cpp
index bec39a2063..74d9345857 100644
--- a/pcbnew/plotps.cpp
+++ b/pcbnew/plotps.cpp
@@ -3,9 +3,9 @@
 /*************************************/
 
 #include "fctsys.h"
-
 #include "common.h"
 #include "plot_common.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "pcbplot.h"
 #include "trigo.h"
diff --git a/pcbnew/print_board_functions.cpp b/pcbnew/print_board_functions.cpp
index 26f8d11c4a..504f0b020b 100644
--- a/pcbnew/print_board_functions.cpp
+++ b/pcbnew/print_board_functions.cpp
@@ -4,11 +4,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "pcbnew.h"
 #include "pcbplot.h"
-
 #include "protos.h"
 
 /* Local functions */
diff --git a/pcbnew/protos.h b/pcbnew/protos.h
index 781ca3891b..b7a7114b79 100644
--- a/pcbnew/protos.h
+++ b/pcbnew/protos.h
@@ -9,6 +9,9 @@
 #include <vector>
 
 
+class COMMAND;
+
+
 /* install function for DialogNonCopperZonesEditor dialog frame :*/
 bool InstallDialogNonCopperZonesEditor(WinEDA_PcbFrame* aParent, ZONE_CONTAINER* aZone);
 
diff --git a/pcbnew/ratsnest.cpp b/pcbnew/ratsnest.cpp
index 8807f1464a..c1324e89e9 100644
--- a/pcbnew/ratsnest.cpp
+++ b/pcbnew/ratsnest.cpp
@@ -5,8 +5,9 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "autorout.h"
 
diff --git a/pcbnew/router.cpp b/pcbnew/router.cpp
index 11bf2800b7..d348cfee0d 100644
--- a/pcbnew/router.cpp
+++ b/pcbnew/router.cpp
@@ -7,6 +7,9 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "autorout.h"
 #include "zones.h"
diff --git a/pcbnew/sel_layer.cpp b/pcbnew/sel_layer.cpp
index e9781dff4b..85295fd036 100644
--- a/pcbnew/sel_layer.cpp
+++ b/pcbnew/sel_layer.cpp
@@ -2,10 +2,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
-#include "pcbnew.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 
+#include "pcbnew.h"
 #include "protos.h"
 
 
diff --git a/pcbnew/set_color.cpp b/pcbnew/set_color.cpp
index 4b9b39352a..62f81a5ba9 100644
--- a/pcbnew/set_color.cpp
+++ b/pcbnew/set_color.cpp
@@ -9,23 +9,12 @@
 #pragma implementation "set_color.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
-#include "pcbnew.h"
+#include "class_drawpanel.h"
 
+#include "pcbnew.h"
 #include "protos.h"
 
 #include "set_color.h" // Header file associated with this file
diff --git a/pcbnew/set_grid.cpp b/pcbnew/set_grid.cpp
index 19923327e9..6bfa793293 100644
--- a/pcbnew/set_grid.cpp
+++ b/pcbnew/set_grid.cpp
@@ -7,8 +7,9 @@
 */
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "pcbnew.h"
 
 #include "protos.h"
diff --git a/pcbnew/solve.cpp b/pcbnew/solve.cpp
index 73899c3504..dedb1d681d 100644
--- a/pcbnew/solve.cpp
+++ b/pcbnew/solve.cpp
@@ -6,12 +6,13 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
 #include "zones.h"
-
 #include "protos.h"
 
 #include <fcntl.h>
diff --git a/pcbnew/specctra_export.cpp b/pcbnew/specctra_export.cpp
index 51d9c7f087..d84cf494bf 100644
--- a/pcbnew/specctra_export.cpp
+++ b/pcbnew/specctra_export.cpp
@@ -36,6 +36,8 @@
 #include "collectors.h"
 #include "wxPcbStruct.h"        // Change_Side_Module()
 #include "pcbstruct.h"          // HISTORY_NUMBER
+#include "confirm.h"            // DisplayError()
+#include "gestfich.h"           // EDA_FileSelector()
 #include "autorout.h"           // NET_CODES_OK
 
 #include "trigo.h"              // RotatePoint()
diff --git a/pcbnew/specctra_import.cpp b/pcbnew/specctra_import.cpp
index 6acbe30f8d..f8b61557a9 100644
--- a/pcbnew/specctra_import.cpp
+++ b/pcbnew/specctra_import.cpp
@@ -34,6 +34,9 @@
 
 #include "specctra.h"
 #include "common.h"             // IsOK() & EDA_FileSelector()
+#include "class_drawpanel.h"    // DrawPanel
+#include "confirm.h"            // DisplayError()
+#include "gestfich.h"           // EDA_FileSelector()
 
 
 
diff --git a/pcbnew/surbrill.cpp b/pcbnew/surbrill.cpp
index 16b8a7e8ab..109157e16f 100644
--- a/pcbnew/surbrill.cpp
+++ b/pcbnew/surbrill.cpp
@@ -4,10 +4,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+#include "kicad_string.h"
 
-#include "common.h"
 #include "pcbnew.h"
-
 #include "protos.h"
 #include "collectors.h"
 
diff --git a/pcbnew/swap_layers.cpp b/pcbnew/swap_layers.cpp
index 6118e07e60..3a82dc30e4 100644
--- a/pcbnew/swap_layers.cpp
+++ b/pcbnew/swap_layers.cpp
@@ -6,6 +6,8 @@
 
 #include "fctsys.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "protos.h"
 
diff --git a/pcbnew/tool_onrightclick.cpp b/pcbnew/tool_onrightclick.cpp
index ec7ba122f3..6e3bb2409c 100644
--- a/pcbnew/tool_onrightclick.cpp
+++ b/pcbnew/tool_onrightclick.cpp
@@ -3,10 +3,9 @@
 /********************************************************************************/
 
 #include "fctsys.h"
-
 #include "gr_basic.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "autorout.h"
 
diff --git a/pcbnew/tracemod.cpp b/pcbnew/tracemod.cpp
index ae48a63a41..127c25bd0b 100644
--- a/pcbnew/tracemod.cpp
+++ b/pcbnew/tracemod.cpp
@@ -4,10 +4,11 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
-#include "pcbnew.h"
 #include "trigo.h"
+#include "class_drawpanel.h"
+
+#include "pcbnew.h"
 
 #ifdef PCBNEW
 #include "drag.h"
diff --git a/pcbnew/tracepcb.cpp b/pcbnew/tracepcb.cpp
index 7ef8abf367..66120fdc3b 100644
--- a/pcbnew/tracepcb.cpp
+++ b/pcbnew/tracepcb.cpp
@@ -12,12 +12,12 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+
 #include "pcbnew.h"
 #include "autorout.h"
 #include "pcbplot.h"
-
 #include "protos.h"
 
 
diff --git a/pcbnew/undelete.cpp b/pcbnew/undelete.cpp
index 9a437d149b..24d1b5c2a1 100644
--- a/pcbnew/undelete.cpp
+++ b/pcbnew/undelete.cpp
@@ -4,8 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
+
 #include "pcbnew.h"
 
 
diff --git a/pcbnew/via_edit.cpp b/pcbnew/via_edit.cpp
index cec6e1efae..c943ae14c0 100644
--- a/pcbnew/via_edit.cpp
+++ b/pcbnew/via_edit.cpp
@@ -4,10 +4,10 @@
 
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
-
 #include "id.h"
 
 
diff --git a/pcbnew/xchgmod.cpp b/pcbnew/xchgmod.cpp
index 4b4d917cf8..d3caee35f0 100644
--- a/pcbnew/xchgmod.cpp
+++ b/pcbnew/xchgmod.cpp
@@ -7,6 +7,9 @@
 #include "fctsys.h"
 #include "gr_basic.h"
 #include "common.h"
+#include "confirm.h"
+#include "kicad_string.h"
+#include "gestfich.h"
 #include "pcbnew.h"
 #include "autorout.h"
 
diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp
index ee3f99c72b..484e6943b0 100644
--- a/pcbnew/zones_by_polygon.cpp
+++ b/pcbnew/zones_by_polygon.cpp
@@ -4,28 +4,16 @@
 // Licence:     GPL License
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
 using namespace std;
 
 #include "fctsys.h"
-
+#include "appl_wxstruct.h"
 #include "common.h"
+#include "class_drawpanel.h"
+#include "confirm.h"
 #include "pcbnew.h"
 #include "zones.h"
-
 #include "id.h"
-
 #include "protos.h"
 
 bool verbose = false;       // false if zone outline diags must not be shown
diff --git a/pcbnew/zones_non_copper_type_functions.cpp b/pcbnew/zones_non_copper_type_functions.cpp
index 761a4c8622..1f41c8f2fc 100644
--- a/pcbnew/zones_non_copper_type_functions.cpp
+++ b/pcbnew/zones_non_copper_type_functions.cpp
@@ -1,7 +1,8 @@
 
 #include "fctsys.h"
+#include "appl_wxstruct.h"
 #include "gr_basic.h"
-
+#include "confirm.h"
 #include "common.h"
 #include "pcbnew.h"
 
diff --git a/pcbnew/zones_test_and_combine_areas.cpp b/pcbnew/zones_test_and_combine_areas.cpp
index 1d85deee88..99d9dd7a93 100644
--- a/pcbnew/zones_test_and_combine_areas.cpp
+++ b/pcbnew/zones_test_and_combine_areas.cpp
@@ -7,8 +7,8 @@
 #include <vector>
 
 #include "fctsys.h"
-
 #include "common.h"
+#include "confirm.h"
 #include "pcbnew.h"
 
 using namespace std;
diff --git a/share/setpage.cpp b/share/setpage.cpp
index fd2ebebc57..27497dc13c 100644
--- a/share/setpage.cpp
+++ b/share/setpage.cpp
@@ -25,23 +25,15 @@
 #pragma implementation "setpage.h"
 #endif
 
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
 ////@begin includes
 ////@end includes
 #include "fctsys.h"
 #include "gr_basic.h"
-
 #include "common.h"
+#include "base_struct.h"
+#include "class_drawpanel.h"
+#include "class_base_screen.h"
+#include "wxstruct.h"
 
 #ifdef EESCHEMA
 #include "program.h"