diff --git a/src/CalcManager/CEngine/Rational.cpp b/src/CalcManager/CEngine/Rational.cpp
index fd86b72a..3e009b88 100644
--- a/src/CalcManager/CEngine/Rational.cpp
+++ b/src/CalcManager/CEngine/Rational.cpp
@@ -51,8 +51,8 @@ namespace CalcEngine
 
     Rational::Rational(uint64_t ui)
     {
-        uint32_t hi = HIDWORD(ui);
-        uint32_t lo = LODWORD(ui);
+        uint32_t hi = (uint32_t) (((ui) >> 32) & 0xffffffff);
+        uint32_t lo = (uint32_t) ui;
 
         Rational temp = (Rational{ hi } << 32) | lo;
 
diff --git a/src/CalcManager/CalcManager.vcxproj b/src/CalcManager/CalcManager.vcxproj
index f2d46f36..2054536e 100644
--- a/src/CalcManager/CalcManager.vcxproj
+++ b/src/CalcManager/CalcManager.vcxproj
@@ -305,7 +305,6 @@
     <ClInclude Include="UnitConverter.h" />
     <ClInclude Include="preprocessor_cross_platform.h" />
     <ClInclude Include="sal_cross_platform.h" />
-    <ClInclude Include="win_data_types_cross_platform.h" />
     <ClInclude Include="winerror_cross_platform.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/CalcManager/CalcManager.vcxproj.filters b/src/CalcManager/CalcManager.vcxproj.filters
index b96ee3d4..19024f40 100644
--- a/src/CalcManager/CalcManager.vcxproj.filters
+++ b/src/CalcManager/CalcManager.vcxproj.filters
@@ -162,7 +162,6 @@
     </ClInclude>
     <ClInclude Include="preprocessor_cross_platform.h" />
     <ClInclude Include="sal_cross_platform.h" />
-    <ClInclude Include="win_data_types_cross_platform.h" />
     <ClInclude Include="winerror_cross_platform.h" />
   </ItemGroup>
 </Project>
diff --git a/src/CalcManager/Header Files/CalcEngine.h b/src/CalcManager/Header Files/CalcEngine.h
index 8f592c1d..6fb994d7 100644
--- a/src/CalcManager/Header Files/CalcEngine.h	
+++ b/src/CalcManager/Header Files/CalcEngine.h	
@@ -14,7 +14,6 @@
 *
 \****************************************************************************/
 
-#include "win_data_types_cross_platform.h"
 #include "sal_cross_platform.h"
 
 #include "CCommand.h"
diff --git a/src/CalcManager/Ratpack/ratpak.h b/src/CalcManager/Ratpack/ratpak.h
index bd959a9c..b4783839 100644
--- a/src/CalcManager/Ratpack/ratpak.h
+++ b/src/CalcManager/Ratpack/ratpak.h
@@ -17,7 +17,6 @@
 //
 //-----------------------------------------------------------------------------
 
-#include "win_data_types_cross_platform.h"
 #include "sal_cross_platform.h"
 
 #include <cstdint>
diff --git a/src/CalcManager/pch.h b/src/CalcManager/pch.h
index 8c836af7..a7643eed 100644
--- a/src/CalcManager/pch.h
+++ b/src/CalcManager/pch.h
@@ -26,7 +26,6 @@
 #include <string_view>
 #include <future>
 
-#include "win_data_types_cross_platform.h"
 #include "winerror_cross_platform.h"
 #include "sal_cross_platform.h"
 #include "preprocessor_cross_platform.h"
diff --git a/src/CalcManager/win_data_types_cross_platform.h b/src/CalcManager/win_data_types_cross_platform.h
deleted file mode 100644
index e474dda4..00000000
--- a/src/CalcManager/win_data_types_cross_platform.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-#ifndef LODWORD
-#define LODWORD(qw) ((uint32_t)(qw))
-#endif
-
-#ifndef HIDWORD
-#define HIDWORD(qw) ((uint32_t)(((qw) >> 32) & 0xffffffff))
-#endif