diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87ceef0..4f306a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@ INCLUDE( VersionMacros )
 INCLUDE( SetupTargetMacros )
 INCLUDE(GetGitRevisionDescription)
 
-get_git_head_revision(GIT_REFSPEC GIT_SHA3)
-get_git_unix_timestamp(GIT_UNIX_TIMESTAMP3)
+get_git_head_revision(GIT_REFSPEC FC_GIT_REVISION_SHA)
+get_git_unix_timestamp(FC_GIT_REVISION_UNIX_TIMESTAMP)
 
 SET( DEFAULT_HEADER_INSTALL_DIR include/\${target} )
 SET( DEFAULT_LIBRARY_INSTALL_DIR lib/ )
@@ -168,8 +168,8 @@ set( sources
   ${fc_sources}
 )
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/GitSHA3.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/GitSHA3.cpp" @ONLY)
-list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/GitSHA3.cpp" GitSHA3.h)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/git_revision.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp" @ONLY)
+list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp")
 list(APPEND sources ${fc_headers})
 
 add_subdirectory( vendor/easylzma )
diff --git a/GitSHA3.cpp.in b/GitSHA3.cpp.in
deleted file mode 100644
index 045015e..0000000
--- a/GitSHA3.cpp.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdint.h>
-#include "GitSHA3.h"
-
-#define GIT_SHA3 "@GIT_SHA3@"
-const char* const g_GIT_SHA3 = GIT_SHA3;
-#define GIT_UNIX_TIMESTAMP3 @GIT_UNIX_TIMESTAMP3@
-const uint32_t g_GIT_UNIX_TIMESTAMP3 = GIT_UNIX_TIMESTAMP3;
diff --git a/GitSHA3.h b/GitSHA3.h
deleted file mode 100644
index cb8830e..0000000
--- a/GitSHA3.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __GITSHA3_H
-#define __GITSHA3_H
-
-extern const char* const g_GIT_SHA3;
-extern const uint32_t g_GIT_UNIX_TIMESTAMP3;
-
-#define APPLICATION_VERSION "1.0 Beta1"
-
-#endif ///__GITSHA3_H
diff --git a/include/fc/git_revision.hpp b/include/fc/git_revision.hpp
new file mode 100644
index 0000000..6232f3c
--- /dev/null
+++ b/include/fc/git_revision.hpp
@@ -0,0 +1,9 @@
+#pragma once
+#include <stdint.h>
+
+namespace fc {
+
+extern const char* const git_revision_sha;
+extern const uint32_t git_revision_unix_timestamp;
+
+} // end namespace fc
diff --git a/src/git_revision.cpp.in b/src/git_revision.cpp.in
new file mode 100644
index 0000000..40977b7
--- /dev/null
+++ b/src/git_revision.cpp.in
@@ -0,0 +1,11 @@
+#include <fc/git_revision.hpp>
+
+#define FC_GIT_REVISION_SHA "@FC_GIT_REVISION_SHA@"
+#define FC_GIT_REVISION_UNIX_TIMESTAMP @FC_GIT_REVISION_UNIX_TIMESTAMP@
+
+namespace fc { 
+
+const char* const git_revision_sha = FC_GIT_REVISION_SHA;
+const uint32_t git_revision_unix_timestamp = FC_GIT_REVISION_UNIX_TIMESTAMP;
+
+} // end namespace fc