--- Gnu-Mach/kern/mach_factor.c	2020/09/02 04:42:46	1.1.1.2
+++ Gnu-Mach/kern/mach_factor.c	2020/09/02 04:47:33	1.1.1.4
@@ -31,18 +31,15 @@
  *	Compute the Mach Factor.
  */
 
-#include <cpus.h>
-
 #include <mach/machine.h>
 #include <mach/processor_info.h>
+#include <kern/mach_clock.h>
 #include <kern/sched.h>
 #include <kern/processor.h>
-#include <kern/time_out.h>
-#if	MACH_KERNEL
 #include <mach/kern_return.h>
 #include <mach/port.h>
-#endif	/* MACH_KERNEL */
 
+#include "mach_factor.h"
 
 long	avenrun[3] = {0, 0, 0};
 long	mach_factor[3] = {0, 0, 0};
@@ -56,15 +53,15 @@ static	long	fract[3] = {
 	983,			/* (59.0/60.) 1 minute average */
 };
 
-void compute_mach_factor()
+void compute_mach_factor(void)
 {
-	register processor_set_t	pset;
-	register processor_t		processor;
-	register int		ncpus;
-	register int		nthreads;
-	register long		factor_now;
-	register long		average_now;
-	register long		load_now;
+	processor_set_t	pset;
+	processor_t	processor;
+	int		ncpus;
+	int		nthreads;
+	long		factor_now;
+	long		average_now;
+	long		load_now;
 
 	simple_lock(&all_psets_lock);
 	pset = (processor_set_t) queue_first(&all_psets);
@@ -126,7 +123,7 @@ void compute_mach_factor()
 		 *	And some ugly stuff to keep w happy.
 		 */
 		if (pset == &default_pset) {
-		    register int i;
+		    int i;
 
 		    for (i = 0; i < 3; i++) {
 			mach_factor[i] = ( (mach_factor[i]*fract[i])