9 files changed, 13 insertions, 17 deletions

diff --git a/firmware/common/memset16.c b/firmware/common/memset16.c
index c90e2d7340..7e31df0cdd 100644
--- a/firmware/common/memset16.c
+++ b/firmware/common/memset16.c
@@ -19,8 +19,7 @@
  *
  ****************************************************************************/
 
-#include <string.h>
-#include "memory.h"
+#include "string-extra.h" /* memset16() */
 
 #define LBLOCKSIZE (sizeof(long)/2)
 #define UNALIGNED(X)   ((long)X & (sizeof(long) - 1))
diff --git a/firmware/drivers/lcd-16bit-vert.c b/firmware/drivers/lcd-16bit-vert.c
index 2b4faef4a1..a2f47d3544 100644
--- a/firmware/drivers/lcd-16bit-vert.c
+++ b/firmware/drivers/lcd-16bit-vert.c
@@ -27,9 +27,8 @@
 #include "lcd.h"
 #include "kernel.h"
 #include "thread.h"
-#include <string.h>
 #include <stdlib.h>
-#include "memory.h"
+#include "string-extra.h" /* mem*() */
 #include "file.h"
 #include "debug.h"
 #include "system.h"
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index f8b4272f7c..be4f21f412 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -26,9 +26,8 @@
 #include "lcd.h"
 #include "kernel.h"
 #include "thread.h"
-#include <string.h>
 #include <stdlib.h>
-#include "memory.h"
+#include "string-extra.h" /* mem*() */
 #include "file.h"
 #include "debug.h"
 #include "system.h"
diff --git a/firmware/drivers/lcd-2bit-vi.c b/firmware/drivers/lcd-2bit-vi.c
index 5dd94a15a0..697d1a7783 100644
--- a/firmware/drivers/lcd-2bit-vi.c
+++ b/firmware/drivers/lcd-2bit-vi.c
@@ -26,9 +26,8 @@
 #include "lcd.h"
 #include "kernel.h"
 #include "thread.h"
-#include <string.h>
 #include <stdlib.h>
-#include "memory.h"
+#include "string-extra.h" /* mem*() */
 #include "file.h"
 #include "debug.h"
 #include "system.h"
diff --git a/firmware/include/memory.h b/firmware/include/memset16.h
index 105d0280b2..1569644db5 100644
--- a/firmware/include/memory.h
+++ b/firmware/include/memset16.h
@@ -19,11 +19,10 @@
  *
  ****************************************************************************/
 
-#ifndef _MEMORY_H_
-#define _MEMORY_H_
+#ifndef __MEMSET16_H__
+#define __MEMSET16_H__
 
-#include "inttypes.h"
+#include <string.h> /* size_t */
+extern void memset16(void *dst, int val, size_t len);
 
-void memset16(void *dst, int val, size_t len);
-
-#endif /* _MEMORY_H_ */
+#endif /* __MEMSET16_H__ */
diff --git a/firmware/include/string-extra.h b/firmware/include/string-extra.h
index 16dd2fdccf..bae250d7c9 100644
--- a/firmware/include/string-extra.h
+++ b/firmware/include/string-extra.h
@@ -26,3 +26,4 @@
 #include "strcasecmp.h"
 #include "strcasestr.h"
 #include "strtok_r.h"
+#include "memset16.h"
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
index b11c9f0fd5..c92920337b 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c
@@ -25,7 +25,7 @@
 #include "kernel.h"
 #include "lcd.h"
 #include "system.h"
-#include "memory.h"
+#include "string-extra.h" /* memset16() */
 #include "cpu.h"
 #include "spi.h"
 #include "spi-target.h"
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
index 3d65bcc092..838efa4cd3 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
@@ -27,7 +27,7 @@
 #include "cpu.h"
 #include "string.h"
 #include "kernel.h"
-#include "memory.h"
+#include "string-extra.h" /* memset16() */
 #include "mmu-arm.h"
 #include "system-target.h"
 #include "lcd.h"
diff --git a/firmware/target/hosted/sdl/kernel-sdl.c b/firmware/target/hosted/sdl/kernel-sdl.c
index d796921e35..c4d4ee220e 100644
--- a/firmware/target/hosted/sdl/kernel-sdl.c
+++ b/firmware/target/hosted/sdl/kernel-sdl.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <SDL.h>
 #include <SDL_thread.h>
-#include "memory.h"
+#include <inttypes.h>
 #include "system-sdl.h"
 #include "thread-sdl.h"
 #include "kernel.h"