diff --git a/include/coreinit/systeminfo.h b/include/coreinit/systeminfo.h
index b5cac51..5d61774 100644
--- a/include/coreinit/systeminfo.h
+++ b/include/coreinit/systeminfo.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <wut.h>
-#include "time.h"
 
 /**
  * \defgroup coreinit_systeminfo System Info
@@ -18,7 +17,7 @@ struct OSSystemInfo
 {
    uint32_t busClockSpeed;
    uint32_t coreClockSpeed;
-   OSTime baseTime;
+   int64_t baseTime;
    UNKNOWN(0x10);
 };
 CHECK_OFFSET(OSSystemInfo, 0x0, busClockSpeed);
diff --git a/include/coreinit/thread.h b/include/coreinit/thread.h
index 8f4852b..cccfcc6 100644
--- a/include/coreinit/thread.h
+++ b/include/coreinit/thread.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <wut.h>
-#include "systeminfo.h"
 #include "context.h"
 #include "time.h"
 #include "threadqueue.h"
diff --git a/include/coreinit/time.h b/include/coreinit/time.h
index edf7935..2145575 100644
--- a/include/coreinit/time.h
+++ b/include/coreinit/time.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <wut.h>
+#include "systeminfo.h"
 
 /**
  * \defgroup coreinit_time Time