diff --git a/src/CalcManager/winerror_cross_platform.h b/src/CalcManager/winerror_cross_platform.h
index 4c6730c0..1e9ede40 100644
--- a/src/CalcManager/winerror_cross_platform.h
+++ b/src/CalcManager/winerror_cross_platform.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#include <cstdint>
-
-typedef int32_t HRESULT;
+#include "CalcErr.h"
 
 #define E_ACCESSDENIED 0x80070005
 #define E_FAIL 0x80004005
@@ -14,6 +12,6 @@ typedef int32_t HRESULT;
 #define S_OK 0x0
 #define S_FALSE 0x1
 
-#define SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
-#define FAILED(hr) (((HRESULT)(hr)) < 0)
+#define SUCCEEDED(hr) (((ResultCode)(hr)) >= 0)
+#define FAILED(hr) (((ResultCode)(hr)) < 0)
 #define SCODE_CODE(sc) ((sc) & 0xFFFF)