diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f0bbd343d37729af63af543237cfa8895ceaa9bf..76b967eb820b1930ae9b124b45472db5db7fdfd5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -451,7 +451,6 @@ set(viewer_SOURCE_FILES
     llviewerassetstorage.cpp
     llviewerassettype.cpp
     llvieweraudio.cpp
-    llviewerbuild.cpp
     llviewercamera.cpp
     llviewerchat.cpp
     llviewercontrol.cpp
@@ -497,6 +496,7 @@ set(viewer_SOURCE_FILES
     llviewertextureanim.cpp
     llviewertexturelist.cpp
     llviewerthrottle.cpp
+    llviewerversion.cpp
     llviewervisualparam.cpp
     llviewerwindow.cpp
     llviewerwindowlistener.cpp
@@ -955,7 +955,6 @@ set(viewer_HEADER_FILES
     llviewerassetstorage.h
     llviewerassettype.h
     llvieweraudio.h
-    llviewerbuild.h
     llviewercamera.h
     llviewerchat.h
     llviewercontrol.h
@@ -998,6 +997,7 @@ set(viewer_HEADER_FILES
     llviewertextureanim.h
     llviewertexturelist.h
     llviewerthrottle.h
+    llviewerversion.h
     llviewervisualparam.h
     llviewerwindow.h
     llviewerwindowlistener.h
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e5be17dec6a6e636ce9a6da1363b5c9fb9ae5851..6bbc1eaa6a9057c18eef536198840e94e85edd29 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -36,7 +36,7 @@
 
 // Viewer includes
 #include "llversionviewer.h"
-#include "llviewerbuild.h"
+#include "llviewerversion.h"
 #include "llfeaturemanager.h"
 #include "lluictrlfactory.h"
 #include "lltexteditor.h"
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 5efaf6c58d0e7b6adcf1711fbc6a44c50c28370a..b2588cc01b75c30bd1ebd9754c47e00c0ddc4e88 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -46,7 +46,7 @@
 #include "llviewerstats.h"
 #include "llviewerregion.h"
 #include "llversionviewer.h"
-#include "llviewerbuild.h"
+#include "llviewerversion.h"
 #include "llweb.h"
 
 // Linden library includes
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index ec2815dd5aab91acf85d73c957d122309ad438a7..be821ad43bbc8e90700d3c2c50c2574d899b1aef 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -45,7 +45,6 @@
 #include "llnotificationsutil.h"
 #include "llstring.h"
 #include "llsys.h"
-#include "llviewerbuild.h"
 #include "message.h"
 #include "v3math.h"
 
@@ -76,7 +75,7 @@
 #include "llfloateravatarpicker.h"
 #include "lldir.h"
 #include "llselectmgr.h"
-#include "llviewerbuild.h"
+#include "llviewerversion.h"
 #include "lluictrlfactory.h"
 #include "llviewernetwork.h"
 
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index a72b7a9d7afa54c79c048accc199b316f201abe5..d80d5c3d2e3b337ae93df995a478d848fb03ad4e 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -57,7 +57,7 @@
 #include "llui.h"
 #include "lluiconstants.h"
 #include "llurlsimstring.h"
-#include "llviewerbuild.h"
+#include "llviewerversion.h"
 #include "llviewerhelp.h"
 #include "llviewertexturelist.h"
 #include "llviewermenu.h"			// for handle_preferences()
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index c32e67ef90f36465d7742f2e663484907d590dc5..a041f3ac98d2083e4d85cec105c3325b68a87a45 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -36,7 +36,6 @@
 
 #include "llagent.h"
 #include "llviewerassetstorage.h"
-#include "llviewerbuild.h"
 #include "llvfile.h"
 #include "llvfs.h"
 
diff --git a/indra/newview/llviewerhelputil.cpp b/indra/newview/llviewerhelputil.cpp
index 2d9876517537d0c65fa4586161c99738b98b796f..2642b2378e9765e12d1dad6f33a61d3519e1ce10 100644
--- a/indra/newview/llviewerhelputil.cpp
+++ b/indra/newview/llviewerhelputil.cpp
@@ -34,7 +34,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llversionviewer.h"
-#include "llviewerbuild.h"
+#include "llviewerversion.h"
 
 //#include "llfloaterhelpbrowser.h"
 //#include "llfloaterreg.h"
diff --git a/indra/newview/llviewerhome.cpp b/indra/newview/llviewerhome.cpp
index 57e828525d5d56f317afc5af18bcfda56afdbf83..ee1e46dc5972c7f9cdbd1d81d328fa7e6a4f1559 100644
--- a/indra/newview/llviewerhome.cpp
+++ b/indra/newview/llviewerhome.cpp
@@ -38,7 +38,7 @@
 #include "llui.h"
 #include "lluri.h"
 #include "llsd.h"
-#include "llviewerbuild.h"
+#include "llviewerversion.h"
 #include "llviewercontrol.h"
 
 //static
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 25a809d697e92ad27661734f9e6d6390cca69b7b..a206768d335369a25397becd264c11792b756e8b 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -41,7 +41,7 @@
 #include "llviewertexture.h"
 #include "llviewerparcelmedia.h"
 #include "llviewerparcelmgr.h"
-#include "llviewerbuild.h"
+#include "llviewerversion.h"
 #include "llviewertexturelist.h"
 #include "llvovolume.h"
 #include "llpluginclassmedia.h"
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index 87304cfcff1577816f8c0055727dec7e86afae49..90e3e7a7e0a60a739c60d8c2792f73b9dc781cf1 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -36,7 +36,7 @@
 #include "../test/lltut.h"
 
 #include "../llviewerhelputil.h"
-#include "../llviewerbuild.h"
+#include "../llviewerversion.h"
 #include "llcontrol.h"
 #include "llsys.h"