diff --git a/src/CodeTable4_4.h b/src/CodeTable4_4.h
index f5aef37a..99a2883a 100644
--- a/src/CodeTable4_4.h
+++ b/src/CodeTable4_4.h
@@ -3,15 +3,15 @@
  * @author Public Domain: Wesley Ebisuzaki @date 2005
  */
 
-#define MINUTE		0       /**< Code Table 4.4: Minute */
-#define HOUR		1       /**< Code Table 4.4: Hour */
-#define DAY		    2       /**< Code Table 4.4: Day */
-#define MONTH		3       /**< Code Table 4.4: Month */
-#define YEAR		4       /**< Code Table 4.4: Year */
-#define DECADE		5       /**< Code Table 4.4: Decade (10 Years) */
-#define NORMAL		6       /**< Code Table 4.4: Normal (30 Years) */
-#define CENTURY		7       /**< Code Table 4.4: Century (100 Years) */
-#define HOUR3		10      /**< Code Table 4.4: 3 Hours */
-#define HOUR6		11      /**< Code Table 4.4: 6 Hours */
-#define HOUR12		12      /**< Code Table 4.4: 12 Hours */
-#define SECOND		13      /**< Code Table 4.4: Second */
+#define MINUTE      0   /**< Code Table 4.4: Minute */
+#define HOUR        1   /**< Code Table 4.4: Hour */
+#define DAY         2   /**< Code Table 4.4: Day */
+#define MONTH       3   /**< Code Table 4.4: Month */
+#define YEAR        4   /**< Code Table 4.4: Year */
+#define DECADE      5   /**< Code Table 4.4: Decade (10 years) */
+#define NORMAL      6   /**< Code Table 4.4: Normal (30 years) */
+#define CENTURY     7   /**< Code Table 4.4: Century (100 years) */
+#define HOUR3      10   /**< Code Table 4.4: 3 hours */
+#define HOUR6      11   /**< Code Table 4.4: 6 hours */
+#define HOUR12     12   /**< Code Table 4.4: 12 hours */
+#define SECOND     13   /**< Code Table 4.4: Second */
diff --git a/wmo_scripts/get_code_Table_4.4.sh b/wmo_scripts/get_code_Table_4.4.sh
index b0c7da23..684c3d30 100755
--- a/wmo_scripts/get_code_Table_4.4.sh
+++ b/wmo_scripts/get_code_Table_4.4.sh
@@ -11,6 +11,8 @@ urlbase="https://github.com/wmo-im/GRIB2"
 
 outfile="CodeTable_4.4.dat"
 if [ -f "$outfile" ]; then mv "$outfile" "$outfile.old"; fi
+outfile2="CodeTable4_4.h"
+if [ -f "$outfile2" ]; then mv "$outfile2" "$outfile2.old"; fi
 
 #---GRIB2 Code Table 4.4: Indicator of unit of time range
 wget -nv "$urlbase/raw/master/GRIB2_CodeFlag_4_4_CodeTable_en.csv" -O- | sed '{
@@ -26,6 +28,28 @@ wget -nv "$urlbase/raw/master/GRIB2_CodeFlag_4_4_CodeTable_en.csv" -O- | sed '{
     }
   }' > "$outfile"
 
+#---Same content as CodeTable_4.4.dat provided as macro values:
+awk -F"[:;]" '
+  BEGIN { print "/** @file\n\
+ * @brief Code Table 4.4: Indicator of unit of time range\n\
+ * @author Public Domain: Wesley Ebisuzaki @date 2005\n\
+ */\n\
+"
+  }
+  {
+    split($1,arr," ")
+    num=arr[2]
+    string=gensub(" *string=","",1,$2)
+    string=gensub("\"","","g",string)
+    str=toupper(string)
+    if(str=="MISSING")  { next }
+    if(str=="3 HOURS")  { str="HOUR3" }
+    if(str=="6 HOURS")  { str="HOUR6" }
+    if(str=="12 HOURS") { str="HOUR12" }
+    str=gensub(" .*$","",1,str)
+    printf "%s %-8s  %3s %s%s%s\n","#define",str,num,"  /**< Code Table 4.4: ",string," */"
+  }' "$outfile" > "$outfile2"
+
 exit
 
-## @endcond
\ No newline at end of file
+## @endcond
diff --git a/wmo_scripts/install_tables.sh b/wmo_scripts/install_tables.sh
index a26dcacc..578cd5e4 100755
--- a/wmo_scripts/install_tables.sh
+++ b/wmo_scripts/install_tables.sh
@@ -10,6 +10,6 @@ cd tables.tmp || exit 1
 #  diff -Nu "../../src/$fil" .
 #done
 
-cp -vp ./*.dat ./*.c ../../src/
+cp -vp ./*.dat ./*.c ./*.h ../../src/
 
 exit