diff --git a/src/cressi_leonardo.c b/src/cressi_leonardo.c
index ea3966d..5c1dd29 100644
--- a/src/cressi_leonardo.c
+++ b/src/cressi_leonardo.c
@@ -70,6 +70,9 @@ static const dc_device_vtable_t cressi_leonardo_device_vtable = {
 	cressi_leonardo_device_close /* close */
 };
 
+static dc_status_t
+cressi_leonardo_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
+
 static void
 cressi_leonardo_make_ascii (const unsigned char raw[], unsigned int rsize, unsigned char ascii[], unsigned int asize)
 {
@@ -433,7 +436,7 @@ cressi_leonardo_device_foreach (dc_device_t *abstract, dc_dive_callback_t callba
 	return rc;
 }
 
-dc_status_t
+static dc_status_t
 cressi_leonardo_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	cressi_leonardo_device_t *device = (cressi_leonardo_device_t *) abstract;
diff --git a/src/cressi_leonardo.h b/src/cressi_leonardo.h
index 043cd5f..c17b41b 100644
--- a/src/cressi_leonardo.h
+++ b/src/cressi_leonardo.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 cressi_leonardo_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-cressi_leonardo_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 cressi_leonardo_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model);
 
diff --git a/src/diverite_nitekq.c b/src/diverite_nitekq.c
index 8493153..205115a 100644
--- a/src/diverite_nitekq.c
+++ b/src/diverite_nitekq.c
@@ -72,6 +72,8 @@ static const dc_device_vtable_t diverite_nitekq_device_vtable = {
 	diverite_nitekq_device_close /* close */
 };
 
+static dc_status_t
+diverite_nitekq_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 static dc_status_t
 diverite_nitekq_send (diverite_nitekq_device_t *device, unsigned char cmd)
@@ -352,7 +354,7 @@ diverite_nitekq_device_foreach (dc_device_t *abstract, dc_dive_callback_t callba
 }
 
 
-dc_status_t
+static dc_status_t
 diverite_nitekq_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	diverite_nitekq_device_t *device = (diverite_nitekq_device_t *) abstract;
diff --git a/src/diverite_nitekq.h b/src/diverite_nitekq.h
index fd1fa6b..c8987e2 100644
--- a/src/diverite_nitekq.h
+++ b/src/diverite_nitekq.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 diverite_nitekq_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-diverite_nitekq_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 diverite_nitekq_parser_create (dc_parser_t **parser, dc_context_t *context);
 
diff --git a/src/hw_ostc.c b/src/hw_ostc.c
index ce30415..3f46603 100644
--- a/src/hw_ostc.c
+++ b/src/hw_ostc.c
@@ -83,6 +83,8 @@ static const dc_device_vtable_t hw_ostc_device_vtable = {
 	hw_ostc_device_close /* close */
 };
 
+static dc_status_t
+hw_ostc_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 static dc_status_t
 hw_ostc_send (hw_ostc_device_t *device, unsigned char cmd, unsigned int echo)
@@ -632,7 +634,7 @@ hw_ostc_device_screenshot (dc_device_t *abstract, dc_buffer_t *buffer, hw_ostc_f
 }
 
 
-dc_status_t
+static dc_status_t
 hw_ostc_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	hw_ostc_device_t *device = (hw_ostc_device_t *) abstract;
diff --git a/src/hw_ostc.h b/src/hw_ostc.h
index b7f7aa8..3f54a7b 100644
--- a/src/hw_ostc.h
+++ b/src/hw_ostc.h
@@ -34,9 +34,6 @@ extern "C" {
 dc_status_t
 hw_ostc_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-hw_ostc_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 hw_ostc_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int hwos);
 
diff --git a/src/mares_darwin.c b/src/mares_darwin.c
index 3922c75..9ac56ba 100644
--- a/src/mares_darwin.c
+++ b/src/mares_darwin.c
@@ -93,6 +93,8 @@ static const mares_darwin_layout_t mares_darwinair_layout = {
 	3       /* samplesize */
 };
 
