diff --git a/CMakeLists.txt b/CMakeLists.txt
index 051f9f8c1935..964931dafe87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,7 +233,7 @@ IF(WITH_CORE)
   FIND_PACKAGE(LibZip REQUIRED)
 
   IF (WITH_INTERNAL_QEXTSERIALPORT)
-    SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)
+    SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qextserialport)
   ELSE (WITH_INTERNAL_QEXTSERIALPORT)
     FIND_PACKAGE(Qextserialport REQUIRED)
   ENDIF(WITH_INTERNAL_QEXTSERIALPORT)
diff --git a/src/core/gps/qextserialport/posix_qextserialport.cpp b/external/qextserialport/posix_qextserialport.cpp
similarity index 100%
rename from src/core/gps/qextserialport/posix_qextserialport.cpp
rename to external/qextserialport/posix_qextserialport.cpp
diff --git a/src/core/gps/qextserialport/qextserialenumerator.cpp b/external/qextserialport/qextserialenumerator.cpp
similarity index 100%
rename from src/core/gps/qextserialport/qextserialenumerator.cpp
rename to external/qextserialport/qextserialenumerator.cpp
diff --git a/src/core/gps/qextserialport/qextserialenumerator.h b/external/qextserialport/qextserialenumerator.h
similarity index 100%
rename from src/core/gps/qextserialport/qextserialenumerator.h
rename to external/qextserialport/qextserialenumerator.h
diff --git a/src/core/gps/qextserialport/qextserialport.cpp b/external/qextserialport/qextserialport.cpp
similarity index 100%
rename from src/core/gps/qextserialport/qextserialport.cpp
rename to external/qextserialport/qextserialport.cpp
diff --git a/src/core/gps/qextserialport/qextserialport.h b/external/qextserialport/qextserialport.h
similarity index 100%
rename from src/core/gps/qextserialport/qextserialport.h
rename to external/qextserialport/qextserialport.h
diff --git a/src/core/gps/qextserialport/qwineventnotifier.h b/external/qextserialport/qwineventnotifier.h
similarity index 100%
rename from src/core/gps/qextserialport/qwineventnotifier.h
rename to external/qextserialport/qwineventnotifier.h
diff --git a/src/core/gps/qextserialport/win_qextserialport.cpp b/external/qextserialport/win_qextserialport.cpp
similarity index 100%
rename from src/core/gps/qextserialport/win_qextserialport.cpp
rename to external/qextserialport/win_qextserialport.cpp
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 120e599d9031..fca8120f0cc7 100755
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -562,18 +562,18 @@ ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
 IF (WITH_INTERNAL_QEXTSERIALPORT)
   SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
-    gps/qextserialport/qextserialport.cpp
-    gps/qextserialport/qextserialenumerator.cpp
+    ${CMAKE_SOURCE_DIR}/external/qextserialport/qextserialport.cpp
+    ${CMAKE_SOURCE_DIR}/external/qextserialport/qextserialenumerator.cpp
   )
   IF(WIN32)
     SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
-      gps/qextserialport/win_qextserialport.cpp
+      ${CMAKE_SOURCE_DIR}/external/qextserialport/win_qextserialport.cpp
     )
     ADD_DEFINITIONS(-D_TTY_WIN_)
 
   ELSE(WIN32)
     SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
-      gps/qextserialport/posix_qextserialport.cpp
+      ${CMAKE_SOURCE_DIR}/external/qextserialport/posix_qextserialport.cpp
     )
     ADD_DEFINITIONS(-D_TTY_POSIX_)
   ENDIF(WIN32)
@@ -810,8 +810,8 @@ ENDIF(NOT WITH_QTWEBKIT)
 
 IF (WITH_INTERNAL_QEXTSERIALPORT)
   SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS}
-    gps/qextserialport/qextserialport.h
-    gps/qextserialport/qextserialenumerator.h
+    ${CMAKE_SOURCE_DIR}/external/qextserialport/qextserialport.h
+    ${CMAKE_SOURCE_DIR}/external/qextserialport/qextserialenumerator.h
   )
 ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
 
@@ -1236,9 +1236,12 @@ INCLUDE_DIRECTORIES(
   renderer
   scalebar
   symbology
-  gps/qextserialport
   metadata
 )
+IF (WITH_INTERNAL_QEXTSERIALPORT)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/external/qextserialport)
+ENDIF(WITH_INTERNAL_QEXTSERIALPORT)
+
 INCLUDE_DIRECTORIES(SYSTEM
   ${LIBZIP_INCLUDE_DIRS}
   ${SPATIALINDEX_INCLUDE_DIR}
@@ -1252,6 +1255,7 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QTKEYCHAIN_INCLUDE_DIR}
 )
 
+
 IF (APPLE)
   # Libtasn1 is for DER-encoded PKI ASN.1 parsing/extracting workarounds
   INCLUDE_DIRECTORIES(SYSTEM