diff --git a/firmware/test/memory/memory-block.h b/firmware/test/memory/memory-block.c
similarity index 100%
rename from firmware/test/memory/memory-block.h
rename to firmware/test/memory/memory-block.c
diff --git a/firmware/test/memory/memory.c b/firmware/test/memory/memory-misc.c
similarity index 93%
rename from firmware/test/memory/memory.c
rename to firmware/test/memory/memory-misc.c
index 19944d5fb4..551b0a28c5 100644
--- a/firmware/test/memory/memory.c
+++ b/firmware/test/memory/memory-misc.c
@@ -16,13 +16,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#define __LIBRARY_MEMORY_C__
 #include <memory.h>
-#include "memory-page.h"
-#if 0
-#  include "memory-slab.h"
-#  include "memory-block.h"
-#endif
 
 /* NOT VERY OPTIMIZED AT ALL BUT WE WILL DO IT WHEN PRIORITY COMES */
 void memory_copy (void *target,void const *source,unsigned int count)
diff --git a/firmware/test/memory/memory-page.h b/firmware/test/memory/memory-page.c
similarity index 100%
rename from firmware/test/memory/memory-page.h
rename to firmware/test/memory/memory-page.c
diff --git a/firmware/test/memory/memory-slab.h b/firmware/test/memory/memory-slab.c
similarity index 100%
rename from firmware/test/memory/memory-slab.h
rename to firmware/test/memory/memory-slab.c