+static dc_status_t
+mares_darwin_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 dc_status_t
 mares_darwin_device_open (dc_device_t **out, dc_context_t *context, const char *name, unsigned int model)
@@ -262,7 +264,7 @@ mares_darwin_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback,
 }
 
 
-dc_status_t
+static dc_status_t
 mares_darwin_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	mares_darwin_device_t *device = (mares_darwin_device_t *) abstract;
diff --git a/src/mares_darwin.h b/src/mares_darwin.h
index 3df4578..e7767ec 100644
--- a/src/mares_darwin.h
+++ b/src/mares_darwin.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 mares_darwin_device_open (dc_device_t **device, dc_context_t *context, const char *name, unsigned int model);
 
-dc_status_t
-mares_darwin_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 mares_darwin_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model);
 
diff --git a/src/mares_nemo.c b/src/mares_nemo.c
index dc6b480..2ec3588 100644
--- a/src/mares_nemo.c
+++ b/src/mares_nemo.c
@@ -282,6 +282,8 @@ mares_nemo_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
 static dc_status_t
 mares_nemo_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, void *userdata)
 {
+	mares_nemo_device_t *device = (mares_nemo_device_t *) abstract;
+
 	dc_buffer_t *buffer = dc_buffer_new (MEMORYSIZE);
 	if (buffer == NULL)
 		return DC_STATUS_NOMEMORY;
@@ -300,28 +302,6 @@ mares_nemo_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, v
 	devinfo.serial = array_uint16_be (data + 8);
 	device_event_emit (abstract, DC_EVENT_DEVINFO, &devinfo);
 
-	rc = mares_nemo_extract_dives (abstract, data, MEMORYSIZE, callback, userdata);
-
-	dc_buffer_free (buffer);
-
-	return rc;
-}
-
-
-dc_status_t
-mares_nemo_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
-{
-	mares_nemo_device_t *device = (mares_nemo_device_t*) abstract;
-
-	if (abstract && !ISINSTANCE (abstract))
-		return DC_STATUS_INVALIDARGS;
-
-	if (size < PACKETSIZE)
-		return DC_STATUS_DATAFORMAT;
-
-	dc_context_t *context = (abstract ? abstract->context : NULL);
-	unsigned char *fingerprint = (device ? device->fingerprint : NULL);
-
 	const mares_common_layout_t *layout = NULL;
 	switch (data[1]) {
 	case NEMO:
@@ -332,12 +312,14 @@ mares_nemo_extract_dives (dc_device_t *abstract, const unsigned char data[], uns
 		layout = &mares_nemo_apneist_layout;
 		break;
 	default: // Unknown, try nemo
+		WARNING (abstract->context, "Unsupported model %02x detected!", data[1]);
 		layout = &mares_nemo_layout;
 		break;
 	}
 
-	if (size < layout->memsize)
-		return DC_STATUS_DATAFORMAT;
+	rc = mares_common_extract_dives (abstract->context, layout, device->fingerprint, data, callback, userdata);
 
-	return mares_common_extract_dives (context, layout, fingerprint, data, callback, userdata);
+	dc_buffer_free (buffer);
+
+	return rc;
 }
diff --git a/src/mares_nemo.h b/src/mares_nemo.h
index 176070e..e25489b 100644
--- a/src/mares_nemo.h
+++ b/src/mares_nemo.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 mares_nemo_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-mares_nemo_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 mares_nemo_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model);
 
diff --git a/src/mares_puck.c b/src/mares_puck.c
index 0a75666..fc8e00d 100644
--- a/src/mares_puck.c
+++ b/src/mares_puck.c
@@ -266,41 +266,3 @@ mares_puck_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, v
 
 	return rc;
 }
