diff --git a/src/kits/support/ByteOrder.cpp b/src/kits/support/ByteOrder.cpp
index a1987c5606..94dab402d2 100644
--- a/src/kits/support/ByteOrder.cpp
+++ b/src/kits/support/ByteOrder.cpp
@@ -1,22 +1,165 @@
-// Quick and dirty implementation of the byte order functions.
-// Just here to be able to compile and test BFile.
-// To be replaced by the OpenBeOS version to be provided by the IK Team.
+/* 
+** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+** Distributed under the terms of the Haiku License.
+*/
+
 
 #include <ByteOrder.h>
+#include <Messenger.h>
 
-#include "LibBeAdapter.h"
 
-// swap_data
 status_t
-swap_data(type_code type, void *data, size_t length, swap_action action)
+swap_data(type_code type, void *_data, size_t length, swap_action action)
 {
-	return swap_data_adapter(type, data, length, action);
+	// is there anything to do?
+#if B_HOST_IS_LENDIAN
+	if (action == B_SWAP_HOST_TO_LENDIAN || action == B_SWAP_LENDIAN_TO_HOST)
+		return B_OK;
+#else
+	if (action == B_SWAP_HOST_TO_BENDIAN || action == B_SWAP_BENDIAN_TO_HOST)
+		return B_OK;
+#endif
+
+	if (_data == NULL || length == 0)
+		return B_BAD_VALUE;
+
+	switch (type) {
+		// 8 bit types or other non-swappable data
+		case B_BOOL_TYPE:
+		case B_CHAR_TYPE:
+		case B_COLOR_8_BIT_TYPE:
+		case B_INT8_TYPE:
+		case B_UINT8_TYPE:
+		case B_GRAYSCALE_8_BIT_TYPE:
+		case B_MONOCHROME_1_BIT_TYPE:
+		case B_RGB_COLOR_TYPE:
+			// nothing to do here
+			// ToDo: should we return an error here like the original?
+			break;
+
+		// 16 bit types
+		case B_INT16_TYPE:
+		case B_UINT16_TYPE:
+		{
+			uint16 *data = (uint16 *)_data;
+			uint16 *end = (uint16 *)((addr_t)_data + length);
+
+			while (data < end) {
+				*data = __swap_int16(*data);
+				data++;
+			}
+			break;
+		}
+
+		// 32 bit types
+		case B_FLOAT_TYPE:
+		case B_INT32_TYPE:
+		case B_UINT32_TYPE:
+		case B_SIZE_T_TYPE:
+		case B_SSIZE_T_TYPE:
+		case B_TIME_TYPE:
+		case B_POINTER_TYPE:
+		case B_RECT_TYPE:
+		case B_POINT_TYPE:
+		{
+			// ToDo: some of these types may not be 32-bit on 64-bit platforms!
+			uint32 *data = (uint32 *)_data;
+			uint32 *end = (uint32 *)((addr_t)_data + length);
+
+			while (data < end) {
+				*data = __swap_int32(*data);
+				data++;
+			}
+			break;
+		}
+
+		// 64 bit types
+		case B_DOUBLE_TYPE:
+		case B_INT64_TYPE:
+		case B_UINT64_TYPE:
+		case B_OFF_T_TYPE:
+		{
+			uint64 *data = (uint64 *)_data;
+			uint64 *end = (uint64 *)((addr_t)_data + length);
+
+			while (data < end) {
+				*data = __swap_int64(*data);
+				data++;
+			}
+			break;
+		}
+
+		// special types
+		case B_MESSENGER_TYPE:
+		{
+			BMessenger *messenger = (BMessenger *)_data;
+			BMessenger *end = (BMessenger *)((addr_t)_data + length);
+
+			while (messenger < end) {
+				// ToDo: if the additional fields change, this function has to be updated!
+				messenger->fPort = __swap_int32(messenger->fPort);
+				messenger->fHandlerToken = __swap_int32(messenger->fHandlerToken);
+				messenger->fTeam = __swap_int32(messenger->fTeam);
+				messenger++;
+			}
+			break;
+		}
+
+		default:
+			// not swappable or a recognized type!
+			return B_BAD_VALUE;
+	}
+
+	return B_OK;
 }
 
-// is_type_swapped
+
 bool
 is_type_swapped(type_code type)
 {
-	return is_type_swapped_adapter(type);
+	// Returns true when the type is in the host's native format
+	// Looks like a pretty strange function to me :)
+
+	switch (type) {
+		case B_ANY_TYPE:
+		case B_BOOL_TYPE:
+		case B_CHAR_TYPE:
+		case B_COLOR_8_BIT_TYPE:
+		case B_DOUBLE_TYPE:
+		case B_FLOAT_TYPE:
+		case B_GRAYSCALE_8_BIT_TYPE:
+		case B_INT64_TYPE:
+		case B_INT32_TYPE:
+		case B_INT16_TYPE:
+		case B_INT8_TYPE:
+		case B_MESSAGE_TYPE:
+		case B_MESSENGER_TYPE:
+		case B_MIME_TYPE:
+		case B_MONOCHROME_1_BIT_TYPE:
+		case B_OBJECT_TYPE:
+		case B_OFF_T_TYPE:
+		case B_PATTERN_TYPE:
+		case B_POINTER_TYPE:
+		case B_POINT_TYPE:
+		case B_RAW_TYPE:
+		case B_RECT_TYPE:
+		case B_REF_TYPE:
+		case B_RGB_32_BIT_TYPE:
+		case B_RGB_COLOR_TYPE:
+		case B_SIZE_T_TYPE:
+		case B_SSIZE_T_TYPE:
+		case B_STRING_TYPE:
+		case B_TIME_TYPE:
+		case B_UINT64_TYPE:
+		case B_UINT32_TYPE:
+		case B_UINT16_TYPE:
+		case B_UINT8_TYPE:
+		case B_MEDIA_PARAMETER_TYPE:
+		case B_MEDIA_PARAMETER_WEB_TYPE:
+		case B_MEDIA_PARAMETER_GROUP_TYPE:
+			return true;
+	}
+
+	return false;
 }
 
diff --git a/src/kits/support/support.src b/src/kits/support/support.src
index 8100f669a4..f47f808e40 100644
--- a/src/kits/support/support.src
+++ b/src/kits/support/support.src
@@ -1,6 +1,7 @@
 SUPPORT_KIT_SOURCE =
 	Archivable.cpp
 	BlockCache.cpp
+	ByteOrder.cpp
 	DataIO.cpp
 	BufferIO.cpp
 	Flattenable.cpp