diff --git a/GPSD.cpp b/GPSD.cpp
index aec42f0..c06321a 100644
--- a/GPSD.cpp
+++ b/GPSD.cpp
@@ -18,7 +18,7 @@
 
 #include "GPSD.h"
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 
 #include <cstdio>
 #include <cassert>
@@ -101,4 +101,3 @@ void CGPSD::sendReport()
 }
 
 #endif
-
diff --git a/GPSD.h b/GPSD.h
index d8838db..cef93b5 100644
--- a/GPSD.h
+++ b/GPSD.h
@@ -19,7 +19,7 @@
 #ifndef	GPSD_H
 #define	GPSD_H
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 
 #include "DMRNetwork.h"
 #include "Timer.h"
@@ -52,4 +52,3 @@ private:
 #endif
 
 #endif
-
diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp
index 2787049..5e6940b 100644
--- a/MMDVMHost.cpp
+++ b/MMDVMHost.cpp
@@ -168,7 +168,7 @@ m_id(0U),
 m_cwCallsign(),
 m_lockFileEnabled(false),
 m_lockFileName(),
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 m_gpsd(NULL),
 #endif
 m_remoteControl(NULL),
@@ -1102,7 +1102,7 @@ int CMMDVMHost::run()
 		if (m_fmNetwork != NULL)
 			m_fmNetwork->clock(ms);
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 		if (m_gpsd != NULL)
 			m_gpsd->clock(ms);
 #endif
@@ -1182,7 +1182,7 @@ int CMMDVMHost::run()
 	m_display->close();
 	delete m_display;
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 	if (m_gpsd != NULL) {
 		m_gpsd->close();
 		delete m_gpsd;
@@ -1526,7 +1526,7 @@ bool CMMDVMHost::createDMRNetwork()
 		return false;
 	}
 
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
 	bool gpsdEnabled = m_conf.getGPSDEnabled();
 	if (gpsdEnabled) {
 		std::string gpsdAddress = m_conf.getGPSDAddress();
diff --git a/MMDVMHost.h b/MMDVMHost.h
index bb7b555..d7f3e84 100644
--- a/MMDVMHost.h
+++ b/MMDVMHost.h
@@ -113,7 +113,7 @@ private:
   std::string     m_cwCallsign;
   bool            m_lockFileEnabled;
   std::string     m_lockFileName;
-#if defined(USE_GPS)
+#if defined(USE_GPSD)
   CGPSD*          m_gpsd;
 #endif
   CRemoteControl* m_remoteControl;
diff --git a/MMDVMHost.vcxproj.filters b/MMDVMHost.vcxproj.filters
index ecb892d..32cca98 100644
--- a/MMDVMHost.vcxproj.filters
+++ b/MMDVMHost.vcxproj.filters
@@ -275,6 +275,9 @@
     <ClInclude Include="POCSAGDefines.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="I2CController.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="NullModem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -562,6 +565,9 @@
     <ClCompile Include="POCSAGControl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="I2CController.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="NullModem.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/Makefile b/Makefile
index 6af3151..5ab488b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread
 LIBS    = -lpthread -lutil
 
 # Use the following CFLAGS and LIBS if you do want to use gpsd.
-#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread
-#LIBS    = -lpthread -lutil -lgps -lutil
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread
+#LIBS    = -lpthread -lgps -lutil
 
 LDFLAGS = -g
 
diff --git a/Makefile.Pi b/Makefile.Pi
index 9e6fe90..f936cad 100644
--- a/Makefile.Pi
+++ b/Makefile.Pi
@@ -7,7 +7,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DRASPBERRY_PI -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread -lutil
 
 # Use the following CFLAGS and LIBS if you do want to use gpsd.
-#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread -DRASPBERRY_PI -I/usr/local/include
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread -DRASPBERRY_PI -I/usr/local/include
 #LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps -lutil
 
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit
index ab3279b..928937e 100644
--- a/Makefile.Pi.Adafruit
+++ b/Makefile.Pi.Adafruit
@@ -8,7 +8,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DADAFRUIT_DISPLAY -I/usr/l
 LIBS    = -lwiringPi -lwiringPiDev -lpthread -lutil
 
 # Use the following CFLAGS and LIBS if you do want to use gpsd.
-#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread -DHD44780 -DADAFRUIT_DISPLAY -I/usr/local/include
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread -DHD44780 -DADAFRUIT_DISPLAY -I/usr/local/include
 #LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps -lutil
 
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780
index 659b6fd..d6a7241 100644
--- a/Makefile.Pi.HD44780
+++ b/Makefile.Pi.HD44780
@@ -8,7 +8,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -I/usr/local/include
 LIBS    = -lwiringPi -lwiringPiDev -lpthread -lutil
 
 # Use the following CFLAGS and LIBS if you do want to use gpsd.
-#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread -DHD44780 -I/usr/local/include
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread -DHD44780 -I/usr/local/include
 #LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps -lutil
 
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574
index d037b95..f06d5c4 100644
--- a/Makefile.Pi.PCF8574
+++ b/Makefile.Pi.PCF8574
@@ -9,7 +9,7 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread -DHD44780 -DPCF8574_DISPLAY -I/usr/lo
 LIBS    = -lwiringPi -lwiringPiDev -lpthread -lutil
 
 # Use the following CFLAGS and LIBS if you do want to use gpsd.
-#CFLAGS  = -g -O3 -Wall -DUSE_GPS -std=c++0x -pthread -DHD44780 -DPCF8574_DISPLAY -I/usr/local/include
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread -DHD44780 -DPCF8574_DISPLAY -I/usr/local/include
 #LIBS    = -lwiringPi -lwiringPiDev -lpthread -lgps -lutil
 
 LDFLAGS = -g -L/usr/local/lib
diff --git a/Version.h b/Version.h
index 68d6440..bb444d2 100644
--- a/Version.h
+++ b/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20200629";
+const char* VERSION = "20200630";
 
 #endif