-
-
-dc_status_t
-mares_puck_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
-{
-	mares_puck_device_t *device = (mares_puck_device_t*) abstract;
-
-	if (abstract && !ISINSTANCE (abstract))
-		return DC_STATUS_INVALIDARGS;
-
-	if (size < PACKETSIZE)
-		return DC_STATUS_DATAFORMAT;
-
-	dc_context_t *context = (abstract ? abstract->context : NULL);
-	unsigned char *fingerprint = (device ? device->fingerprint : NULL);
-
-	const mares_common_layout_t *layout = NULL;
-	switch (data[1]) {
-	case NEMOWIDE:
-		layout = &mares_nemowide_layout;
-		break;
-	case NEMOAIR:
-	case PUCKAIR:
-		layout = &mares_nemoair_layout;
-		break;
-	case PUCK:
-		layout = &mares_puck_layout;
-		break;
-	default: // Unknown, try puck
-		layout = &mares_puck_layout;
-		break;
-	}
-
-	if (size < layout->memsize)
-		return DC_STATUS_DATAFORMAT;
-
-	return mares_common_extract_dives (context, layout, fingerprint, data, callback, userdata);
-}
diff --git a/src/mares_puck.h b/src/mares_puck.h
index eba37c0..01447d1 100644
--- a/src/mares_puck.h
+++ b/src/mares_puck.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 mares_puck_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-mares_puck_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/src/reefnet_sensus.c b/src/reefnet_sensus.c
index b20047a..94d7a7e 100644
--- a/src/reefnet_sensus.c
+++ b/src/reefnet_sensus.c
@@ -60,6 +60,8 @@ static const dc_device_vtable_t reefnet_sensus_device_vtable = {
 	reefnet_sensus_device_close /* close */
 };
 
+static dc_status_t
+reefnet_sensus_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 static dc_status_t
 reefnet_sensus_cancel (reefnet_sensus_device_t *device)
@@ -368,7 +370,7 @@ reefnet_sensus_device_foreach (dc_device_t *abstract, dc_dive_callback_t callbac
 }
 
 
-dc_status_t
+static dc_status_t
 reefnet_sensus_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	reefnet_sensus_device_t *device = (reefnet_sensus_device_t*) abstract;
diff --git a/src/reefnet_sensus.h b/src/reefnet_sensus.h
index fda47d0..2ca6d43 100644
--- a/src/reefnet_sensus.h
+++ b/src/reefnet_sensus.h
@@ -34,9 +34,6 @@ extern "C" {
 dc_status_t
 reefnet_sensus_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-reefnet_sensus_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 reefnet_sensus_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int devtime, dc_ticks_t systime);
 
diff --git a/src/reefnet_sensuspro.c b/src/reefnet_sensuspro.c
index c0802de..bf88801 100644
--- a/src/reefnet_sensuspro.c
+++ b/src/reefnet_sensuspro.c
@@ -59,6 +59,8 @@ static const dc_device_vtable_t reefnet_sensuspro_device_vtable = {
 	reefnet_sensuspro_device_close /* close */
 };
 
+static dc_status_t
+reefnet_sensuspro_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 dc_status_t
 reefnet_sensuspro_device_open (dc_device_t **out, dc_context_t *context, const char *name)
@@ -361,7 +363,7 @@ reefnet_sensuspro_device_write_interval (dc_device_t *abstract, unsigned char in
 }
 
 
-dc_status_t
+static dc_status_t
 reefnet_sensuspro_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	reefnet_sensuspro_device_t *device = (reefnet_sensuspro_device_t*) abstract;
diff --git a/src/reefnet_sensuspro.h b/src/reefnet_sensuspro.h
index 91d80b8..000959a 100644
--- a/src/reefnet_sensuspro.h
+++ b/src/reefnet_sensuspro.h
@@ -34,9 +34,6 @@ extern "C" {
 dc_status_t
 reefnet_sensuspro_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-reefnet_sensuspro_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 reefnet_sensuspro_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int devtime, dc_ticks_t systime);
 
diff --git a/src/reefnet_sensusultra.c b/src/reefnet_sensusultra.c
index 4fa8187..f28dbb2 100644
--- a/src/reefnet_sensusultra.c
+++ b/src/reefnet_sensusultra.c
@@ -749,18 +749,3 @@ reefnet_sensusultra_device_foreach (dc_device_t *abstract, dc_dive_callback_t ca
 
 	return DC_STATUS_SUCCESS;
 }
