diff --git a/src/context.rs b/src/context.rs
index d96766e57..4d52d658b 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -111,22 +111,6 @@ pub struct SmtpState {
     pub probe_network: i32,
 }
 
-// location handling
-#[derive(Copy, Clone)]
-#[repr(C)]
-pub struct _dc_location {
-    pub location_id: uint32_t,
-    pub latitude: libc::c_double,
-    pub longitude: libc::c_double,
-    pub accuracy: libc::c_double,
-    pub timestamp: i64,
-    pub contact_id: uint32_t,
-    pub msg_id: uint32_t,
-    pub chat_id: uint32_t,
-    pub marker: *mut libc::c_char,
-    pub independent: uint32_t,
-}
-
 // create/open/config/information
 pub fn dc_context_new(
     cb: Option<dc_callback_t>,
diff --git a/src/dc_array.rs b/src/dc_array.rs
index 04486e59c..dca85bc67 100644
--- a/src/dc_array.rs
+++ b/src/dc_array.rs
@@ -1,4 +1,4 @@
-use crate::context::*;
+use crate::dc_location::_dc_location;
 use crate::dc_tools::*;
 use crate::types::*;
 use crate::x::*;
diff --git a/src/dc_location.rs b/src/dc_location.rs
index 0be44af4c..597b8bb98 100644
--- a/src/dc_location.rs
+++ b/src/dc_location.rs
@@ -15,7 +15,7 @@ use crate::x::*;
 // location handling
 #[derive(Copy, Clone)]
 #[repr(C)]
-pub struct dc_location_t {
+pub struct _dc_location {
     pub location_id: uint32_t,
     pub latitude: libc::c_double,
     pub longitude: libc::c_double,
@@ -25,6 +25,7 @@ pub struct dc_location_t {
     pub msg_id: uint32_t,
     pub chat_id: uint32_t,
     pub marker: *mut libc::c_char,
+    pub independent: uint32_t,
 }
 
 #[derive(Copy, Clone)]
@@ -33,7 +34,7 @@ pub struct dc_kml_t {
     pub addr: *mut libc::c_char,
     pub locations: *mut dc_array_t,
     pub tag: libc::c_int,
-    pub curr: dc_location_t,
+    pub curr: _dc_location,
 }
 
 // location streaming
@@ -412,7 +413,7 @@ pub unsafe fn dc_save_locations(
                 let mut newest_location_id = 0;
 
                 for i in 0..dc_array_get_cnt(locations) {
-                    let location = dc_array_get_ptr(locations, i as size_t) as *mut dc_location_t;
+                    let location = dc_array_get_ptr(locations, i as size_t) as *mut _dc_location;
 
                     let exists =
                         stmt_test.exists(params![(*location).timestamp, contact_id as i32])?;
@@ -552,8 +553,8 @@ unsafe fn kml_endtag_cb(userdata: *mut libc::c_void, tag: *const libc::c_char) {
             && 0. != (*kml).curr.latitude
             && 0. != (*kml).curr.longitude
         {
-            let location: *mut dc_location_t =
-                calloc(1, ::std::mem::size_of::<dc_location_t>()) as *mut dc_location_t;
+            let location: *mut _dc_location =
+                calloc(1, ::std::mem::size_of::<_dc_location>()) as *mut _dc_location;
             *location = (*kml).curr;
             dc_array_add_ptr((*kml).locations, location as *mut libc::c_void);
         }