Index: kernel/generic/include/proc/program.h
===================================================================
--- kernel/generic/include/proc/program.h	(revision 91001e26b14a5356ec8cf4cdeb642890b919a12d)
+++ kernel/generic/include/proc/program.h	(revision 5814ef7188cf75fcd57922f03a3bde3d4c78975f)
@@ -36,5 +36,5 @@
 #define KERN_PROGRAM_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 struct task;
Index: kernel/generic/include/proc/scheduler.h
===================================================================
--- kernel/generic/include/proc/scheduler.h	(revision 91001e26b14a5356ec8cf4cdeb642890b919a12d)
+++ kernel/generic/include/proc/scheduler.h	(revision 5814ef7188cf75fcd57922f03a3bde3d4c78975f)
@@ -37,16 +37,17 @@
 
 #include <synch/spinlock.h>
-#include <time/clock.h>		/* HZ */
+#include <time/clock.h>
+#include <typedefs.h>
 #include <atomic.h>
 #include <adt/list.h>
 
-#define RQ_COUNT 		16
-#define NEEDS_RELINK_MAX	(HZ)
+#define RQ_COUNT          16
+#define NEEDS_RELINK_MAX  (HZ)
 
 /** Scheduler run queue structure. */
 typedef struct {
 	SPINLOCK_DECLARE(lock);
-	link_t rq_head;		/**< List of ready threads. */
-	size_t n;		/**< Number of threads in rq_ready. */
+	link_t rq_head;          /**< List of ready threads. */
+	size_t n;                /**< Number of threads in rq_ready. */
 } runq_t;
 
@@ -61,5 +62,5 @@
 
 /*
- * To be defined by architectures:
+ * To be defined by architectures.
  */
 extern void before_task_runs_arch(void);