diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp
index 28166461ce..46e944f4af 100644
--- a/common/drawpanel.cpp
+++ b/common/drawpanel.cpp
@@ -353,8 +353,8 @@ void EDA_DRAW_PANEL::OnScroll( wxScrollWinEvent& event )
     }
 
     wxLogTrace( KICAD_TRACE_COORDS,
-                wxT( "Setting scroll bars ppuX=%d, ppuY=%d, unitsX=%d, unitsY=%d," \
-                     "posX=%d, posY=%d" ), ppux, ppuy, unitsX, unitsY, x, y );
+                wxT( "Setting scroll bars ppuX=%d, ppuY=%d, unitsX=%d, unitsY=%d, posX=%d, posY=%d" ),
+                ppux, ppuy, unitsX, unitsY, x, y );
 
     Scroll( x/ppux, y/ppuy );
     event.Skip();
diff --git a/gerbview/class_aperture_macro.cpp b/gerbview/class_aperture_macro.cpp
index 14c9c487bc..ee41bf4363 100644
--- a/gerbview/class_aperture_macro.cpp
+++ b/gerbview/class_aperture_macro.cpp
@@ -458,7 +458,8 @@ void AM_PRIMITIVE::ConvertShapeToPolygon( GERBER_DRAW_ITEM*     aParent,
         aBuffer.push_back( currpt );
 
         // Rotate rectangle and move it to the actual start point
-        int angle = wxRound( atan2( delta.y, delta.x ) * 1800.0 / M_PI );
+        int angle = wxRound( atan2( (double) delta.y, (double) delta.x ) * 1800.0 / M_PI );
+
         for( unsigned ii = 0; ii < 4; ii++ )
         {
             RotatePoint( &aBuffer[ii], -angle );
diff --git a/gerbview/dcode.h b/gerbview/dcode.h
index 7912b43e50..1246d0f035 100644
--- a/gerbview/dcode.h
+++ b/gerbview/dcode.h
@@ -66,7 +66,7 @@ enum APERTURE_DEF_HOLETYPE {
 #define LAST_DCODE      999
 #define TOOLS_MAX_COUNT (LAST_DCODE + 1)
 
-class APERTURE_MACRO;
+struct APERTURE_MACRO;
 
 
 /**
diff --git a/pcbnew/automove.cpp b/pcbnew/automove.cpp
index 242e2d2b95..e647d1acf7 100644
--- a/pcbnew/automove.cpp
+++ b/pcbnew/automove.cpp
@@ -211,7 +211,11 @@ void WinEDA_PcbFrame::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
     if( PlaceModulesHorsPcb && edgesExists )
     {
         if( GetScreen()->GetCrossHairPosition().y < (GetBoard()->m_BoundaryBox.GetBottom() + 2000) )
-            GetScreen()->GetCrossHairPosition().y = GetBoard()->m_BoundaryBox.GetBottom() + 2000;
+        {
+            wxPoint pos = GetScreen()->GetCrossHairPosition();
+            pos.y = GetBoard()->m_BoundaryBox.GetBottom() + 2000;
+            GetScreen()->SetCrossHairPosition( pos );
+        }
     }
 
     /* calculate the area needed by footprints */