diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 9899f87fb279ea7bd116665c9d0bd593efb93fa4..bb837ba5e9a87886ac2b06ff0c265b4450039d17 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -130,7 +130,6 @@ set(llcommon_SOURCE_FILES
     lluuid.cpp
     llworkerthread.cpp
     timing.cpp
-    u64.cpp
     StackWalker.cpp
     )
     
@@ -261,7 +260,6 @@ set(llcommon_HEADER_FILES
     stdtypes.h
     stringize.h
     timer.h
-    u64.h
     StackWalker.h
     )
 
diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp
index a0950588e73794fc89228709c9362b5414beb9a1..1ecc1b24c6f116d8f216859b659feaab0bc31954 100644
--- a/indra/llcommon/llframetimer.cpp
+++ b/indra/llcommon/llframetimer.cpp
@@ -25,8 +25,6 @@
 
 #include "linden_common.h"
 
-#include "u64.h"
-
 #include "llframetimer.h"
 
 // Static members
@@ -45,8 +43,8 @@ void LLFrameTimer::updateFrameTime()
 	U64 total_time = totalTime();
 	sFrameDeltaTime = total_time - sTotalTime;
 	sTotalTime = total_time;
-	sTotalSeconds = U64_to_F64(sTotalTime) * USEC_TO_SEC_F64;
-	sFrameTime = U64_to_F64(sTotalTime - sStartTotalTime) * USEC_TO_SEC_F64;
+	sTotalSeconds = static_cast<F64>(sTotalTime) * USEC_TO_SEC_F64;
+	sFrameTime = static_cast<F64>(sTotalTime - sStartTotalTime) * USEC_TO_SEC_F64;
 } 
 
 void LLFrameTimer::start()
@@ -107,7 +105,7 @@ void LLFrameTimer::setExpiryAt(F64 seconds_since_epoch)
 
 F64 LLFrameTimer::expiresAt() const
 {
-	F64 expires_at = U64_to_F64(sStartTotalTime) * USEC_TO_SEC_F64;
+	F64 expires_at = static_cast<F64>(sStartTotalTime) * USEC_TO_SEC_F64;
 	expires_at += mExpiry;
 	return expires_at;
 }
@@ -131,7 +129,7 @@ BOOL LLFrameTimer::checkExpirationAndReset(F32 expiration)
 // static
 F32 LLFrameTimer::getFrameDeltaTimeF32()
 {
-	return (F32)(U64_to_F64(sFrameDeltaTime) * USEC_TO_SEC_F64); 
+	return (F32)(static_cast<F64>(sFrameDeltaTime) * USEC_TO_SEC_F64);
 }
 
 
@@ -140,7 +138,7 @@ F32 LLFrameTimer::getFrameDeltaTimeF32()
 F32  LLFrameTimer::getCurrentFrameTime()
 {
 	U64 frame_time = totalTime() - sTotalTime;
-	return (F32)(U64_to_F64(frame_time) * USEC_TO_SEC_F64); 
+	return (F32)(static_cast<F64>(frame_time) * USEC_TO_SEC_F64);
 }
 
 // Glue code to avoid full class .h file #includes
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index 70ddb1b73a30ddafc9f3a4c66f7dd3ec22a56141..2103d0a43e1928be4ebd78682e4353687a88c211 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -28,8 +28,6 @@
 
 #include "lltimer.h"
 
-#include "u64.h"
-
 #if LL_WINDOWS
 #	include "llwin32headerslean.h"
 #elif LL_LINUX || LL_DARWIN
@@ -311,7 +309,7 @@ U64MicrosecondsImplicit LLTimer::getTotalTime()
 // static
 F64SecondsImplicit LLTimer::getTotalSeconds()
 {
-	return F64Microseconds(U64_to_F64(getTotalTime()));
+	return F64Microseconds(static_cast<F64>(getTotalTime()));
 }
 
 void LLTimer::reset()
diff --git a/indra/llcommon/u64.cpp b/indra/llcommon/u64.cpp
deleted file mode 100644
index 5b2e35d5fb777704551d4f0929c7a4351fabd73f..0000000000000000000000000000000000000000
--- a/indra/llcommon/u64.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/** 
- * @file u64.cpp
- * @brief Utilities to deal with U64s.
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "u64.h"
-
-F64 U64_to_F64(const U64 value)
-{
-	S64 top_bits = (S64)(value >> 1);
-	F64 result = (F64)top_bits;
-	result *= 2.f;
-	result += (U32)(value & 0x01);
-	return result;
-}
diff --git a/indra/llcommon/u64.h b/indra/llcommon/u64.h
deleted file mode 100644
index a2bc79c45f7d772d93f9eac2b93fda8652eac3ca..0000000000000000000000000000000000000000
--- a/indra/llcommon/u64.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/** 
- * @file u64.h
- * @brief Utilities to deal with U64s.
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library 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
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_U64_H
-#define LL_U64_H
-
- /**
- * @brief Convert a U64 to the closest F64 value.
- */
-LL_COMMON_API F64 U64_to_F64(const U64 value);
-
-#endif
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index de601dc100fcdd144848dd8d2f2083d4615cc17c..5fd348cf088592c35db65af510beda835167ddab 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -40,7 +40,6 @@
 #include "lltransactionflags.h"
 #include "llsdutil_math.h"
 #include "message.h"
-#include "u64.h"
 #include "llregionflags.h"
 #include <boost/range/adaptor/map.hpp>
 