-
-
-dc_status_t
-reefnet_sensusultra_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
-{
-	reefnet_sensusultra_device_t *device = (reefnet_sensusultra_device_t *) abstract;
-
-	if (abstract && !ISINSTANCE (abstract))
-		return DC_STATUS_INVALIDARGS;
-
-	unsigned int remaining = size;
-	unsigned int previous = size;
-
-	return reefnet_sensusultra_parse (device, data, &remaining, &previous, NULL, callback, userdata);
-}
diff --git a/src/reefnet_sensusultra.h b/src/reefnet_sensusultra.h
index a1d21be..84fcaea 100644
--- a/src/reefnet_sensusultra.h
+++ b/src/reefnet_sensusultra.h
@@ -34,9 +34,6 @@ extern "C" {
 dc_status_t
 reefnet_sensusultra_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-reefnet_sensusultra_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 reefnet_sensusultra_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int devtime, dc_ticks_t systime);
 
diff --git a/src/shearwater_predator.c b/src/shearwater_predator.c
index efb5eb4..0e7a0d3 100644
--- a/src/shearwater_predator.c
+++ b/src/shearwater_predator.c
@@ -60,6 +60,8 @@ static const dc_device_vtable_t shearwater_predator_device_vtable = {
 	shearwater_predator_device_close /* close */
 };
 
+static dc_status_t
+shearwater_predator_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 dc_status_t
 shearwater_predator_device_open (dc_device_t **out, dc_context_t *context, const char *name)
@@ -337,7 +339,7 @@ shearwater_predator_extract_petrel (dc_device_t *abstract, const unsigned char d
 }
 
 
-dc_status_t
+static dc_status_t
 shearwater_predator_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	if (abstract && !ISINSTANCE (abstract))
diff --git a/src/shearwater_predator.h b/src/shearwater_predator.h
index 4e3f5ae..f21d445 100644
--- a/src/shearwater_predator.h
+++ b/src/shearwater_predator.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 shearwater_predator_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-shearwater_predator_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 shearwater_predator_parser_create (dc_parser_t **parser, dc_context_t *context);
 
diff --git a/src/suunto_eon.c b/src/suunto_eon.c
index 30b95bf..ce9ce83 100644
--- a/src/suunto_eon.c
+++ b/src/suunto_eon.c
@@ -216,6 +216,8 @@ suunto_eon_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
 static dc_status_t
 suunto_eon_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, void *userdata)
 {
+	suunto_common_device_t *device = (suunto_common_device_t *) abstract;
+
 	dc_buffer_t *buffer = dc_buffer_new (SZ_MEMORY);
 	if (buffer == NULL)
 		return DC_STATUS_NOMEMORY;
@@ -238,8 +240,7 @@ suunto_eon_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, v
 	}
 	device_event_emit (abstract, DC_EVENT_DEVINFO, &devinfo);
 
-	rc = suunto_eon_extract_dives (abstract,
-		dc_buffer_get_data (buffer), dc_buffer_get_size (buffer), callback, userdata);
+	rc = suunto_common_extract_dives (device, &suunto_eon_layout, data, callback, userdata);
 
 	dc_buffer_free (buffer);
 
@@ -291,18 +292,3 @@ suunto_eon_device_write_interval (dc_device_t *abstract, unsigned char interval)
 
 	return DC_STATUS_SUCCESS;
 }
