diff --git a/src/array.h b/src/array.h
index 3c45785..f0f54cd 100644
--- a/src/array.h
+++ b/src/array.h
@@ -22,6 +22,8 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
+#define C_ARRAY_SIZE(a) (sizeof (a) / sizeof *(a))
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
diff --git a/src/cochran_commander.c b/src/cochran_commander.c
index e3677e9..38328ae 100644
--- a/src/cochran_commander.c
+++ b/src/cochran_commander.c
@@ -30,8 +30,6 @@
 #include "ringbuffer.h"
 #include "rbstream.h"
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define MAXRETRIES 2
 
 #define COCHRAN_MODEL_COMMANDER_TM 0
diff --git a/src/cochran_commander_parser.c b/src/cochran_commander_parser.c
index e8ba76f..853b01b 100644
--- a/src/cochran_commander_parser.c
+++ b/src/cochran_commander_parser.c
@@ -29,8 +29,6 @@
 #include "parser-private.h"
 #include "array.h"
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define COCHRAN_MODEL_COMMANDER_TM 0
 #define COCHRAN_MODEL_COMMANDER_PRE21000 1
 #define COCHRAN_MODEL_COMMANDER_AIR_NITROX 2
diff --git a/src/cressi_goa_parser.c b/src/cressi_goa_parser.c
index 35312db..256dbc3 100644
--- a/src/cressi_goa_parser.c
+++ b/src/cressi_goa_parser.c
@@ -28,8 +28,6 @@
 
 #define ISINSTANCE(parser) dc_device_isinstance((parser), &cressi_goa_parser_vtable)
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define SZ_HEADER          23
 #define SZ_HEADER_SCUBA    0x61
 #define SZ_HEADER_FREEDIVE 0x2B
diff --git a/src/divesystem_idive.c b/src/divesystem_idive.c
index b544ecb..61ec469 100644
--- a/src/divesystem_idive.c
+++ b/src/divesystem_idive.c
@@ -30,8 +30,6 @@
 #include "checksum.h"
 #include "array.h"
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define ISINSTANCE(device) dc_device_isinstance((device), &divesystem_idive_device_vtable)
 
 #define ISIX3M(model) ((model) >= 0x21)
diff --git a/src/divesystem_idive_parser.c b/src/divesystem_idive_parser.c
index a6375a0..5ace8f4 100644
--- a/src/divesystem_idive_parser.c
+++ b/src/divesystem_idive_parser.c
@@ -26,8 +26,6 @@
 #include "parser-private.h"
 #include "array.h"
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define ISINSTANCE(parser) dc_device_isinstance((parser), &divesystem_idive_parser_vtable)
 
 #define ISIX3M(model) ((model) >= 0x21)
diff --git a/src/hw_ostc.c b/src/hw_ostc.c
index cbb97bb..7017321 100644
--- a/src/hw_ostc.c
+++ b/src/hw_ostc.c
@@ -31,8 +31,6 @@
 
 #define ISINSTANCE(device) dc_device_isinstance((device), &hw_ostc_device_vtable)
 
-#define C_ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
-
 #define MAXRETRIES 9
 
 #define FW_190 0x015A
diff --git a/src/liquivision_lynx_parser.c b/src/liquivision_lynx_parser.c
index ca41e21..c4272d8 100644
--- a/src/liquivision_lynx_parser.c
+++ b/src/liquivision_lynx_parser.c
@@ -31,8 +31,6 @@
 
 #define ISINSTANCE(parser) dc_parser_isinstance((parser), &liquivision_lynx_parser_vtable)
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define XEN  0
 #define XEO  1
 #define LYNX 2
diff --git a/src/mares_iconhd.c b/src/mares_iconhd.c
index 0c39b86..e3f8ee5 100644
--- a/src/mares_iconhd.c
+++ b/src/mares_iconhd.c
@@ -30,8 +30,6 @@
 #include "rbstream.h"
 #include "platform.h"
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define ISINSTANCE(device) dc_device_isinstance((device), &mares_iconhd_device_vtable)
 
 #define NSTEPS    1000
diff --git a/src/sporasub_sp2_parser.c b/src/sporasub_sp2_parser.c
index e041495..42cde0c 100644
--- a/src/sporasub_sp2_parser.c
+++ b/src/sporasub_sp2_parser.c
@@ -28,8 +28,6 @@
 
 #define ISINSTANCE(parser) dc_device_isinstance((parser), &sporasub_sp2_parser_vtable)
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define SZ_HEADER 0x20
 #define SZ_SAMPLE 0x04
 
diff --git a/src/suunto_d9.c b/src/suunto_d9.c
index 17f7e7f..9622975 100644
--- a/src/suunto_d9.c
+++ b/src/suunto_d9.c
@@ -31,8 +31,6 @@
 
 #define ISINSTANCE(device) dc_device_isinstance((device), (const dc_device_vtable_t *) &suunto_d9_device_vtable)
 
-#define C_ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
-
 #define D4i         0x19
 #define D6i         0x1A
 #define D9tx        0x1B
diff --git a/src/suunto_eonsteel_parser.c b/src/suunto_eonsteel_parser.c
index 033a2f2..de00001 100644
--- a/src/suunto_eonsteel_parser.c
+++ b/src/suunto_eonsteel_parser.c
@@ -30,8 +30,6 @@
 #include "array.h"
 #include "platform.h"
 
-#define C_ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
-
 enum eon_sample {
 	ES_none = 0,
 	ES_dtime,		// duint16,precision=3 (time delta in ms)
diff --git a/src/uwatec_smart.c b/src/uwatec_smart.c
index 5918646..d5d7ab0 100644
--- a/src/uwatec_smart.c
+++ b/src/uwatec_smart.c
@@ -31,8 +31,6 @@
 
 #define ISINSTANCE(device) dc_device_isinstance((device), &uwatec_smart_device_vtable)
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define DATASIZE 254
 #define PACKETSIZE_USBHID_RX 64
 #define PACKETSIZE_USBHID_TX 32
diff --git a/src/uwatec_smart_parser.c b/src/uwatec_smart_parser.c
index 3e4ed09..bb324e3 100644
--- a/src/uwatec_smart_parser.c
+++ b/src/uwatec_smart_parser.c
@@ -31,8 +31,6 @@
 
 #define ISINSTANCE(parser) dc_parser_isinstance((parser), &uwatec_smart_parser_vtable)
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define NBITS 8
 
 #define SMARTPRO          0x10