10 files changed, 10 insertions, 21 deletions
diff --git a/src/inc/corhost.h b/src/inc/corhost.h
index 483580d47f..4a3a65a35f 100644
--- a/src/inc/corhost.h
+++ b/src/inc/corhost.h
@@ -45,12 +45,6 @@ class DangerousNonHostedSpinLock;
 
 #define INVALID_STACK_BASE_MARKER_FOR_CHECK_STATE 2
 
-#ifndef _WIN64
-#if (_WIN32_WINNT < 0x0500)
-typedef VOID (__stdcall *WAITORTIMERCALLBACK)(PVOID, BOOL);
-#endif
-#endif
-
 class AppDomain;
 class Assembly;
 
diff --git a/src/jit/lower.cpp b/src/jit/lower.cpp
index f7eadbaf4c..976d347516 100644
--- a/src/jit/lower.cpp
+++ b/src/jit/lower.cpp
@@ -146,9 +146,10 @@ genTreeOps getHiOper(genTreeOps oper)
     case GT_OR:  return GT_OR;      break;
     case GT_AND: return GT_AND;     break;
     case GT_XOR: return GT_XOR;     break;
+    default:
+        assert(!"getHiOper called for invalid oper");
+        return GT_NONE;
     }
-    assert(!"getHiOper called for invalid oper");
-    return GT_NONE;
 }
 #endif // !defined(_TARGET_64BIT_)
 
diff --git a/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp b/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp
index 667f62ecfd..b78cfa8dbe 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp
+++ b/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp
@@ -18,7 +18,7 @@ extern "C" int InitializeDllTest2();
 extern "C" int DllTest1();
 extern "C" int DllTest2();
 
-int __cdecl main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 #ifndef __FreeBSD__
     if (0 != InitializeDllTest1())
diff --git a/src/strongname/api/common.h b/src/strongname/api/common.h
index 4b5c4979b4..c83685cc0c 100644
--- a/src/strongname/api/common.h
+++ b/src/strongname/api/common.h
@@ -380,12 +380,6 @@ extern DummyGlobalContract ___contract;
 
 #endif // defined(_DEBUG)
 
-// For down level platform compiles.
-#if !defined(_WIN64) && (_WIN32_WINNT < 0x0500) 
-typedef VOID (__stdcall *WAITORTIMERCALLBACK)(PVOID, BOOL);
-#endif
-
-
 
 // All files get to see all of these .inl files to make sure all files
 // get the benefit of inlining.
diff --git a/tests/src/JIT/jit64/mcc/interop/native_i1c.cpp b/tests/src/JIT/jit64/mcc/interop/native_i1c.cpp
index 8d25fd58a6..b20408db22 100644
--- a/tests/src/JIT/jit64/mcc/interop/native_i1c.cpp
+++ b/tests/src/JIT/jit64/mcc/interop/native_i1c.cpp
@@ -9,7 +9,7 @@
 #pragma clang diagnostic ignored "-Wvarargs"
 #endif
 
-MCC_API VType1 __cdecl sum(float first, ...) {
+MCC_API VType1 sum(float first, ...) {
     VType1 result;
 
     int count = 0;
diff --git a/tests/src/JIT/jit64/mcc/interop/native_i3c.cpp b/tests/src/JIT/jit64/mcc/interop/native_i3c.cpp
index 9575777a83..5bcb85b3df 100644
--- a/tests/src/JIT/jit64/mcc/interop/native_i3c.cpp
+++ b/tests/src/JIT/jit64/mcc/interop/native_i3c.cpp
@@ -5,7 +5,7 @@
 #include "native.h"
 
 
-MCC_API VType3 __cdecl sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
+MCC_API VType3 sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
     int count = (int)count1 + (int)count2 + (int)count3 + (int)count4 + (int)count5 + (int)count6;
     VType3 res;
     va_list args;
diff --git a/tests/src/JIT/jit64/mcc/interop/native_i5c.cpp b/tests/src/JIT/jit64/mcc/interop/native_i5c.cpp
index 0513d8ce33..c5e35e6d62 100644
--- a/tests/src/JIT/jit64/mcc/interop/native_i5c.cpp
+++ b/tests/src/JIT/jit64/mcc/interop/native_i5c.cpp
@@ -5,7 +5,7 @@
 #include "native.h"
 
 
-MCC_API VType5 __cdecl sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
+MCC_API VType5 sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
     int count = (int)count1 + (int)count2 + (int)count3 + (int)count4 + (int)count5 + (int)count6;
     VType5 res;
     va_list args;
diff --git a/tests/src/JIT/jit64/mcc/interop/native_i6c.cpp b/tests/src/JIT/jit64/mcc/interop/native_i6c.cpp
index 2840ec8790..e570f7c2cd 100644
--- a/tests/src/JIT/jit64/mcc/interop/native_i6c.cpp
+++ b/tests/src/JIT/jit64/mcc/interop/native_i6c.cpp
@@ -5,7 +5,7 @@
 #include "native.h"
 
 
-MCC_API VType6 __cdecl sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
+MCC_API VType6 sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
     int count = (int)count1 + (int)count2 + (int)count3 + (int)count4 + (int)count5 + (int)count6;
     VType6 res;
     va_list args;
diff --git a/tests/src/JIT/jit64/mcc/interop/native_i7c.cpp b/tests/src/JIT/jit64/mcc/interop/native_i7c.cpp
index b45457e932..4d47e14216 100644
--- a/tests/src/JIT/jit64/mcc/interop/native_i7c.cpp
+++ b/tests/src/JIT/jit64/mcc/interop/native_i7c.cpp
@@ -5,7 +5,7 @@
 #include "native.h"
 
 
-MCC_API VType7 __cdecl sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
+MCC_API VType7 sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
     int count = (int)count1 + (int)count2 + (int)count3 + (int)count4 + (int)count5 + (int)count6;
     VType7 res;
     va_list args;
diff --git a/tests/src/JIT/jit64/mcc/interop/native_i8c.cpp b/tests/src/JIT/jit64/mcc/interop/native_i8c.cpp
index dd024dfc4c..20461a7a44 100644
--- a/tests/src/JIT/jit64/mcc/interop/native_i8c.cpp
+++ b/tests/src/JIT/jit64/mcc/interop/native_i8c.cpp
@@ -5,7 +5,7 @@
 #include "native.h"
 
 
-MCC_API VType8 __cdecl sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
+MCC_API VType8 sum(double count1, int count2, __int64 count3, float count4, short count5, double count6, ...) {
     int count = (int)count1 + (int)count2 + (int)count3 + (int)count4 + (int)count5 + (int)count6;
     VType8 res;
     va_list args;