diff --git a/src/core/core.cpp b/src/core/core.cpp
index 515f6023..426b5b76 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -11,7 +11,7 @@
 namespace nostalgia {
 namespace core {
 
-Error init() {
+ox::std::Error init() {
    auto err = initGfx();
 	return err;
 }
diff --git a/src/core/core.hpp b/src/core/core.hpp
index 18fd4fdf..dff50a2f 100644
--- a/src/core/core.hpp
+++ b/src/core/core.hpp
@@ -11,7 +11,7 @@
 namespace nostalgia {
 namespace core {
 
-Error init();
+ox::std::Error init();
 
 }
 }
diff --git a/src/core/gba/gfx.cpp b/src/core/gba/gfx.cpp
index 40d5bb87..dde0d58a 100644
--- a/src/core/gba/gfx.cpp
+++ b/src/core/gba/gfx.cpp
@@ -6,13 +6,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <ox/std/types.hpp>
 #include "registers.hpp"
-#include "../types.hpp"
 
 namespace nostalgia {
 namespace core {
 
-Error initGfx() {
+ox::std::Error initGfx() {
 	/* Sprite Mode ----\ */
 	/*             ---\| */
 	/* Background 2 -\|| */
diff --git a/src/core/gfx.hpp b/src/core/gfx.hpp
index 50e6a6b1..5f733579 100644
--- a/src/core/gfx.hpp
+++ b/src/core/gfx.hpp
@@ -6,12 +6,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "types.hpp"
+#include <ox/std/types.hpp>
 
 namespace nostalgia {
 namespace core {
 
-Error initGfx();
+ox::std::Error initGfx();
 
 }
 }
diff --git a/src/core/types.hpp b/src/core/types.hpp
deleted file mode 100644
index 9fe56d22..00000000
--- a/src/core/types.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2016 gtalent2@gmail.com
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-#ifndef NOSTALGIA_CORE_TYPES_HPP
-#define NOSTALGIA_CORE_TYPES_HPP
-
-namespace nostalgia {
-namespace core {
-
-typedef char               int8_t;
-typedef unsigned char      uint8_t;
-typedef short              int16_t;
-typedef unsigned short     uint16_t;
-typedef int                int32_t;
-typedef unsigned int       uint32_t;
-typedef unsigned           uint_t;
-typedef long long          int64_t;
-typedef unsigned long long uint64_t;
-
-typedef uint32_t Error;
-
-#ifdef _LP64
-typedef uint64_t size_t;
-#elif _LP32
-typedef uint32_t size_t;
-#endif
-
-}
-}
-
-#endif