Modify gPXE core and drivers to work with the new timer subsystem

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>

4 files changed, 4 insertions, 4 deletions

diff --git a/src/core/getkey.c b/src/core/getkey.c
index 71ec6cc1..1551cf37 100644
--- a/src/core/getkey.c
+++ b/src/core/getkey.c
@@ -17,9 +17,9 @@
  */
 
 #include <console.h>
-#include <latch.h>
 #include <gpxe/process.h>
 #include <gpxe/keys.h>
+#include <gpxe/timer.h>
 
 /** @file
  *
diff --git a/src/core/misc.c b/src/core/misc.c
index fcf0aeab..a54f5a10 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -4,8 +4,8 @@ MISC Support Routines
 
 #include <stdlib.h>
 #include <byteswap.h>
-#include <latch.h>
 #include <gpxe/in.h>
+#include <gpxe/timer.h>
 
 /**************************************************************************
 INET_ATON - Convert an ascii x.x.x.x to binary form
diff --git a/src/core/random.c b/src/core/random.c
index e4a70d43..d34e763a 100644
--- a/src/core/random.c
+++ b/src/core/random.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <latch.h>
+#include <gpxe/timer.h>
 
 static int32_t rnd_seed = 0;
 
diff --git a/src/core/serial.c b/src/core/serial.c
index f325bc45..f6d0ecbb 100644
--- a/src/core/serial.c
+++ b/src/core/serial.c
@@ -15,7 +15,7 @@
 #include "console.h"
 #include <gpxe/init.h>
 #include "io.h"
-#include "timer.h"
+#include <unistd.h>
 #include "config/serial.h"
 
 /* Set default values if none specified */