diff --git a/indra/llmessage/llnamevalue.cpp b/indra/llmessage/llnamevalue.cpp
index d936907c8ebdb155b858298133b08120f5fe163d..b675354765a673ec8e97f0225cc6f8bf81dce270 100644
--- a/indra/llmessage/llnamevalue.cpp
+++ b/indra/llmessage/llnamevalue.cpp
@@ -31,7 +31,6 @@
 
 #include "llnamevalue.h"
 
-#include "u64.h"
 #include "llstring.h"
 #include "llstringtable.h"
 
diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp
index d4d38e4b7adc53de8ac19210a339ef582d230891..bb1820dd0e5811ece027bea34e395077c4cb13a4 100644
--- a/indra/llmessage/llpacketring.cpp
+++ b/indra/llmessage/llpacketring.cpp
@@ -41,7 +41,6 @@
 #include "llproxy.h"
 #include "llrand.h"
 #include "message.h"
-#include "u64.h"
 
 #include "llmessagelog.h"
 
diff --git a/indra/llmessage/llsdmessagebuilder.cpp b/indra/llmessage/llsdmessagebuilder.cpp
index 9360e7a2150de638f900006fa68da01e1745836d..823ee655eefee38f9956ee0a3e342bd6c6173e23 100644
--- a/indra/llmessage/llsdmessagebuilder.cpp
+++ b/indra/llmessage/llsdmessagebuilder.cpp
@@ -34,7 +34,6 @@
 #include "llsdutil.h"
 #include "llsdutil_math.h"
 #include "llsdserialize.h"
-#include "u64.h"
 #include "v3dmath.h"
 #include "v3math.h"
 #include "v4math.h"
diff --git a/indra/llmessage/lltemplatemessagebuilder.cpp b/indra/llmessage/lltemplatemessagebuilder.cpp
index b1db99d1f6dae0bce0047e005366810ca3d7514c..aa8a0d3930ddc194712f06acf9df19b98e139edc 100644
--- a/indra/llmessage/lltemplatemessagebuilder.cpp
+++ b/indra/llmessage/lltemplatemessagebuilder.cpp
@@ -31,7 +31,6 @@
 #include "llmessagetemplate.h"
 #include "llmath.h"
 #include "llquaternion.h"
-#include "u64.h"
 #include "v3dmath.h"
 #include "v3math.h"
 #include "v4math.h"
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index bea497f52657e95ca63c6bdf5a5fe9d22b472033..67cc259ca30a8b8517ffae68f49cfa98c319e555 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -33,7 +33,6 @@
 #include "llmath.h"
 #include "llquaternion.h"
 #include "message.h"
-#include "u64.h"
 #include "v3dmath.h"
 #include "v3math.h"
 #include "v4math.h"
diff --git a/indra/llmessage/llxfer.cpp b/indra/llmessage/llxfer.cpp
index cd1f629a1aa035ef668afeaed49afd8147cfe6d3..a515ae85564ec06762d1ecc079364286b127ce22 100644
--- a/indra/llmessage/llxfer.cpp
+++ b/indra/llmessage/llxfer.cpp
@@ -30,7 +30,6 @@
 #include "lluuid.h"
 #include "llerror.h"
 #include "llmath.h"
-#include "u64.h"
 
 //number of bytes sent in each message
 const U32 LL_XFER_CHUNK_SIZE = 1000;
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp
index e11abd1d9146e340870a04e9478b999c772d2252..d98fb4a9fc26e6963c887adc816de9bc0fe0e4aa 100644
--- a/indra/llmessage/llxfermanager.cpp
+++ b/indra/llmessage/llxfermanager.cpp
@@ -35,7 +35,6 @@
 
 #include "llerror.h"
 #include "lluuid.h"
-#include "u64.h"
 
 const F32 LL_XFER_REGISTRATION_TIMEOUT = 60.0f;  // timeout if a registered transfer hasn't been requested in 60 seconds
 const F32 LL_PACKET_TIMEOUT = 3.0f;             // packet timeout at 3 s
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index ed93c0ebb1629d803c2a50537c14c6ba61385a62..116b924f8e2d0c9c965bb9855b414d8a958874b2 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -67,7 +67,6 @@
 #include "lluuid.h"
 #include "llxfermanager.h"
 #include "llquaternion.h"
-#include "u64.h"
 #include "v3dmath.h"
 #include "v3math.h"
 #include "v4math.h"
diff --git a/indra/llplugin/llpluginmessage.cpp b/indra/llplugin/llpluginmessage.cpp
index 8514ce6ae53d4decb6afd1797484723788ffade2..b590f72fad8e05efa9a8d60a8fd52837c160019e 100644
--- a/indra/llplugin/llpluginmessage.cpp
+++ b/indra/llplugin/llpluginmessage.cpp
@@ -30,7 +30,6 @@
 
 #include "llpluginmessage.h"
 #include "llsdserialize.h"
-#include "u64.h"
 
 /**
  * Constructor.
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 8b09b7320b65d92185a0885c9c2e0d74437e67d9..67edc53ae675259716cffbd20d87944117e90126 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -65,7 +65,6 @@
 #include "lltoolmgr.h"
 #include "lltoolpie.h"
 #include "llkeyboard.h"
-#include "u64.h"
 #include "llviewertexturelist.h"
 #include "lldatapacker.h"
 #include "llcallstack.h"
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index c28d1f3053c720df60a16f16ffdd4d4d7891c73d..924dbd647fb6ff27efb1bcf54786ae0515c628c8 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -64,7 +64,6 @@
 #include "llsys.h"
 #include "lltimer.h"
 #include "stdtypes.h"
-#include "u64.h"
 
 // Library includes from llmath project
 #include "llmath.h"