diff --git a/src/cheevos/Cheevos.cpp b/src/cheevos/Cheevos.cpp
index ea2752c..51cef36 100644
--- a/src/cheevos/Cheevos.cpp
+++ b/src/cheevos/Cheevos.cpp
@@ -11,9 +11,9 @@
 
 #include "libretro/LibretroEnvironment.h"
 #include "libretro/MemoryMap.h"
-#include "rcheevos/rconsoles.h"
-#include "rcheevos/rhash.h"
-#include "rcheevos/rurl.h"
+#include "rcheevos/rc_consoles.h"
+#include "rcheevos/rc_hash.h"
+#include "rcheevos/rc_url.h"
 
 using namespace LIBRETRO;
 
diff --git a/src/cheevos/CheevosEnvironment.cpp b/src/cheevos/CheevosEnvironment.cpp
index d23a642..d3e4546 100644
--- a/src/cheevos/CheevosEnvironment.cpp
+++ b/src/cheevos/CheevosEnvironment.cpp
@@ -8,7 +8,7 @@
 #include "CheevosEnvironment.h"
 #include "CheevosFrontendBridge.h"
 
-#include <rcheevos/rhash.h>
+#include <rcheevos/rc_hash.h>
 
 using namespace LIBRETRO;
 
diff --git a/src/cheevos/CheevosFrontendBridge.cpp b/src/cheevos/CheevosFrontendBridge.cpp
index cb52d4a..53a3649 100644
--- a/src/cheevos/CheevosFrontendBridge.cpp
+++ b/src/cheevos/CheevosFrontendBridge.cpp
@@ -40,7 +40,7 @@ void CCheevosFrontendBridge::CloseFile(void* file_handle)
   delete fileHandle;
 }
 
-size_t CCheevosFrontendBridge::GetPosition(void* file_handle)
+int64_t CCheevosFrontendBridge::GetPosition(void* file_handle)
 {
   // Return 0 for error
   if (file_handle == nullptr)
@@ -57,7 +57,7 @@ size_t CCheevosFrontendBridge::GetPosition(void* file_handle)
   return static_cast<size_t>(currentPosition);
 }
 
-void CCheevosFrontendBridge::Seek(void* file_handle, size_t offset, int origin)
+void CCheevosFrontendBridge::Seek(void* file_handle, int64_t offset, int origin)
 {
   if (file_handle == nullptr)
     return;
diff --git a/src/cheevos/CheevosFrontendBridge.h b/src/cheevos/CheevosFrontendBridge.h
index a176bd3..f74bfa7 100644
--- a/src/cheevos/CheevosFrontendBridge.h
+++ b/src/cheevos/CheevosFrontendBridge.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <memory>
-#include <rcheevos/rhash.h>
+#include <rcheevos/rc_hash.h>
 #include <string>
 
 namespace kodi
@@ -33,8 +33,8 @@ namespace LIBRETRO
     // Forward to Kodi VFS API
     static void *OpenFile(const char* path_utf8);
     static void CloseFile(void* file_handle);
-    static size_t GetPosition(void* file_handle);
-    static void Seek(void* file_handle, size_t offset, int origin);
+    static int64_t GetPosition(void* file_handle);
+    static void Seek(void* file_handle, int64_t offset, int origin);
     static size_t ReadFile(void* file_handle, void* buffer, size_t requested_bytes);
 
   private:
