diff --git a/general.h b/general.h
index aec375252b..b005699268 100644
--- a/general.h
+++ b/general.h
@@ -19,7 +19,6 @@
 
 #include "boolean.h"
 #include <stdio.h>
-#include <time.h>
 #include <limits.h>
 #include <setjmp.h>
 #include "driver.h"
@@ -52,15 +51,9 @@
 // Platform-specific headers
 // PS3
 #if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#include <sys/timer.h>
 #include "ps3/ps3_input.h"
 #endif
 
-// libxenon
-#ifdef XENON
-#include <time/time.h>
-#endif
-
 // Windows
 #ifdef _WIN32
 #ifdef _XBOX
diff --git a/hash.c b/hash.c
index 65017a60d2..9a0ed7e654 100644
--- a/hash.c
+++ b/hash.c
@@ -16,10 +16,10 @@
 // SHA256 implementation from bSNES. Written by valditx.
 //
 
-#include "general.h"
-#include "hash.h"
 #include <string.h>
 #include <stdio.h>
+#include "hash.h"
+#include "miscellaneous.h"
 
 #define SWAP32(x) ((uint32_t)(           \
          (((uint32_t)(x) & 0x000000ff) << 24) | \
diff --git a/miscellaneous.h b/miscellaneous.h
index 7fd0248ab9..1bed5ae1f1 100644
--- a/miscellaneous.h
+++ b/miscellaneous.h
@@ -17,6 +17,14 @@
 #ifndef __RARCH_MISCELLANEOUS_H
 #define __RARCH_MISCELLANEOUS_H
 
+#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
+#include <sys/timer.h>
+#elif defined(XENON)
+#include <time/time.h>
+#else
+#include <time.h>
+#endif
+
 #include "retroarch_logger.h"
 
 #ifndef max