diff --git a/applications/solvers/additiveFoam/Allwclean b/applications/solvers/additiveFoam/Allwclean
index 62fb3ca..0be4d4a 100755
--- a/applications/solvers/additiveFoam/Allwclean
+++ b/applications/solvers/additiveFoam/Allwclean
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-rm -rf Make/additiveFoamVersion.H
+rm -rf Make/gitInfo.H
 
 wclean libso functionObjects/ExaCA
 wclean libso movingHeatSource
diff --git a/applications/solvers/additiveFoam/Allwmake b/applications/solvers/additiveFoam/Allwmake
index 812b6c3..15956c7 100755
--- a/applications/solvers/additiveFoam/Allwmake
+++ b/applications/solvers/additiveFoam/Allwmake
@@ -5,18 +5,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
-# Generate AdditiveFOAM version header
-HEADER_FILE="${0%/*}/Make/additiveFoamVersion.H"
+# Generate header for git information
+HEADER_FILE="${0%/*}/Make/gitInfo.H"
 GIT_DESCRIBE=$(git describe --tags --always 2>/dev/null) || GIT_DESCRIBE="undefined"
 GIT_SHA1=$(git rev-parse HEAD 2>/dev/null) || GIT_SHA1="undefined"
-STATIC_VERSION="1.1.0-dev"
 
 cat > "$HEADER_FILE" << EOF
-#ifndef AdditiveFOAMVersion_H
-#define AdditiveFOAMVersion_H
-
-// Static Version
-#define ADDITIVEFOAM_VERSION      "$STATIC_VERSION"
+#ifndef gitInfo_H
+#define gitInfo_H
 
 // Git describe
 #define ADDITIVEFOAM_GIT_DESCRIBE "$GIT_DESCRIBE"
@@ -27,11 +23,7 @@ cat > "$HEADER_FILE" << EOF
 #endif
 EOF
 
-if [ $? -ne 0 ]; then
-    echo "Error: Failed to write to $HEADER_FILE" >&2
-fi
-
-echo "Generated version header: $HEADER_FILE" >&2
+export ADDITIVEFOAM_BUILD_FLAGS="-DGIT_MODULE_ENABLED=1"
 
 #------------------------------------------------------------------------------
 # Build libraries and solver
diff --git a/applications/solvers/additiveFoam/Make/options b/applications/solvers/additiveFoam/Make/options
index 6be0788..c61a644 100644
--- a/applications/solvers/additiveFoam/Make/options
+++ b/applications/solvers/additiveFoam/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    $(ADDITIVEFOAM_BUILD_FLAGS) \
     -I. \
     -ImovingHeatSource/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/applications/solvers/additiveFoam/additiveFoam.C b/applications/solvers/additiveFoam/additiveFoam.C
index e8396aa..20d70b1 100644
--- a/applications/solvers/additiveFoam/additiveFoam.C
+++ b/applications/solvers/additiveFoam/additiveFoam.C
@@ -31,9 +31,7 @@ Description
     simulations.
     
 \*---------------------------------------------------------------------------*/
-
-#include "Make/additiveFoamVersion.H"
-
+#include "additiveFoamInfo.H"
 #include "fvCFD.H"
 #include "pimpleControl.H"
 #include "graph.H"
@@ -49,18 +47,7 @@ int main(int argc, char *argv[])
 {       
     #include "postProcess.H"    
     #include "setRootCase.H"
-    
-    Info << "AdditiveFOAM Information:" << nl;
-    #ifdef ADDITIVEFOAM_VERSION
-        Info << "Version:   " << ADDITIVEFOAM_VERSION << nl;
-    #endif
-    #ifdef ADDITIVEFOAM_GIT_DESCRIBE
-        Info << "Build:     " << ADDITIVEFOAM_GIT_DESCRIBE << nl;
-    #endif
-    #ifdef ADDITIVEFOAM_GIT_SHA1
-        Info << "Git SHA1:  " << ADDITIVEFOAM_GIT_SHA1 << nl << endl;
-    #endif
-    
+    AdditiveFoamInfo::write();
     #include "createTime.H"
     #include "createMesh.H"
     #include "createControl.H"
diff --git a/applications/solvers/additiveFoam/additiveFoamInfo.H b/applications/solvers/additiveFoam/additiveFoamInfo.H
new file mode 100644
index 0000000..a0c7e5e
--- /dev/null
+++ b/applications/solvers/additiveFoam/additiveFoamInfo.H
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------*\
+-------------------------------------------------------------------------------
+                Copyright (C) 2023 Oak Ridge National Laboratory                
+-------------------------------------------------------------------------------
+
+Class
+    Foam::AdditiveFoamInfo
+
+Description
+    Outputs version and build information for AdditiveFOAM.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef AdditiveFoamInfo_H
+#define AdditiveFoamInfo_H
+
+#include "OSspecific.H"
+
+#ifdef GIT_MODULE_ENABLED
+    #include "Make/gitInfo.H"
+#endif
+
+// Static version
+#define ADDITIVEFOAM_VERSION "1.1.0-dev"
+
+namespace Foam
+{
+
+class AdditiveFoamInfo
+{
+public:
+
+    //- Disallow default construction, copy, assignment, and destruction
+    AdditiveFoamInfo() = delete;
+    ~AdditiveFoamInfo() = delete;
+    AdditiveFoamInfo(const AdditiveFoamInfo&) = delete;
+    AdditiveFoamInfo& operator=(const AdditiveFoamInfo&) = delete;
+
+    //- Print version/build information to Info stream
+    static void write()
+    {
+        Info<< "AdditiveFOAM Information:" << nl;
+        Info<< "Version:   " << ADDITIVEFOAM_VERSION << nl;
+
+        //- Print git describe and SHA1 (optional)
+        #ifdef ADDITIVEFOAM_GIT_DESCRIBE
+            Info<< "Build:     " << ADDITIVEFOAM_GIT_DESCRIBE << nl;
+        #endif
+
+        #ifdef ADDITIVEFOAM_GIT_SHA1
+            Info<< "Git SHA1:  " << ADDITIVEFOAM_GIT_SHA1 << nl;
+        #endif
+
+        Info<< endl;
+    }
+};
+
+} // End namespace Foam
+
+#endif
+
+// ************************************************************************* //
+