diff --git a/gpxsee.pro b/gpxsee.pro
index 7e73af22..73f1ee43 100644
--- a/gpxsee.pro
+++ b/gpxsee.pro
@@ -14,6 +14,7 @@ HEADERS += src/config.h \
     src/common/range.h \
     src/common/rectc.h \
     src/common/wgs84.h \
+    src/common/str2int.h \
     src/GUI/app.h \
     src/GUI/icons.h \
     src/GUI/gui.h \
@@ -111,7 +112,6 @@ HEADERS += src/config.h \
     src/data/fitparser.h \
     src/data/igcparser.h \
     src/data/nmeaparser.h \
-    src/data/str2int.h \
     src/map/gcs.h \
     src/map/angularunits.h \
     src/map/primemeridian.h \
@@ -120,6 +120,7 @@ SOURCES += src/main.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \
+    src/common/str2int.cpp \
     src/GUI/app.cpp \
     src/GUI/gui.cpp \
     src/GUI/axisitem.cpp \
@@ -195,7 +196,6 @@ SOURCES += src/main.cpp \
     src/data/fitparser.cpp \
     src/data/igcparser.cpp \
     src/data/nmeaparser.cpp \
-    src/data/str2int.cpp \
     src/map/projection.cpp \
     src/map/gcs.cpp \
     src/map/angularunits.cpp \
diff --git a/src/data/str2int.cpp b/src/common/str2int.cpp
similarity index 100%
rename from src/data/str2int.cpp
rename to src/common/str2int.cpp
diff --git a/src/data/str2int.h b/src/common/str2int.h
similarity index 100%
rename from src/data/str2int.h
rename to src/common/str2int.h
diff --git a/src/data/igcparser.cpp b/src/data/igcparser.cpp
index c536a186..94aeb015 100644
--- a/src/data/igcparser.cpp
+++ b/src/data/igcparser.cpp
@@ -1,5 +1,5 @@
 #include <cstring>
-#include "str2int.h"
+#include "common/str2int.h"
 #include "igcparser.h"
 
 
diff --git a/src/data/nmeaparser.cpp b/src/data/nmeaparser.cpp
index 4b82236a..89600a52 100644
--- a/src/data/nmeaparser.cpp
+++ b/src/data/nmeaparser.cpp
@@ -1,5 +1,5 @@
 #include <cstring>
-#include "str2int.h"
+#include "common/str2int.h"
 #include "nmeaparser.h"
 
 
diff --git a/src/map/angularunits.cpp b/src/map/angularunits.cpp
index 433e65c3..0718fc4f 100644
--- a/src/map/angularunits.cpp
+++ b/src/map/angularunits.cpp
@@ -1,5 +1,5 @@
 #include "common/coordinates.h"
-#include "data/str2int.h"
+#include "common/str2int.h"
 #include "angularunits.h"
 
 static double sDMS2deg(double val)