diff --git a/CHANGES b/CHANGES
index 09583fbcf..29ef7cb3a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -48,6 +48,7 @@ Misc:
  - VFS: Fix some minor VFile issues with FILEs
  - Core: Add generic checksum function
  - Feature: Support ImageMagick 7
+ - All: Move time.h include to common.h
 
 0.5.2: (2016-12-31)
 Bugfixes:
diff --git a/include/mgba-util/common.h b/include/mgba-util/common.h
index bfe4f3a92..c7174f82e 100644
--- a/include/mgba-util/common.h
+++ b/include/mgba-util/common.h
@@ -36,6 +36,7 @@ CXX_GUARD_START
 #ifdef _MSC_VER
 #include <Windows.h>
 #include <sys/types.h>
+#include <time.h>
 typedef intptr_t ssize_t;
 #define PATH_MAX MAX_PATH
 #define restrict __restrict
@@ -50,6 +51,7 @@ typedef intptr_t ssize_t;
 #else
 #include <strings.h>
 #include <unistd.h>
+#include <sys/time.h>
 #endif
 
 #ifndef SSIZE_MAX
diff --git a/include/mgba/internal/gb/memory.h b/include/mgba/internal/gb/memory.h
index 45a3f0aed..8e3d118e6 100644
--- a/include/mgba/internal/gb/memory.h
+++ b/include/mgba/internal/gb/memory.h
@@ -14,8 +14,6 @@ CXX_GUARD_START
 #include <mgba/core/timing.h>
 #include <mgba/gb/interface.h>
 
-#include <time.h>
-
 mLOG_DECLARE_CATEGORY(GB_MBC);
 mLOG_DECLARE_CATEGORY(GB_MEM);
 
diff --git a/include/mgba/internal/gba/hardware.h b/include/mgba/internal/gba/hardware.h
index 8aa98ba47..540a9fdf4 100644
--- a/include/mgba/internal/gba/hardware.h
+++ b/include/mgba/internal/gba/hardware.h
@@ -14,8 +14,6 @@ CXX_GUARD_START
 #include <mgba/core/timing.h>
 #include <mgba/gba/interface.h>
 
-#include <time.h>
-
 mLOG_DECLARE_CATEGORY(GBA_HW);
 
 #define IS_GPIO_REGISTER(reg) ((reg) == GPIO_REG_DATA || (reg) == GPIO_REG_DIRECTION || (reg) == GPIO_REG_CONTROL)
diff --git a/src/core/interface.c b/src/core/interface.c
index 66b372800..5317da562 100644
--- a/src/core/interface.c
+++ b/src/core/interface.c
@@ -6,7 +6,6 @@
 #include <mgba/core/interface.h>
 
 #include <mgba/core/core.h>
-#include <time.h>
 
 static time_t _rtcGenericCallback(struct mRTCSource* source) {
 	struct mRTCGenericSource* rtc = (struct mRTCGenericSource*) source;
diff --git a/src/gb/serialize.c b/src/gb/serialize.c
index 61b4b5a09..ebea64a31 100644
--- a/src/gb/serialize.c
+++ b/src/gb/serialize.c
@@ -11,12 +11,6 @@
 
 mLOG_DEFINE_CATEGORY(GB_STATE, "GB Savestate");
 
-#ifdef _MSC_VER
-#include <time.h>
-#else
-#include <sys/time.h>
-#endif
-
 const uint32_t GB_SAVESTATE_MAGIC = 0x00400000;
 const uint32_t GB_SAVESTATE_VERSION = 0x00000001;
 
diff --git a/src/gba/serialize.c b/src/gba/serialize.c
index 77f7bc968..18692c0d3 100644
--- a/src/gba/serialize.c
+++ b/src/gba/serialize.c
@@ -13,11 +13,6 @@
 #include <mgba-util/vfs.h>
 
 #include <fcntl.h>
-#ifdef _MSC_VER
-#include <time.h>
-#else
-#include <sys/time.h>
-#endif
 
 const uint32_t GBA_SAVESTATE_MAGIC = 0x01000000;
 const uint32_t GBA_SAVESTATE_VERSION = 0x00000002;
diff --git a/src/util/formatting.c b/src/util/formatting.c
index ccd874622..1305edfc9 100644
--- a/src/util/formatting.c
+++ b/src/util/formatting.c
@@ -6,7 +6,6 @@
 #include <mgba-util/formatting.h>
 
 #include <float.h>
-#include <time.h>
 
 int ftostr_l(char* restrict str, size_t size, float f, locale_t locale) {
 #ifdef HAVE_SNPRINTF_L