diff --git a/libraries/AP_GPS/AP_GPS_None.cpp b/libraries/AP_GPS/AP_GPS_None.cpp
deleted file mode 100644
index af60f438e0..0000000000
--- a/libraries/AP_GPS/AP_GPS_None.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-	AP_GPS_None.cpp			
-*/
-
-#include "AP_GPS_None.h"
-
-AP_GPS_None::AP_GPS_None()
-{
-}
-
-
-void AP_GPS_None::init(void)
-{	
-}
-
-void AP_GPS_None::update(void)
-{
-}
-
diff --git a/libraries/AP_GPS/AP_GPS_None.h b/libraries/AP_GPS/AP_GPS_None.h
index f950b72a6a..f3a3d9b11a 100644
--- a/libraries/AP_GPS/AP_GPS_None.h
+++ b/libraries/AP_GPS/AP_GPS_None.h
@@ -1,3 +1,5 @@
+// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: t -*-
+
 #ifndef AP_GPS_None_h
 #define AP_GPS_None_h
 
@@ -5,12 +7,5 @@
 
 class AP_GPS_None : public GPS
 {
-  public:
-	AP_GPS_None();
-	void init();
-	void update();
-
-  private:
-
 };
 #endif
diff --git a/libraries/AP_GPS/GPS.cpp b/libraries/AP_GPS/GPS.cpp
index 53268ffdcf..f84cb67306 100644
--- a/libraries/AP_GPS/GPS.cpp
+++ b/libraries/AP_GPS/GPS.cpp
@@ -3,6 +3,16 @@
 #include "GPS.h"
 #include <stdio.h>
 
+void
+GPS::init(void)
+{
+}
+
+void
+GPS::update(void)
+{
+}
+
 void
 GPS::_error(const char *fmt, ...)
 {
diff --git a/libraries/AP_GPS/GPS.h b/libraries/AP_GPS/GPS.h
index 5b18f62d04..1b93ec0195 100644
--- a/libraries/AP_GPS/GPS.h
+++ b/libraries/AP_GPS/GPS.h
@@ -22,7 +22,7 @@ public:
 	///
 	/// @param	port	Stream connected to the GPS module.
 	///
-	GPS(Stream *port) : _port(port) {};
+	GPS(Stream *port = NULL) : _port(port) {};
 
 	/// Startup initialisation.
 	///