diff --git a/Descent3/audiotaunts.cpp b/Descent3/audiotaunts.cpp
index fbae27ad..bebd8f03 100644
--- a/Descent3/audiotaunts.cpp
+++ b/Descent3/audiotaunts.cpp
@@ -8,7 +8,7 @@
 #include "audiotaunts.h"
 #include "CFILE.H"
 #include "audio_encode.h"
-#include "BYTESWAP.H"
+#include "byteswap.h"
 #include "mem.h"
 #include "ddio.h"
 #include "manage.h"
diff --git a/bitmap/iff.cpp b/bitmap/iff.cpp
index 3d7b3ed6..bec41c8e 100644
--- a/bitmap/iff.cpp
+++ b/bitmap/iff.cpp
@@ -55,7 +55,7 @@
 
 #include "mem.h"
 #include "iff.h"
-#include "BYTESWAP.H"
+#include "byteswap.h"
 #include "CFILE.H"
 #include "pserror.h"
 #include "pstypes.h"
diff --git a/bitmap/tga.cpp b/bitmap/tga.cpp
index 8315c680..6c369bcf 100644
--- a/bitmap/tga.cpp
+++ b/bitmap/tga.cpp
@@ -121,7 +121,7 @@
 #include "mono.h"
 #include "grdefs.h"
 #include "texture.h"
-#include "BYTESWAP.H"
+#include "byteswap.h"
 #include <string.h>
 #include "mem.h"
 
diff --git a/cfile/CFILE.cpp b/cfile/CFILE.cpp
index 83351171..37af8f1d 100644
--- a/cfile/CFILE.cpp
+++ b/cfile/CFILE.cpp
@@ -15,7 +15,7 @@
 // Linux Build Includes
 #include "linux/linux_fix.h"
 #endif
-#include "BYTESWAP.H"
+#include "byteswap.h"
 #include "pserror.h"
 #include "ddio.h"
 #include "psglob.h"
diff --git a/dd_sndlib/ddsoundload.cpp b/dd_sndlib/ddsoundload.cpp
index 80bf1795..0f9e36fc 100644
--- a/dd_sndlib/ddsoundload.cpp
+++ b/dd_sndlib/ddsoundload.cpp
@@ -87,7 +87,7 @@
 #include "mem.h"
 #include "pserror.h"
 #include <string.h>
-#include "BYTESWAP.H"
+#include "byteswap.h"
 
 sound_info Sounds[MAX_SOUNDS];
 sound_file_info SoundFiles[MAX_SOUND_FILES];
diff --git a/lib/BYTESWAP.H b/lib/byteswap.h
similarity index 100%
rename from lib/BYTESWAP.H
rename to lib/byteswap.h
diff --git a/lib/linux/byteswap.h b/lib/linux/byteswap.h
deleted file mode 100644
index 300eaf4a..00000000
--- a/lib/linux/byteswap.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * $Logfile: /DescentIII/Main/Lib/BYTESWAP.H $
- * $Revision: 1.5 $
- * $Date: 2004/12/05 04:00:20 $
- * $Author: ryan $
- *
- * Byteswapping macros (for big-endian machines)
- *
- * $Log: byteswap.h,v $
- * Revision 1.5  2004/12/05 04:00:20  ryan
- * MacOS X patches.
- *
- * Revision 1.4  2004/02/25 00:04:06  ryan
- * Removed loki_utils dependency and ported to MacOS X (runs, but incomplete).
- *
- * Revision 1.3  2004/02/09 04:14:51  kevinb
- * Added newlines to all headers to reduce number of warnings printed
- *
- * Made some small changes to get everything compiling.
- *
- * All Ready to merge the 1.5 tree.
- *
- * Revision 1.2  2000/06/03 14:33:51  icculus
- * Merge with Outrage 1.4 tree...
- *
- * Revision 1.1  2000/04/18 00:28:25  icculus
- * Used to be capitalized: BYTESWAP.H. Yuck.
- *
- * Revision 1.1.1.1  2000/04/18 00:00:38  icculus
- * initial checkin
- *
- *
- * 7     10/21/99 9:27p Jeff
- * B.A. Macintosh code merge
- *
- * 6     5/09/99 11:41p Jeff
- * function free
- *
- * 5     5/05/99 5:27a Jeff
- * renamed endian.h to psendian.h
- *
- * 4     5/01/99 2:52p Jeff
- * added automatic endian detection of the system
- *
- * 3     4/17/99 7:49p Jeff
- * for some reason Linux thinks it's big endian, temp fix (undef) until I
- * get around to writting a endian check function
- *
- * 2     1/09/99 4:38p Jeff
- * added some ifdefs and fixes to get files to compile under Linux
- *
- * 5     5/15/97 2:22p Matt
- * Fixed (hopefully; it's not tested yet) byteswapping for floats
- *
- * 4     2/10/97 2:22p Matt
- * Added cast
- *
- * 3     2/10/97 2:14p Matt
- * Added BIG_ENDIAN define, & INT_FLOAT() macro
- *
- * $NoKeywords: $
- */
-
-#ifndef _BYTESWAP_LINUX_H
-#define _BYTESWAP_LINUX_H
-
-#include "BYTESWAP.H"
-
-#endif
diff --git a/libacm/libacm.cpp b/libacm/libacm.cpp
index 9cf8a5bc..ec69d00b 100644
--- a/libacm/libacm.cpp
+++ b/libacm/libacm.cpp
@@ -24,7 +24,7 @@
 #endif
 #include <cstring>
 #include "pserror.h"
-#include "BYTESWAP.H"
+#include "byteswap.h"
 using namespace AudioDecoder;
 
 namespace {
diff --git a/libmve/mvelibi.h b/libmve/mvelibi.h
index dc09567f..955ff4d0 100644
--- a/libmve/mvelibi.h
+++ b/libmve/mvelibi.h
@@ -13,7 +13,7 @@
 #error No platform defined
 #endif
 
-#include "BYTESWAP.H"
+#include "byteswap.h"
 //--------------------------------
 // Compressed Video Constants
 //--------------------------------
diff --git a/md5/md5.cpp b/md5/md5.cpp
index 68eccef7..229b436e 100644
--- a/md5/md5.cpp
+++ b/md5/md5.cpp
@@ -5,7 +5,7 @@
         There is now warranty.
 
         Feb. 12. 2005
-        Benjamin Grüdelbach
+        Benjamin Grüdelbach
 */
 
 /*
@@ -33,7 +33,7 @@
 
 // md5 class include
 #include "md5.h"
-#include <BYTESWAP.H>
+#include <byteswap.h>
 #include <string.h>
 
 #include "stdio.h"
diff --git a/model/newstyle.cpp b/model/newstyle.cpp
index 877e34ca..d83b637b 100644
--- a/model/newstyle.cpp
+++ b/model/newstyle.cpp
@@ -67,7 +67,7 @@
 #include "grdefs.h"
 #include "polymodel.h"
 #include "gametexture.h"
-#include "BYTESWAP.H"
+#include "byteswap.h"
 #include "renderer.h"
 #include "lighting.h"
 #include "game.h"