-
-
-dc_status_t
-suunto_eon_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
-{
-	suunto_common_device_t *device = (suunto_common_device_t*) abstract;
-
-	if (abstract && !ISINSTANCE (abstract))
-		return DC_STATUS_INVALIDARGS;
-
-	if (size < SZ_MEMORY)
-		return DC_STATUS_DATAFORMAT;
-
-	return suunto_common_extract_dives (device, &suunto_eon_layout, data, callback, userdata);
-}
diff --git a/src/suunto_eon.h b/src/suunto_eon.h
index 19b32a2..2adce91 100644
--- a/src/suunto_eon.h
+++ b/src/suunto_eon.h
@@ -34,9 +34,6 @@ extern "C" {
 dc_status_t
 suunto_eon_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-suunto_eon_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 suunto_eon_parser_create (dc_parser_t **parser, dc_context_t *context, int spyder);
 
diff --git a/src/suunto_solution.c b/src/suunto_solution.c
index d5ea802..c708114 100644
--- a/src/suunto_solution.c
+++ b/src/suunto_solution.c
@@ -57,6 +57,8 @@ static const dc_device_vtable_t suunto_solution_device_vtable = {
 	suunto_solution_device_close /* close */
 };
 
+static dc_status_t
+suunto_solution_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 dc_status_t
 suunto_solution_device_open (dc_device_t **out, dc_context_t *context, const char *name)
@@ -281,7 +283,7 @@ suunto_solution_device_foreach (dc_device_t *abstract, dc_dive_callback_t callba
 }
 
 
-dc_status_t
+static dc_status_t
 suunto_solution_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	if (abstract && !ISINSTANCE (abstract))
diff --git a/src/suunto_solution.h b/src/suunto_solution.h
index 386ecbc..e322583 100644
--- a/src/suunto_solution.h
+++ b/src/suunto_solution.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 suunto_solution_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-suunto_solution_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 suunto_solution_parser_create (dc_parser_t **parser, dc_context_t *context);
 
diff --git a/src/suunto_vyper.c b/src/suunto_vyper.c
index 45ca47a..ce44e05 100644
--- a/src/suunto_vyper.c
+++ b/src/suunto_vyper.c
@@ -442,16 +442,6 @@ suunto_vyper_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init, dc
 }
 
 
-dc_status_t
-suunto_vyper_device_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init)
-{
-	if (!ISINSTANCE (abstract))
-		return DC_STATUS_INVALIDARGS;
-
-	return suunto_vyper_read_dive (abstract, buffer, init, NULL);
-}
-
-
 static dc_status_t
 suunto_vyper_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
 {
@@ -553,22 +543,3 @@ suunto_vyper_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback,
 
 	return rc;
 }
-
-
-dc_status_t
-suunto_vyper_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
-{
-	suunto_common_device_t *device = (suunto_common_device_t*) abstract;
-
-	if (abstract && !ISINSTANCE (abstract))
-		return DC_STATUS_INVALIDARGS;
-
-	if (size < SZ_MEMORY)
-		return DC_STATUS_DATAFORMAT;
-
-	const suunto_common_layout_t *layout = &suunto_vyper_layout;
-	if (data[HDR_DEVINFO_VYPER] == 20 || data[HDR_DEVINFO_VYPER] == 30 || data[HDR_DEVINFO_VYPER] == 60)
-		layout = &suunto_spyder_layout;
-
-	return suunto_common_extract_dives (device, layout, data, callback, userdata);
-}
diff --git a/src/suunto_vyper.h b/src/suunto_vyper.h
index 9de188a..95f1a4a 100644
--- a/src/suunto_vyper.h
+++ b/src/suunto_vyper.h
@@ -33,12 +33,6 @@ extern "C" {
 dc_status_t
 suunto_vyper_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-suunto_vyper_device_read_dive (dc_device_t *device, dc_buffer_t *buffer, int init);
-
-dc_status_t
-suunto_vyper_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 suunto_vyper_parser_create (dc_parser_t **parser, dc_context_t *context);
 
diff --git a/src/uwatec_aladin.c b/src/uwatec_aladin.c
index e587d03..d70369a 100644
--- a/src/uwatec_aladin.c
+++ b/src/uwatec_aladin.c
@@ -65,6 +65,8 @@ static const dc_device_vtable_t uwatec_aladin_device_vtable = {
 	uwatec_aladin_device_close /* close */
 };
 
+static dc_status_t
+uwatec_aladin_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 dc_status_t
 uwatec_aladin_device_open (dc_device_t **out, dc_context_t *context, const char *name)
@@ -282,7 +284,7 @@ uwatec_aladin_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback
 }
 
 
