diff --git a/HP3000/hp_tapelib.h b/HP3000/hp_tapelib.h
index d9df207f..2cf808f9 100644
--- a/HP3000/hp_tapelib.h
+++ b/HP3000/hp_tapelib.h
@@ -41,6 +41,7 @@
 
 
 
+#include "sim_rev.h"                        /* For SIM_MAJOR */
 #include "sim_tape.h"
 
 
diff --git a/I1620/i1620_defs.h b/I1620/i1620_defs.h
index 060ed63b..725d38df 100644
--- a/I1620/i1620_defs.h
+++ b/I1620/i1620_defs.h
@@ -38,6 +38,7 @@
 #ifndef I1620_DEFS_H_
 #define I1620_DEFS_H_  0
 
+#include "sim_rev.h"
 #include "sim_defs.h"                                   /* simulator defns */
 
 #if defined(USE_INT64) || defined(USE_ADDR64)
diff --git a/scp.c b/scp.c
index 101fa396..7acd1f19 100644
--- a/scp.c
+++ b/scp.c
@@ -249,6 +249,10 @@
 #include <editline/readline.h>
 #endif
 
+#if defined(SIM_NEED_GIT_COMMIT_ID)
+#include ".git-commit-id.h"
+#endif
+
 #ifndef MAX
 #define MAX(a,b)  (((a) >= (b)) ? (a) : (b))
 #endif
diff --git a/sim_defs.h b/sim_defs.h
index d529fac3..1f816256 100644
--- a/sim_defs.h
+++ b/sim_defs.h
@@ -121,6 +121,7 @@
 #define SIM_DEFS_H_    0
 
 #include "sim_rev.h"
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/sim_rev.h b/sim_rev.h
index 8eb95a03..d2bec307 100644
--- a/sim_rev.h
+++ b/sim_rev.h
@@ -44,17 +44,11 @@
 #define SIM_VERSION_MODE "Current"
 #endif
 
-#if defined(SIM_NEED_GIT_COMMIT_ID)
-#include ".git-commit-id.h"
-#endif
-
 /*
-  Simh's git commit id would be undefined when working with an 
-  extracted archive (zip file or tar ball).  To address this 
-  problem and record the commit id that the archive was created 
-  from, the archive creation process populates the below 
-  information as a consequence of the "sim_rev.h export-subst" 
-  line in the .gitattributes file.
+  SIM__GIT_COMMMIT_ID is undefined when working with an 
+  archive (zip file or tar ball).  Use Git keyword subsitution
+  to record the archive's commit id via the .gitattributes
+  "export-subst".
  */
 #define SIM_ARCHIVE_GIT_COMMIT_ID $Format:%H$
 #define SIM_ARCHIVE_GIT_COMMIT_TIME $Format:%aI$