7 files changed, 8 insertions, 9 deletions
diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h
index 53844b8a2..9bec07b5c 100644
--- a/src/gui/models/colorlistmodel.h
+++ b/src/gui/models/colorlistmodel.h
@@ -71,7 +71,7 @@ class ColorListModel final : public ListModel
 
         int getNumberOfElements() override final
         {
-            return 14;
+            return NUM_ELEMENTS(COLOR_NAME);
         }
 
         std::string getElementAt(int i) override final
diff --git a/src/gui/models/magicschoolmodel.h b/src/gui/models/magicschoolmodel.h
index 05b71b2c8..96a433cf6 100644
--- a/src/gui/models/magicschoolmodel.h
+++ b/src/gui/models/magicschoolmodel.h
@@ -30,8 +30,6 @@
 
 #include "localconsts.h"
 
-#define NUM_ELEMENTS(a) sizeof(a) / sizeof(a[0])
-
 const char *MAGIC_SCHOOL_TEXT[] =
 {
     // TRANSLATORS: magic school
diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h
index 573452a1d..19e6ee8d9 100644
--- a/src/gui/models/sortlistmodelbuy.h
+++ b/src/gui/models/sortlistmodelbuy.h
@@ -28,8 +28,6 @@
 
 #include "utils/gettext.h"
 
-#define NUM_ELEMENTS(a) sizeof(a) / sizeof(a[0])
-
 static const char *const SORT_NAME_BUY[8] =
 {
     // TRANSLATORS: buy dialog sort type.
diff --git a/src/gui/models/sortlistmodelinv.h b/src/gui/models/sortlistmodelinv.h
index eaf5c323b..9ed661aa6 100644
--- a/src/gui/models/sortlistmodelinv.h
+++ b/src/gui/models/sortlistmodelinv.h
@@ -27,8 +27,6 @@
 
 #include "utils/gettext.h"
 
-#define NUM_ELEMENTS(a) sizeof(a) / sizeof(a[0])
-
 static const char *const SORT_NAME_INVENTORY[7] =
 {
     // TRANSLATORS: inventory sort mode
diff --git a/src/gui/models/targettypemodel.h b/src/gui/models/targettypemodel.h
index 4453b6e45..837801600 100644
--- a/src/gui/models/targettypemodel.h
+++ b/src/gui/models/targettypemodel.h
@@ -48,7 +48,7 @@ class TargetTypeModel final : public ListModel
 
         int getNumberOfElements() override final
         {
-            return 3;
+            return NUM_ELEMENTS(TARGET_TYPE_TEXT);
         }
 
         std::string getElementAt(int i) override final
diff --git a/src/gui/models/updatetypemodel.h b/src/gui/models/updatetypemodel.h
index b30160133..5f111a2bd 100644
--- a/src/gui/models/updatetypemodel.h
+++ b/src/gui/models/updatetypemodel.h
@@ -47,7 +47,7 @@ class UpdateTypeModel final : public ListModel
 
         int getNumberOfElements() override final
         {
-            return 3;
+            return NUM_ELEMENTS(UPDATE_TYPE_TEXT);
         }
 
         std::string getElementAt(int i) override final
diff --git a/src/localconsts.h b/src/localconsts.h
index ad0744246..8de67449d 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -24,6 +24,11 @@
 
 #define ENABLEDEBUGLOG 1
 
+/*
+ * compile-time number of array elements
+ */
+#define NUM_ELEMENTS(array) (sizeof(array) / sizeof(array[0]))
+
 #ifndef GCC_VERSION
 #define GCC_VERSION (__GNUC__ * 10000 \
     + __GNUC_MINOR__ * 100 \