diff --git a/src/drivers/libretro/fceu/fceu-endian.c b/src/drivers/libretro/fceu/fceu-endian.c
deleted file mode 100644
index 754489f..0000000
--- a/src/drivers/libretro/fceu/fceu-endian.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* FCE Ultra - NES/Famicom Emulator
- *
- * Copyright notice for this file:
- *  Copyright (C) 2002 Xodnizel
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/*  Contains file I/O functions that write/read data    */
-/*  LSB first.              */
-
-#include <stdio.h>
-#include "fceu-memory.h"
-#include "fceu-types.h"
-#include "fceu-endian.h"
-
-void FlipByteOrder(uint8 *src, uint32 count)
-{
-   uint8 *start = src;
-   uint8 *end = src + count - 1;
-
-   while(start < end)
-   {
-      uint8 tmp;
-
-      tmp = *end;
-      *end = *start;
-      *start = tmp;
-      end--;
-      start++;
-   }
-}
-
-int write16le(uint16 b, FILE *fp)
-{
-   uint8 s[2];
-   s[0] = b;
-   s[1] = b >> 8;
-   return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
-}
-
-int write32le(uint32 b, FILE *fp)
-{
-   uint8 s[4];
-   s[0] = b;
-   s[1] = b >> 8;
-   s[2] = b >> 16;
-   s[3] = b >> 24;
-   return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
-}
-
-int read32le(uint32 *Bufo, FILE *fp)
-{
-   uint32 buf;
-   if (fread(&buf, 1, 4, fp) < 4)
-      return 0;
-#ifdef MSB_FIRST
-   *(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
-#else
-   *(uint32*)Bufo = buf;
-#endif
-   return 1;
-}
-
-int write32le_mem(uint32 b, memstream_t *mem)
-{
-   uint8 s[4];
-   s[0]=b;
-   s[1]=b>>8;
-   s[2]=b>>16;
-   s[3]=b>>24;
-   return((memstream_write(mem, s, 4)<4)?0:4);
-}
-
-int read32le_mem(uint32 *Bufo, memstream_t *mem)
-{
-   uint32 buf;
-   if(memstream_read(mem, &buf, 4)<4)
-      return 0;
-#ifdef MSB_FIRST
-   *(uint32*)Bufo=((buf&0xFF)<<24)|((buf&0xFF00)<<8)|((buf&0xFF0000)>>8)|((buf&0xFF000000)>>24);
-#else
-   *(uint32*)Bufo=buf;
-#endif
-   return 1;
-}
-
-int read16le(char *d, FILE *fp)
-{
-#ifdef MSB_FIRST
-   int ret;
-   ret = fread(d + 1, 1, 1, fp);
-   ret += fread(d, 1, 1, fp);
-   return ret < 2 ? 0 : 2;
-#else
-   return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
-#endif
-}
-
-void FCEU_en32lsb(uint8 *buf, uint32 morp)
-{
-   buf[0] = morp;
-   buf[1] = morp >> 8;
-   buf[2] = morp >> 16;
-   buf[3] = morp >> 24;
-}
-
-uint32 FCEU_de32lsb(uint8 *morp)
-{
-   return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24));
-}
diff --git a/src/drivers/libretro/fceu/fceu-endian.h b/src/drivers/libretro/fceu/fceu-endian.h
deleted file mode 100644
index db19b37..0000000
--- a/src/drivers/libretro/fceu/fceu-endian.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _FCEU_ENDIAN_H
-#define _FCEU_ENDIAN_H
-
-#include "fceu-memory.h"
-#include "../memstream.h"
-
-int write32le_mem(uint32 b, memstream_t *mem);
-int read32le_mem(uint32 *Bufo, memstream_t *mem);
-
-int write16le(uint16 b, FILE *fp);
-int write32le(uint32 b, FILE *fp);
-int read32le(uint32 *Bufo, FILE *fp);
-void FlipByteOrder(uint8 *src, uint32 count);
-
-void FCEU_en32lsb(uint8 *, uint32);
-uint32 FCEU_de32lsb(uint8 *);
-
-#endif
diff --git a/src/drivers/libretro/griffin.c b/src/drivers/libretro/griffin.c
index 3c29450..648a8d0 100644
--- a/src/drivers/libretro/griffin.c
+++ b/src/drivers/libretro/griffin.c
@@ -8,7 +8,7 @@
 #include "cheat.c"
 #include "crc32.c"
 #include "debug.c"
-#include "drivers/libretro/fceu/fceu-endian.c"
+#include "fceu-endian.c"
 #include "drivers/libretro/fceu/fceu-memory.c"
 #include "misc.c"
 #include "fceu.c"
diff --git a/src/fceu-endian.c b/src/fceu-endian.c
index fcdd64c..754489f 100644
--- a/src/fceu-endian.c
+++ b/src/fceu-endian.c
@@ -26,70 +26,98 @@
 #include "fceu-types.h"
 #include "fceu-endian.h"
 