-dc_status_t
+static dc_status_t
 uwatec_aladin_extract_dives (dc_device_t *abstract, const unsigned char* data, unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	uwatec_aladin_device_t *device = (uwatec_aladin_device_t*) abstract;
diff --git a/src/uwatec_aladin.h b/src/uwatec_aladin.h
index f8badf7..41484f6 100644
--- a/src/uwatec_aladin.h
+++ b/src/uwatec_aladin.h
@@ -32,9 +32,6 @@ extern "C" {
 dc_status_t
 uwatec_aladin_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-uwatec_aladin_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/src/uwatec_memomouse.c b/src/uwatec_memomouse.c
index 68b4dbf..b23c6b2 100644
--- a/src/uwatec_memomouse.c
+++ b/src/uwatec_memomouse.c
@@ -61,6 +61,8 @@ static const dc_device_vtable_t uwatec_memomouse_device_vtable = {
 	uwatec_memomouse_device_close /* close */
 };
 
+static dc_status_t
+uwatec_memomouse_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 dc_status_t
 uwatec_memomouse_device_open (dc_device_t **out, dc_context_t *context, const char *name)
@@ -500,7 +502,7 @@ uwatec_memomouse_device_foreach (dc_device_t *abstract, dc_dive_callback_t callb
 }
 
 
-dc_status_t
+static dc_status_t
 uwatec_memomouse_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	if (abstract && !ISINSTANCE (abstract))
diff --git a/src/uwatec_memomouse.h b/src/uwatec_memomouse.h
index 9e64975..8d37dc6 100644
--- a/src/uwatec_memomouse.h
+++ b/src/uwatec_memomouse.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 uwatec_memomouse_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-uwatec_memomouse_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 uwatec_memomouse_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int devtime, dc_ticks_t systime);
 
diff --git a/src/uwatec_meridian.c b/src/uwatec_meridian.c
index 2e1287b..077ec31 100644
--- a/src/uwatec_meridian.c
+++ b/src/uwatec_meridian.c
@@ -59,6 +59,8 @@ static const dc_device_vtable_t uwatec_meridian_device_vtable = {
 	uwatec_meridian_device_close /* close */
 };
 
+static dc_status_t
+uwatec_meridian_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 static dc_status_t
 uwatec_meridian_transfer (uwatec_meridian_device_t *device, const unsigned char command[], unsigned int csize, unsigned char answer[], unsigned int asize)
@@ -462,7 +464,7 @@ uwatec_meridian_device_foreach (dc_device_t *abstract, dc_dive_callback_t callba
 }
 
 
-dc_status_t
+static dc_status_t
 uwatec_meridian_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	if (abstract && !ISINSTANCE (abstract))
diff --git a/src/uwatec_meridian.h b/src/uwatec_meridian.h
index e99bcfa..9c6918c 100644
--- a/src/uwatec_meridian.h
+++ b/src/uwatec_meridian.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 uwatec_meridian_device_open (dc_device_t **device, dc_context_t *context, const char *name);
 
-dc_status_t
-uwatec_meridian_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/src/uwatec_smart.c b/src/uwatec_smart.c
index be92b74..2b94a3b 100644
--- a/src/uwatec_smart.c
+++ b/src/uwatec_smart.c
@@ -55,6 +55,8 @@ static const dc_device_vtable_t uwatec_smart_device_vtable = {
 	uwatec_smart_device_close /* close */
 };
 
+static dc_status_t
+uwatec_smart_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
 
 static void
 uwatec_smart_discovery (unsigned int address, const char *name, unsigned int charset, unsigned int hints, void *userdata)
@@ -402,7 +404,7 @@ uwatec_smart_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback,
 }
 
 
-dc_status_t
+static dc_status_t
 uwatec_smart_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata)
 {
 	if (abstract && !ISINSTANCE (abstract))
diff --git a/src/uwatec_smart.h b/src/uwatec_smart.h
index 56c3e1a..5304c73 100644
--- a/src/uwatec_smart.h
+++ b/src/uwatec_smart.h
@@ -33,9 +33,6 @@ extern "C" {
 dc_status_t
 uwatec_smart_device_open (dc_device_t **device, dc_context_t *context);
 
-dc_status_t
-uwatec_smart_extract_dives (dc_device_t *device, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata);
-
 dc_status_t
 uwatec_smart_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model, unsigned int devtime, dc_ticks_t systime);