Merge pull request #1855 from MerryMage/memory-headers-20160526

Memory: Added necessary headers and removed unnecessary header

src/core/hle/kernel/vm_manager.cpp

@@ -7,6 +7,7 @@
 #include "common/assert.h"
 
 #include "core/hle/kernel/vm_manager.h"
+#include "core/memory.h"
 #include "core/memory_setup.h"
 #include "core/mmio.h"
 

src/core/memory_setup.h

@@ -6,7 +6,7 @@
 
 #include "common/common_types.h"
 
-#include "core/memory.h"
+#include "core/mmio.h"
 
 namespace Memory {