diff --git a/src/types.h b/src/types.h
index e8bec90a..a741ffc4 100644
--- a/src/types.h
+++ b/src/types.h
@@ -72,6 +72,7 @@ typedef uint32_t uint32;
 
 #ifdef __GNUC__
  typedef unsigned long long uint64;
+ typedef uint64 u64;
  typedef long long int64;
  #define INLINE inline
  #define GINLINE inline
@@ -127,10 +128,10 @@ typedef uint32_t uint32;
 typedef void (*writefunc)(uint32 A, uint8 V);
 typedef uint8 (*readfunc)(uint32 A);
 
-#include "utils/endian.h"
-
 #ifndef CTASSERT
 #define CTASSERT(x)  typedef char __assert ## y[(x) ? 1 : -1];
 #endif
 
+#include "utils/endian.h"
+
 #endif
diff --git a/src/utils/endian.cpp b/src/utils/endian.cpp
index 88ab2078..8294a7dc 100644
--- a/src/utils/endian.cpp
+++ b/src/utils/endian.cpp
@@ -26,7 +26,7 @@
 #include <fstream>
 #include "../types.h"
 #include "endian.h"
-#include "emufile.h"
+#include "../emufile.h"
 
 //OMG ! configure this correctly
 #define LOCAL_LE