diff --git a/HomebrewDMRIPSC.h b/HomebrewDMRIPSC.h
index 85aa0e1..032d3a6 100644
--- a/HomebrewDMRIPSC.h
+++ b/HomebrewDMRIPSC.h
@@ -25,14 +25,7 @@
 #include "DMRData.h"
 
 #include <string>
-
-#if defined(_WIN32) || defined(_WIN64)
-typedef unsigned int   uint32_t;
-typedef unsigned short uint16_t;
-typedef unsigned char  uint8_t;
-#else
 #include <cstdint>
-#endif
 
 class CHomebrewDMRIPSC
 {
diff --git a/Modem.cpp b/Modem.cpp
index fb3f1f9..c2cfe05 100644
--- a/Modem.cpp
+++ b/Modem.cpp
@@ -26,12 +26,11 @@
 
 #include <cmath>
 #include <cassert>
+#include <cstdint>
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <Windows.h>
-typedef unsigned int uint32_t;
 #else
-#include <cstdint>
 #include <unistd.h>
 #endif
 
diff --git a/SHA256.h b/SHA256.h
index 8dd739b..7c48f19 100644
--- a/SHA256.h
+++ b/SHA256.h
@@ -20,11 +20,7 @@
 #ifndef SHA256_H
 #define SHA256_H
 
-#if defined(_WIN32) || defined(_WIN64)
-typedef unsigned int uint32_t;
-#else
 #include <cstdint>
-#endif
 
 enum {
 	SHA256_DIGEST_SIZE = 256 / 8