diff --git a/.hgignore b/.hgignore
index a1c416438d..2c64d61d77 100644
--- a/.hgignore
+++ b/.hgignore
@@ -19,8 +19,8 @@ indra/lib/mono/indra/*.dll
 indra/lib/mono/indra/*.exe
 indra/lib/mono/indra/*.pdb
 indra/lib/python/eventlet/
-indra/llcommon/llversionviewer.h
-indra/llcommon/llversionviewer.h.built
+indra/llcommon/llversionviewer.cpp
+indra/llcommon/llversionviewer.cpp.built
 indra/llwindow/glh/glh_linear.h
 indra/newview/app_settings/mozilla
 indra/newview/app_settings/mozilla-runtime-*
diff --git a/build_firestorm_linux.sh b/build_firestorm_linux.sh
index 663d902379..c828854f4b 100755
--- a/build_firestorm_linux.sh
+++ b/build_firestorm_linux.sh
@@ -225,7 +225,7 @@ if [ $WANTS_VERSION -eq $TRUE ] ; then
 	    -e "s#LL_VERSION_MAJOR = .*\$#LL_VERSION_MAJOR = ${majorVer};#" \
 	    -e "s#LL_VERSION_MINOR = .*\$#LL_VERSION_MINOR = ${minorVer};#" \
             -e "s#LL_VERSION_PATCH = .*\$#LL_VERSION_PATCH = ${patchVer};#" \
-	    -e "s#LL_CHANNEL = .*\$#LL_CHANNEL = \"Firestorm-$CHANNEL\";#" llcommon/llversionviewer.h.in > llcommon/llversionviewer.h
+	    -e "s#LL_CHANNEL = .*\$#LL_CHANNEL = \"Firestorm-$CHANNEL\";#" llcommon/llversionviewer.cpp.in > llcommon/llversionviewer.cpp
 fi
 
 if [ $WANTS_CONFIG -eq $TRUE ] ; then
diff --git a/build_firestorm_macosx.sh b/build_firestorm_macosx.sh
index 0126152d97..85c8f1f804 100755
--- a/build_firestorm_macosx.sh
+++ b/build_firestorm_macosx.sh
@@ -219,7 +219,7 @@ if [ $WANTS_VERSION -eq $TRUE ] ; then
             -e "s#LL_VERSION_MAJOR = .*\$#LL_VERSION_MAJOR = ${majorVer};#" \
             -e "s#LL_VERSION_MINOR = .*\$#LL_VERSION_MINOR = ${minorVer};#" \
             -e "s#LL_VERSION_PATCH = .*\$#LL_VERSION_PATCH = ${patchVer};#" \
-            -e "s#LL_CHANNEL = .*\$#LL_CHANNEL = \"Firestorm-$CHANNEL\";#" llcommon/llversionviewer.h.in > llcommon/llversionviewer.h
+            -e "s#LL_CHANNEL = .*\$#LL_CHANNEL = \"Firestorm-$CHANNEL\";#" llcommon/llversionviewer.cpp.in > llcommon/llversionviewer.cpp
 fi
 
 
diff --git a/build_firestorm_win32.sh b/build_firestorm_win32.sh
index 3ff6072ed1..aef827a760 100644
--- a/build_firestorm_win32.sh
+++ b/build_firestorm_win32.sh
@@ -228,7 +228,7 @@ if [ $WANTS_VERSION -eq $TRUE ] ; then
 	    -e "s#LL_VERSION_MAJOR = .*\$#LL_VERSION_MAJOR = ${majorVer};#" \
 	    -e "s#LL_VERSION_MINOR = .*\$#LL_VERSION_MINOR = ${minorVer};#" \
             -e "s#LL_VERSION_PATCH = .*\$#LL_VERSION_PATCH = ${patchVer};#" \
-	    -e "s#LL_CHANNEL = .*\$#LL_CHANNEL = \"Firestorm-$CHANNEL\";#" llcommon/llversionviewer.h.in > llcommon/llversionviewer.h
+	    -e "s#LL_CHANNEL = .*\$#LL_CHANNEL = \"Firestorm-$CHANNEL\";#" llcommon/llversionviewer.cpp.in > llcommon/llversionviewer.cpp
 fi
 
 if [ $WANTS_CONFIG -eq $TRUE ] ; then
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index 3093cd2d82..430e1e30dd 100644
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -78,7 +78,7 @@ def get_default_platform(dummy):
 
 def get_default_version(srctree):
     # look up llversion.h and parse out the version info
-    paths = [os.path.join(srctree, x, 'llversionviewer.h') for x in ['llcommon', '../llcommon', '../../indra/llcommon.h']]
+    paths = [os.path.join(srctree, x, 'llversionviewer.cpp') for x in ['llcommon', '../llcommon', '../../indra/llcommon.h']]
     for p in paths:
         if os.path.exists(p):
             contents = open(p, 'r').read()
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 792cc6ade6..9dd12b2d3f 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -3,6 +3,7 @@
 
 project(llcommon)
 
+
 include(00-Common)
 include(LLCommon)
 include(Linking)
@@ -233,7 +234,7 @@ set(llcommon_HEADER_FILES
     lluuid.h
     lluuidhashmap.h
     llversionserver.h
-#    llversionviewer.h
+    llversionviewer.h
     llworkerthread.h
     ll_template_cast.h
     metaclass.h
@@ -258,15 +259,12 @@ set_source_files_properties(${llcommon_HEADER_FILES}
 list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
 
 if (WINDOWS AND NOT FIRECYG)
-configure_files(llcommon_GENERATED_HEADER_FILES
-    llversionviewer.h
+configure_files(llcommon_GENERATED_SOURCE_FILES
+    llversionviewer.cpp
     )
 endif(WINDOWS AND NOT FIRECYG)
 
-set_source_files_properties(${llcommon_GENERATED_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
-list(APPEND llcommon_SOURCE_FILES ${llcommon_GENERATED_HEADER_FILES})
+list(APPEND llcommon_SOURCE_FILES ${llcommon_GENERATED_SOURCE_FILES})
 
 if(LLCOMMON_LINK_SHARED)
   add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
diff --git a/indra/llcommon/llversionviewer.h.in b/indra/llcommon/llversionviewer.cpp.in
similarity index 84%
rename from indra/llcommon/llversionviewer.h.in
rename to indra/llcommon/llversionviewer.cpp.in
index 5d6a45bec4..93a87da1fc 100644
--- a/indra/llcommon/llversionviewer.h.in
+++ b/indra/llcommon/llversionviewer.cpp.in
@@ -23,19 +23,11 @@
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
-
-#ifndef LL_LLVERSIONVIEWER_H
-#define LL_LLVERSIONVIEWER_H
+ 
+#include "linden_common.h"
+#include "llversionviewer.h"
 
 const S32 LL_VERSION_MAJOR = @VERSION_VIEWER_MAJOR@;
 const S32 LL_VERSION_MINOR = @VERSION_VIEWER_MINOR@;
 const S32 LL_VERSION_PATCH = @VERSION_VIEWER_PATCH@;
 const S32 LL_VERSION_BUILD = @VERSION_BUILD@;
-
-const char * const LL_CHANNEL = "Firestorm-private";
-
-#if LL_DARWIN
-const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.firestorm.viewer";
-#endif
-
-#endif
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
new file mode 100644
index 0000000000..d7624adc38
--- /dev/null
+++ b/indra/llcommon/llversionviewer.h
@@ -0,0 +1,41 @@
+/** 
+ * @file llversionviewer.h
+ * @brief
+ *
+ * $LicenseInfo:firstyear=2002&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_LLVERSIONVIEWER_H
+#define LL_LLVERSIONVIEWER_H
+
+LL_COMMON_API extern const S32 LL_VERSION_MAJOR;
+LL_COMMON_API extern const S32 LL_VERSION_MINOR;
+LL_COMMON_API extern const S32 LL_VERSION_PATCH;
+LL_COMMON_API extern const S32 LL_VERSION_BUILD;
+
+const char * const LL_CHANNEL = "Firestorm-private";
+
+#if LL_DARWIN
+const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.firestorm.viewer";
+#endif
+
+#endif