diff --git a/include/athena/Types.hpp b/include/athena/Types.hpp
index a7b6cac..6bd4f1d 100644
--- a/include/athena/Types.hpp
+++ b/include/athena/Types.hpp
@@ -1,46 +1,34 @@
 #pragma once
-#include <cstdint>
-#include <cinttypes>
 
-using atInt8 = int8_t;
-using atUint8 = uint8_t;
-using atInt16 = int16_t;
-using atUint16 = uint16_t;
-using atInt32 = int32_t;
-using atUint32 = uint32_t;
-using atInt64 = int64_t;
-using atUint64 = uint64_t;
+#include <cinttypes>
+#include <cstdint>
+
+using atInt8 = std::int8_t;
+using atUint8 = std::uint8_t;
+using atInt16 = std::int16_t;
+using atUint16 = std::uint16_t;
+using atInt32 = std::int32_t;
+using atUint32 = std::uint32_t;
+using atInt64 = std::int64_t;
+using atUint64 = std::uint64_t;
 
 // Vector types
 #include "simd/simd.hpp"
-typedef struct {
+struct atVec2f {
   athena::simd<float> simd;
-} atVec2f;
-typedef struct {
+};
+struct atVec3f {
   athena::simd<float> simd;
-} atVec3f;
-typedef struct {
+};
+struct atVec4f {
   athena::simd<float> simd;
-} atVec4f;
-typedef struct {
+};
+struct atVec2d {
   athena::simd<double> simd;
-} atVec2d;
-typedef struct {
+};
+struct atVec3d {
   athena::simd<double> simd;
-} atVec3d;
-typedef struct {
+};
+struct atVec4d {
   athena::simd<double> simd;
-} atVec4d;
-
-#ifndef UNUSED
-#define UNUSED(x) ((void)x)
-#endif // UNUSED
-
-#ifdef __GNUC__
-#define DEPRECATED(func) func __attribute__((deprecated))
-#elif defined(_MSC_VER)
-#define DEPRECATED(func) __declspec(deprecated) func
-#else
-#pragma message("WARNING: You need to implement DEPRECATED for this compiler")
-#define DEPRECATED(func) func
-#endif
+};