diff --git a/core/dive.cpp b/core/dive.cpp
index 312e7809d..c7058c6ab 100644
--- a/core/dive.cpp
+++ b/core/dive.cpp
@@ -26,7 +26,6 @@
 #include "sample.h"
 #include "tag.h"
 #include "trip.h"
-#include "structured_list.h"
 #include "fulltext.h"
 
 // For user visible text but still not translated
diff --git a/core/divecomputer.cpp b/core/divecomputer.cpp
index ac4dbdd33..06a4defbd 100644
--- a/core/divecomputer.cpp
+++ b/core/divecomputer.cpp
@@ -6,7 +6,6 @@
 #include "extradata.h"
 #include "pref.h"
 #include "sample.h"
-#include "structured_list.h"
 #include "subsurface-string.h"
 
 #include <string.h>
diff --git a/core/structured_list.h b/core/structured_list.h
deleted file mode 100644
index c392b52c4..000000000
--- a/core/structured_list.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#ifndef STRUCTURED_LIST_H
-#define STRUCTURED_LIST_H
-
-/* Clear whole list; this works for taglist and dive computers */
-#define STRUCTURED_LIST_FREE(_type, _start, _free) \
-	{                                          \
-		_type *_ptr = _start;              \
-		while (_ptr) {                     \
-			_type *_next = _ptr->next; \
-			_free(_ptr);               \
-			_ptr = _next;              \
-		}                                  \
-	}
-
-#define STRUCTURED_LIST_COPY(_type, _first, _dest, _cpy)          \
-	{                                                         \
-		_type *_sptr = _first;                            \
-		_type **_dptr = &_dest;                           \
-		while (_sptr) {                                   \
-			*_dptr = (_type *)malloc(sizeof(_type));  \
-			_cpy(_sptr, *_dptr);                      \
-			_sptr = _sptr->next;                      \
-			_dptr = &(*_dptr)->next;                  \
-		}                                                 \
-		*_dptr = 0;                                       \
-	}
-
-#endif
diff --git a/core/tag.cpp b/core/tag.cpp
index 134eda4a4..5884cfd5b 100644
--- a/core/tag.cpp
+++ b/core/tag.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include "tag.h"
-#include "structured_list.h"
 #include "subsurface-string.h"
 #include "membuffer.h"
 #include "gettext.h"