diff --git a/src/Main/viewer.cxx b/src/Main/viewer.cxx
index cf1e9073f..421f4b6c0 100644
--- a/src/Main/viewer.cxx
+++ b/src/Main/viewer.cxx
@@ -36,8 +36,8 @@
 
 // Constructor
 FGViewer::FGViewer( void ):
-    fov(55.0),
     scalingType(FG_SCALING_MAX),
+    fov(55.0),
     view_offset(0.0),
     goal_view_offset(0.0),
     view_tilt(0.0),
diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index 62b2d6c4e..b87f97caa 100644
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -31,6 +31,7 @@
 #endif                                   
 
 #include <simgear/compiler.h>
+#include <simgear/constants.h>
 
 #include <plib/sg.h>		// plib include
 
@@ -167,11 +168,11 @@ public:
     inline void set_goal_view_offset( double a) {
 	set_dirty();
 	goal_view_offset = a;
-	while ( goal_view_offset < 0 ) {
-	    goal_view_offset += 360.0;
+	while ( goal_view_offset < 0.0 ) {
+	    goal_view_offset += SGD_2PI;
 	}
-	while ( goal_view_offset > 360.0 ) {
-	    goal_view_offset -= 360.0;
+	while ( goal_view_offset > SGD_2PI ) {
+	    goal_view_offset -= SGD_2PI;
 	}
     }
     inline void set_reverse_view_offset( bool val ) {