M include/mgba-util/vector.h → include/mgba-util/vector.h

@@ -92,6 +92,8 @@ memcpy(dest->vector, src->vector, src->size * sizeof(TYPE)); \
 		dest->size = src->size; \
 	} \
 
+DECLARE_VECTOR(StringList, char*);
+
 CXX_GUARD_END
 
 #endif

M include/mgba/core/cheats.h → include/mgba/core/cheats.h

@@ -48,7 +48,6 @@
 mLOG_DECLARE_CATEGORY(CHEATS);
 
 DECLARE_VECTOR(mCheatList, struct mCheat);
-DECLARE_VECTOR(StringList, char*);
 
 struct mCheatDevice;
 struct mCheatSet {

M src/core/cheats.c → src/core/cheats.c

@@ -17,7 +17,6 @@ mLOG_DEFINE_CATEGORY(CHEATS, "Cheats", "core.cheats");
 
 DEFINE_VECTOR(mCheatList, struct mCheat);
 DEFINE_VECTOR(mCheatSets, struct mCheatSet*);
-DEFINE_VECTOR(StringList, char*);
 
 static int32_t _readMem(struct mCore* core, uint32_t address, int width) {
 	switch (width) {

M src/util/string.c → src/util/string.c

@@ -5,7 +5,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include <mgba-util/string.h>
 
+#include <mgba-util/vector.h>
+
 #include <string.h>
+
+DEFINE_VECTOR(StringList, char*);
 
 #ifndef HAVE_STRNDUP
 char* strndup(const char* start, size_t len) {