-void FlipByteOrder(uint8 *src, uint32 count) {
-	uint8 *start = src;
-	uint8 *end = src + count - 1;
+void FlipByteOrder(uint8 *src, uint32 count)
+{
+   uint8 *start = src;
+   uint8 *end = src + count - 1;
 
-	if ((count & 1) || !count) return;	/* This shouldn't happen. */
+   while(start < end)
+   {
+      uint8 tmp;
 
-	while (count--) {
-		uint8 tmp;
-
-		tmp = *end;
-		*end = *start;
-		*start = tmp;
-		end--;
-		start++;
-	}
+      tmp = *end;
+      *end = *start;
+      *start = tmp;
+      end--;
+      start++;
+   }
 }
 
-int write16le(uint16 b, FILE *fp) {
-	uint8 s[2];
-	s[0] = b;
-	s[1] = b >> 8;
-	return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
+int write16le(uint16 b, FILE *fp)
+{
+   uint8 s[2];
+   s[0] = b;
+   s[1] = b >> 8;
+   return((fwrite(s, 1, 2, fp) < 2) ? 0 : 2);
 }
 
-int write32le(uint32 b, FILE *fp) {
-	uint8 s[4];
-	s[0] = b;
-	s[1] = b >> 8;
-	s[2] = b >> 16;
-	s[3] = b >> 24;
-	return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
+int write32le(uint32 b, FILE *fp)
+{
+   uint8 s[4];
+   s[0] = b;
+   s[1] = b >> 8;
+   s[2] = b >> 16;
+   s[3] = b >> 24;
+   return((fwrite(s, 1, 4, fp) < 4) ? 0 : 4);
 }
 
-int read32le(uint32 *Bufo, FILE *fp) {
-	uint32 buf;
-	if (fread(&buf, 1, 4, fp) < 4)
-		return 0;
- #ifdef MSB_FIRST
-	*(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
- #else
-	*(uint32*)Bufo = buf;
- #endif
-	return 1;
+int read32le(uint32 *Bufo, FILE *fp)
+{
+   uint32 buf;
+   if (fread(&buf, 1, 4, fp) < 4)
+      return 0;
+#ifdef MSB_FIRST
+   *(uint32*)Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
+#else
+   *(uint32*)Bufo = buf;
+#endif
+   return 1;
 }
 
-int read16le(char *d, FILE *fp) {
- #ifdef MSB_FIRST
-	int ret;
-	ret = fread(d + 1, 1, 1, fp);
-	ret += fread(d, 1, 1, fp);
-	return ret < 2 ? 0 : 2;
- #else
-	return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
- #endif
+int write32le_mem(uint32 b, memstream_t *mem)
+{
+   uint8 s[4];
+   s[0]=b;
+   s[1]=b>>8;
+   s[2]=b>>16;
+   s[3]=b>>24;
+   return((memstream_write(mem, s, 4)<4)?0:4);
 }
 
-void FCEU_en32lsb(uint8 *buf, uint32 morp) {
-	buf[0] = morp;
-	buf[1] = morp >> 8;
-	buf[2] = morp >> 16;
-	buf[3] = morp >> 24;
+int read32le_mem(uint32 *Bufo, memstream_t *mem)
+{
+   uint32 buf;
+   if(memstream_read(mem, &buf, 4)<4)
+      return 0;
+#ifdef MSB_FIRST
+   *(uint32*)Bufo=((buf&0xFF)<<24)|((buf&0xFF00)<<8)|((buf&0xFF0000)>>8)|((buf&0xFF000000)>>24);
+#else
+   *(uint32*)Bufo=buf;
+#endif
+   return 1;
 }
 
-uint32 FCEU_de32lsb(uint8 *morp) {
-	return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24));
+int read16le(char *d, FILE *fp)
+{
+#ifdef MSB_FIRST
+   int ret;
+   ret = fread(d + 1, 1, 1, fp);
+   ret += fread(d, 1, 1, fp);
+   return ret < 2 ? 0 : 2;
+#else
+   return((fread(d, 1, 2, fp) < 2) ? 0 : 2);
+#endif
 }
 
+void FCEU_en32lsb(uint8 *buf, uint32 morp)
+{
+   buf[0] = morp;
+   buf[1] = morp >> 8;
+   buf[2] = morp >> 16;
+   buf[3] = morp >> 24;
+}
+
+uint32 FCEU_de32lsb(uint8 *morp)
+{
+   return(morp[0] | (morp[1] << 8) | (morp[2] << 16) | (morp[3] << 24));
+}
diff --git a/src/fceu-endian.h b/src/fceu-endian.h
index 00d2a3d..7ed551a 100644
--- a/src/fceu-endian.h
+++ b/src/fceu-endian.h
@@ -2,6 +2,10 @@
 #define _FCEU_ENDIAN_H
 
 #include "fceu-memory.h"
+#include <memstream.h>
+
+int write32le_mem(uint32 b, memstream_t *mem);
+int read32le_mem(uint32 *Bufo, memstream_t *mem);
 
 int write16le(uint16 b, FILE *fp);
 int write32le(uint32 b, FILE *fp);