Rename conflicting definitions VER_MAJOR/MINORVERSION macros (#17364)

* Rename conflicting definitions of VER_MAJOR/MINORVERSION

These macros are defined by Windows SDK. They were overload to mean CLR version
that was causing interesting redefinition issues.

* Delete workaround for redefined Windows SDK macros

* Delete ProjectN version

* Delete dead code

17 files changed, 57 insertions, 165 deletions

diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp
index 4356a8f7f4..b869a0184f 100644
--- a/src/debug/di/process.cpp
+++ b/src/debug/di/process.cpp
@@ -8889,10 +8889,10 @@ CordbProcess::GetVersion(COR_VERSION* pVersion)
     //
     // Because we require a matching version of mscordbi.dll to debug a certain version of the runtime,
     // we can just use constants found in this particular mscordbi.dll to determine the version of the left side.
-    pVersion->dwMajor = VER_MAJORVERSION;
-    pVersion->dwMinor = VER_MINORVERSION;
-    pVersion->dwBuild = VER_PRODUCTBUILD;
-    pVersion->dwSubBuild = VER_PRODUCTBUILD_QFE;
+    pVersion->dwMajor = CLR_MAJOR_VERSION;
+    pVersion->dwMinor = CLR_MINOR_VERSION;
+    pVersion->dwBuild = CLR_BUILD_VERSION;
+    pVersion->dwSubBuild = CLR_BUILD_VERSION_QFE;
 
     return S_OK;
 }
diff --git a/src/debug/ee/rcthread.cpp b/src/debug/ee/rcthread.cpp
index f40fe16544..f74093b17f 100644
--- a/src/debug/ee/rcthread.cpp
+++ b/src/debug/ee/rcthread.cpp
@@ -286,8 +286,8 @@ HRESULT DebuggerIPCControlBlock::Init(
     memset( this, 0, sizeof( DebuggerIPCControlBlock) );
 
     // Setup version checking info.
-    m_verMajor = VER_PRODUCTBUILD;
-    m_verMinor = VER_PRODUCTBUILD_QFE;
+    m_verMajor = CLR_BUILD_VERSION;
+    m_verMinor = CLR_BUILD_VERSION_QFE;
 
 #ifdef _DEBUG
     m_checkedBuild = true;
diff --git a/src/dlls/mscoree/mscoree.cpp b/src/dlls/mscoree/mscoree.cpp
index 36b22f2a57..762926e641 100644
--- a/src/dlls/mscoree/mscoree.cpp
+++ b/src/dlls/mscoree/mscoree.cpp
@@ -601,7 +601,7 @@ __out_ecount_z_opt(cchBuffer) LPWSTR pBuffer,
         *pBuffer = W('\0');
     }
 
-#define VERSION_NUMBER_NOSHIM W("v") QUOTE_MACRO_L(VER_MAJORVERSION.VER_MINORVERSION.VER_PRODUCTBUILD)
+#define VERSION_NUMBER_NOSHIM W("v") QUOTE_MACRO_L(CLR_MAJOR_VERSION.CLR_MINOR_VERSION.CLR_BUILD_VERSION)
 
     DWORD length = (DWORD)(wcslen(VERSION_NUMBER_NOSHIM) + 1);
     if (length > cchBuffer)
diff --git a/src/inc/MSCOREE.IDL b/src/inc/MSCOREE.IDL
index 15be516e17..e23e847153 100644
--- a/src/inc/MSCOREE.IDL
+++ b/src/inc/MSCOREE.IDL
@@ -28,15 +28,6 @@ import "gchost.idl";
 cpp_quote("struct IActivationFactory;")
 interface IActivationFactory;
 
-const char* CLR_MAJOR_VERSION = VER_MAJORVERSION;
-const char* CLR_MINOR_VERSION = VER_MINORVERSION;
-const char* CLR_BUILD_VERSION = VER_PRODUCTBUILD;
-
-const char* CLR_ASSEMBLY_MAJOR_VERSION = VER_ASSEMBLYMAJORVERSION;
-const char* CLR_ASSEMBLY_MINOR_VERSION = VER_ASSEMBLYMINORVERSION;
-const char* CLR_ASSEMBLY_BUILD_VERSION = VER_ASSEMBLYBUILD;
-
-
 // CLSID TypeNameFactory : uuid{B81FF171-20F3-11d2-8DCC-00A0C9B00525}
 cpp_quote("EXTERN_GUID(CLSID_TypeNameFactory, 0xB81FF171, 0x20F3, 0x11d2, 0x8d, 0xcc, 0x00, 0xa0, 0xc9, 0xb0, 0x05, 0x25);")
 
diff --git a/src/inc/winwrap.h b/src/inc/winwrap.h
index 8138c92335..acd70d52d4 100644
--- a/src/inc/winwrap.h
+++ b/src/inc/winwrap.h
@@ -462,21 +462,6 @@ __forceinline LONGLONG __InterlockedExchangeAdd64(LONGLONG volatile * Addend, LO
 
 #endif // _X86_
 
-//
-// RtlVerifyVersionInfo() type mask bits
-// Making our copy of type mask bits as the original
-// macro name are redefined in public\internal\NDP\inc\product_version.h
-//
-//
-#define CLR_VER_MINORVERSION                0x0000001
-#define CLR_VER_MAJORVERSION                0x0000002
-#define CLR_VER_BUILDNUMBER                 0x0000004
-#define CLR_VER_PLATFORMID                  0x0000008
-#define CLR_VER_SERVICEPACKMINOR            0x0000010
-#define CLR_VER_SERVICEPACKMAJOR            0x0000020
-#define CLR_VER_SUITENAME                   0x0000040
-#define CLR_VER_PRODUCT_TYPE                0x0000080
-
 // Output printf-style formatted text to the debugger if it's present or stdout otherwise.
 inline void DbgWPrintf(const LPCWSTR wszFormat, ...)
 {
diff --git a/src/inc/zapper.h b/src/inc/zapper.h
index 48e9b22c5a..8160b52f2a 100644
--- a/src/inc/zapper.h
+++ b/src/inc/zapper.h
@@ -321,7 +321,6 @@ class Zapper
     void Print(CorZapLogLevel level, LPCWSTR format, va_list args);
     void PrintErrorMessage(CorZapLogLevel level, Exception *ex);
     void PrintErrorMessage(CorZapLogLevel level, HRESULT hr);
-    void ReportEventNGEN(WORD wType, DWORD dwEventID, LPCWSTR format, ...);
 
     BOOL            CheckAssemblyUpToDate(CORINFO_ASSEMBLY_HANDLE hAssembly, CORCOMPILE_NGEN_SIGNATURE * pNativeImageSig);
     BOOL            TryToInstallFromRepository(CORINFO_ASSEMBLY_HANDLE hAssembly, CORCOMPILE_NGEN_SIGNATURE * pNativeImageSig);
diff --git a/src/pal/prebuilt/inc/buildnumber.h b/src/pal/prebuilt/inc/buildnumber.h
index 19ae9e0b0f..5aee76ab5e 100644
--- a/src/pal/prebuilt/inc/buildnumber.h
+++ b/src/pal/prebuilt/inc/buildnumber.h
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#define ProjectNMajorVersion   1
-#define ProjectNMinorVersion   0
-#define ProjectNMajorVersion_A "1"
-#define ProjectNMinorVersion_A "0"
 #define BuildNumberMajor       30319
 #define BuildNumberMinor       0
 #define BuildNumberMajor_A     "30319"
@@ -25,5 +21,3 @@
 #define NDPFileVersionMinor_A     "5"
 #define NDPFileVersionBuild_A     "30319"
 #define NDPFileVersionRevision_A     "00"
-#define PROJECTN_VER_FILEVERSION_STR   ProjectNMajorVersion_A "." NDPFileVersionMinor_A "." NDPFileVersionBuild_A "." NDPFileVersionRevision_A 
-#define PROJECTN_VER_LEGALCOPYRIGHT_LOGO_STR "Copyright (c) Microsoft Corporation.  All rights reserved."
diff --git a/src/pal/prebuilt/inc/mscoree.h b/src/pal/prebuilt/inc/mscoree.h
index b62ab58b63..a03058564e 100644
--- a/src/pal/prebuilt/inc/mscoree.h
+++ b/src/pal/prebuilt/inc/mscoree.h
@@ -234,18 +234,6 @@ extern "C"{
 
 struct IActivationFactory;
 
-#define	CLR_MAJOR_VERSION	( 4 )
-
-#define	CLR_MINOR_VERSION	( 0 )
-
-#define	CLR_BUILD_VERSION	( 23203 )
-
-#define	CLR_ASSEMBLY_MAJOR_VERSION	( 4 )
-
-#define	CLR_ASSEMBLY_MINOR_VERSION	( 0 )
-
-#define	CLR_ASSEMBLY_BUILD_VERSION	( 0 )
-
 EXTERN_GUID(CLSID_TypeNameFactory, 0xB81FF171, 0x20F3, 0x11d2, 0x8d, 0xcc, 0x00, 0xa0, 0xc9, 0xb0, 0x05, 0x25);
 EXTERN_GUID(CLSID_ComCallUnmarshal, 0x3F281000,0xE95A,0x11d2,0x88,0x6B,0x00,0xC0,0x4F,0x86,0x9F,0x04);
 EXTERN_GUID(CLSID_ComCallUnmarshalV4, 0x45fb4600,0xe6e8,0x4928,0xb2,0x5e,0x50,0x47,0x6f,0xf7,0x94,0x25);
diff --git a/src/pal/prebuilt/inc/product_version.h b/src/pal/prebuilt/inc/product_version.h
index 5b4a67076d..a21ee68741 100644
--- a/src/pal/prebuilt/inc/product_version.h
+++ b/src/pal/prebuilt/inc/product_version.h
@@ -14,20 +14,20 @@
 #include <asm_version.h>
 #endif
 
-#ifdef VER_MAJORVERSION
-#undef VER_MAJORVERSION
+#ifdef CLR_MAJOR_VERSION
+#undef CLR_MAJOR_VERSION
 #endif
 
-#ifdef VER_MINORVERSION
-#undef VER_MINORVERSION
+#ifdef CLR_MINOR_VERSION
+#undef CLR_MINOR_VERSION
 #endif
 
-#ifdef VER_PRODUCTBUILD
-#undef VER_PRODUCTBUILD
+#ifdef CLR_BUILD_VERSION
+#undef CLR_BUILD_VERSION
 #endif
 
-#ifdef VER_PRODUCTBUILD_QFE
-#undef VER_PRODUCTBUILD_QFE
+#ifdef CLR_BUILD_VERSION_QFE
+#undef CLR_BUILD_VERSION_QFE
 #endif
 
 #ifdef VER_FILEVERSIONMINOR
@@ -42,10 +42,10 @@
 #undef VER_FILEVERSIONREVISION
 #endif
 
-#define VER_MAJORVERSION        rmj
-#define VER_MINORVERSION        rmm
-#define VER_PRODUCTBUILD        rup
-#define VER_PRODUCTBUILD_QFE    rpt
+#define CLR_MAJOR_VERSION        rmj
+#define CLR_MINOR_VERSION        rmm
+#define CLR_BUILD_VERSION        rup
+#define CLR_BUILD_VERSION_QFE    rpt
 
 #define VER_FILEVERSIONMINOR        fvn
 #define VER_FILEVERSIONBUILD        fvb
@@ -67,21 +67,21 @@
 #define CONCAT_MACRO_HELPER(x, y)   x ## y
 #define CONCAT_MACRO(x, y)          CONCAT_MACRO_HELPER(x, y)
 
-#define VER_PRODUCTVERSION             VER_MAJORVERSION,VER_MINORVERSION,VER_PRODUCTBUILD,VER_PRODUCTBUILD_QFE
-#define VER_DOTFILEVERSION             VER_MAJORVERSION,VER_FILEVERSIONMINOR,VER_FILEVERSIONBUILD,VER_FILEVERSIONREVISION
-#define VER_MANAGED_DOTFILEVERSION     VER_MAJORVERSION.VER_FILEVERSIONMINOR.VER_FILEVERSIONBUILD.VER_FILEVERSIONREVISION
+#define VER_PRODUCTVERSION             CLR_MAJOR_VERSION,CLR_MINOR_VERSION,CLR_BUILD_VERSION,CLR_BUILD_VERSION_QFE
+#define VER_DOTFILEVERSION             CLR_MAJOR_VERSION,VER_FILEVERSIONMINOR,VER_FILEVERSIONBUILD,VER_FILEVERSIONREVISION
+#define VER_MANAGED_DOTFILEVERSION     CLR_MAJOR_VERSION.VER_FILEVERSIONMINOR.VER_FILEVERSIONBUILD.VER_FILEVERSIONREVISION
 
-#define VER_DOTPRODUCTVERSION          VER_MAJORVERSION.VER_MINORVERSION.VER_PRODUCTBUILD.VER_PRODUCTBUILD_QFE
-#define VER_DOTPRODUCTMAJORMINOR       VER_MAJORVERSION.VER_MINORVERSION
-#define VER_DOTPRODUCTVERSIONNOQFE     VER_MAJORVERSION.VER_MINORVERSION.VER_PRODUCTBUILD
-#define VER_DOTPRODUCTVERSIONZEROQFE     VER_MAJORVERSION.VER_MINORVERSION.VER_PRODUCTBUILD.0
+#define VER_DOTPRODUCTVERSION          CLR_MAJOR_VERSION.CLR_MINOR_VERSION.CLR_BUILD_VERSION.CLR_BUILD_VERSION_QFE
+#define VER_DOTPRODUCTMAJORMINOR       CLR_MAJOR_VERSION.CLR_MINOR_VERSION
+#define VER_DOTPRODUCTVERSIONNOQFE     CLR_MAJOR_VERSION.CLR_MINOR_VERSION.CLR_BUILD_VERSION
+#define VER_DOTPRODUCTVERSIONZEROQFE     CLR_MAJOR_VERSION.CLR_MINOR_VERSION.CLR_BUILD_VERSION.0
 #define VER_DOTASSEMBLYVERSION         VER_ASSEMBLYMAJORVERSION.VER_ASSEMBLYMINORVERSION.VER_ASSEMBLYBUILD.VER_ASSEMBLYBUILD_QFE
 #define VER_DOTASSEMBLYVERSION3PART    VER_ASSEMBLYMAJORVERSION.VER_ASSEMBLYMINORVERSION.VER_ASSEMBLYBUILD
 
-#define VER_UNDERSCORE_PRODUCTVERSION_STR3  CONCAT_MACRO(_, VER_PRODUCTBUILD)
-#define VER_UNDERSCORE_PRODUCTVERSION_STR2  CONCAT_MACRO(VER_MINORVERSION, VER_UNDERSCORE_PRODUCTVERSION_STR3)
+#define VER_UNDERSCORE_PRODUCTVERSION_STR3  CONCAT_MACRO(_, CLR_BUILD_VERSION)
+#define VER_UNDERSCORE_PRODUCTVERSION_STR2  CONCAT_MACRO(CLR_MINOR_VERSION, VER_UNDERSCORE_PRODUCTVERSION_STR3)
 #define VER_UNDERSCORE_PRODUCTVERSION_STR1  CONCAT_MACRO(_, VER_UNDERSCORE_PRODUCTVERSION_STR2)
-#define VER_UNDERSCORE_PRODUCTVERSION       CONCAT_MACRO(VER_MAJORVERSION, VER_UNDERSCORE_PRODUCTVERSION_STR1)
+#define VER_UNDERSCORE_PRODUCTVERSION       CONCAT_MACRO(CLR_MAJOR_VERSION, VER_UNDERSCORE_PRODUCTVERSION_STR1)
 
 #define VER_UNDERSCORE_PRODUCTVERSION_STR   QUOTE_MACRO(VER_UNDERSCORE_PRODUCTVERSION)
 #define VER_UNDERSCORE_PRODUCTVERSION_STR_L QUOTE_MACRO_L(VER_UNDERSCORE_PRODUCTVERSION)
diff --git a/src/utilcode/util_nodependencies.cpp b/src/utilcode/util_nodependencies.cpp
index 387ccbe071..c84aa5b6b8 100644
--- a/src/utilcode/util_nodependencies.cpp
+++ b/src/utilcode/util_nodependencies.cpp
@@ -47,11 +47,11 @@ void InitRunningOnVersionStatus ()
 
 
     dwlConditionMask = 0;
-    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, CLR_VER_PLATFORMID, VER_EQUAL);
-    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, CLR_VER_MAJORVERSION, VER_GREATER_EQUAL);
-    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, CLR_VER_MINORVERSION, VER_GREATER_EQUAL);
+    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, VER_EQUAL);
+    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
+    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION, VER_GREATER_EQUAL);
 
-    if(VerifyVersionInfo(&sVer, CLR_VER_MAJORVERSION | CLR_VER_PLATFORMID | CLR_VER_MINORVERSION, dwlConditionMask))
+    if(VerifyVersionInfo(&sVer, VER_MAJORVERSION | VER_PLATFORMID | VER_MINORVERSION, dwlConditionMask))
     {
         gRunningOnStatus = RUNNING_ON_WIN8;
         fSupportedPlatform = TRUE;
@@ -68,11 +68,11 @@ void InitRunningOnVersionStatus ()
 
 
     dwlConditionMask = 0;
-    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, CLR_VER_PLATFORMID, VER_EQUAL);
-    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, CLR_VER_MAJORVERSION, VER_GREATER_EQUAL);
-    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, CLR_VER_MINORVERSION, VER_GREATER_EQUAL);
+    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, VER_EQUAL);
+    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
+    dwlConditionMask = VER_SET_CONDITION(dwlConditionMask, VER_MINORVERSION, VER_GREATER_EQUAL);
 
-    if(VerifyVersionInfo(&sVer, CLR_VER_MAJORVERSION | CLR_VER_PLATFORMID | CLR_VER_MINORVERSION, dwlConditionMask))
+    if(VerifyVersionInfo(&sVer, VER_MAJORVERSION | VER_PLATFORMID | VER_MINORVERSION, dwlConditionMask))
     {
         gRunningOnStatus = RUNNING_ON_WIN7;
         fSupportedPlatform = TRUE;
@@ -89,9 +89,6 @@ CHECK_SUPPORTED:
         UtilMessageBoxCatastrophicNonLocalized(NON_SUPPORTED_PLATFORM_MSGBOX_TITLE, NON_SUPPORTED_PLATFORM_MSGBOX_TEXT, MB_OK | MB_ICONERROR, TRUE);
         TerminateProcess(GetCurrentProcess(), NON_SUPPORTED_PLATFORM_TERMINATE_ERROR_CODE);
     }
-
-#else // FEATURE_PAL
-    // UNIXTODO: Do we need version checks for Linux?
 #endif // FEATURE_PAL
 } // InitRunningOnVersionStatus
 
diff --git a/src/vm/domainfile.cpp b/src/vm/domainfile.cpp
index 410884531e..c8bbcf7241 100644
--- a/src/vm/domainfile.cpp
+++ b/src/vm/domainfile.cpp
@@ -2292,10 +2292,10 @@ void DomainAssembly::GetCurrentVersionInfo(CORCOMPILE_VERSION_INFO *pNativeVersi
 
     pNativeVersionInfo->wMachine = IMAGE_FILE_MACHINE_NATIVE_NI;
 
-    pNativeVersionInfo->wVersionMajor = VER_MAJORVERSION;
-    pNativeVersionInfo->wVersionMinor = VER_MINORVERSION;
-    pNativeVersionInfo->wVersionBuildNumber = VER_PRODUCTBUILD;
-    pNativeVersionInfo->wVersionPrivateBuildNumber = VER_PRODUCTBUILD_QFE;
+    pNativeVersionInfo->wVersionMajor = CLR_MAJOR_VERSION;
+    pNativeVersionInfo->wVersionMinor = CLR_MINOR_VERSION;
+    pNativeVersionInfo->wVersionBuildNumber = CLR_BUILD_VERSION;
+    pNativeVersionInfo->wVersionPrivateBuildNumber = CLR_BUILD_VERSION_QFE;
 
     GetNGenCpuInfo(&pNativeVersionInfo->cpuInfo);
 
diff --git a/src/vm/eventtrace.cpp b/src/vm/eventtrace.cpp
index 7da80608d7..3de630f12a 100644
--- a/src/vm/eventtrace.cpp
+++ b/src/vm/eventtrace.cpp
@@ -4949,10 +4949,10 @@ VOID ETW::InfoLog::RuntimeInformation(INT32 type)
             Sku = ETW::InfoLog::InfoStructs::CoreCLR;
         
             //version info for clr.dll
-            USHORT vmMajorVersion = VER_MAJORVERSION;
-            USHORT vmMinorVersion = VER_MINORVERSION;
-            USHORT vmBuildVersion = VER_PRODUCTBUILD;
-            USHORT vmQfeVersion = VER_PRODUCTBUILD_QFE;
+            USHORT vmMajorVersion = CLR_MAJOR_VERSION;
+            USHORT vmMinorVersion = CLR_MINOR_VERSION;
+            USHORT vmBuildVersion = CLR_BUILD_VERSION;
+            USHORT vmQfeVersion = CLR_BUILD_VERSION_QFE;
 
             //version info for mscorlib.dll
             USHORT bclMajorVersion = VER_ASSEMBLYMAJORVERSION;
diff --git a/src/vm/excep.cpp b/src/vm/excep.cpp
index 9cb1296204..e5c024e89c 100644
--- a/src/vm/excep.cpp
+++ b/src/vm/excep.cpp
@@ -107,37 +107,6 @@ BOOL IsExceptionFromManagedCode(const EXCEPTION_RECORD * pExceptionRecord)
 
 #ifndef DACCESS_COMPILE
 
-//----------------------------------------------------------------------------
-//
-// IsExceptionFromManagedCodeCallback - a wrapper for IsExceptionFromManagedCode
-//
-// Arguments:
-//    pExceptionRecord - pointer to exception record
-//
-// Return Value:
-//    TRUE or FALSE
-//
-//----------------------------------------------------------------------------
-BOOL __stdcall IsExceptionFromManagedCodeCallback(EXCEPTION_RECORD * pExceptionRecord)
-{
-    CONTRACTL {
-        NOTHROW;
-        GC_NOTRIGGER;
-        SO_TOLERANT;
-        SUPPORTS_DAC;
-        PRECONDITION(CheckPointer(pExceptionRecord));
-    } CONTRACTL_END;
-
-    // If we can't enter the EE, done.
-    if (g_fForbidEnterEE)
-    {
-        return FALSE;
-    }
-
-    return IsExceptionFromManagedCode(pExceptionRecord);
-}
-
-
 #define SZ_UNHANDLED_EXCEPTION W("Unhandled Exception:")
 #define SZ_UNHANDLED_EXCEPTION_CHARLEN ((sizeof(SZ_UNHANDLED_EXCEPTION) / sizeof(WCHAR)))
 
diff --git a/src/vm/pefile.cpp b/src/vm/pefile.cpp
index 58540fe605..77c99f6191 100644
--- a/src/vm/pefile.cpp
+++ b/src/vm/pefile.cpp
@@ -1261,10 +1261,10 @@ BOOL RuntimeVerifyNativeImageVersion(const CORCOMPILE_VERSION_INFO *info, Loggab
     // Check that the EE version numbers are the same.
     //
  
-    if (info->wVersionMajor != VER_MAJORVERSION
-        || info->wVersionMinor != VER_MINORVERSION
-        || info->wVersionBuildNumber != VER_PRODUCTBUILD
-        || info->wVersionPrivateBuildNumber != VER_PRODUCTBUILD_QFE)
+    if (info->wVersionMajor != CLR_MAJOR_VERSION
+        || info->wVersionMinor != CLR_MINOR_VERSION
+        || info->wVersionBuildNumber != CLR_BUILD_VERSION
+        || info->wVersionPrivateBuildNumber != CLR_BUILD_VERSION_QFE)
     {
         RuntimeVerifyLog(LL_ERROR, pLogAsm, W("CLR version recorded in native image doesn't match the current CLR."));
         return FALSE;
diff --git a/src/vm/profattach.cpp b/src/vm/profattach.cpp
index ed83201bf9..ff56f38405 100644
--- a/src/vm/profattach.cpp
+++ b/src/vm/profattach.cpp
@@ -41,10 +41,10 @@ BOOL ProfilingAPIAttachDetach::s_fInitializeCalled = FALSE;
 // Both the trigger (via code:ProfilingAPIAttachClient) and the target profilee (via
 // code:ProfilingAPIAttachServer) use this constant to identify their own version.
 const VersionBlock ProfilingAPIAttachDetach::kCurrentProcessVersion(
-    VER_MAJORVERSION,
-    VER_MINORVERSION,
-    VER_PRODUCTBUILD,
-    VER_PRODUCTBUILD_QFE);
+    CLR_MAJOR_VERSION,
+    CLR_MINOR_VERSION,
+    CLR_BUILD_VERSION,
+    CLR_BUILD_VERSION_QFE);
 
 // Note that the following two VersionBlocks are initialized with static numerals rather
 // than using the VER_* preproc defines, as we don't want these VersionBlocks to change
diff --git a/src/vm/proftoeeinterfaceimpl.cpp b/src/vm/proftoeeinterfaceimpl.cpp
index 04330a26e0..2830089fee 100644
--- a/src/vm/proftoeeinterfaceimpl.cpp
+++ b/src/vm/proftoeeinterfaceimpl.cpp
@@ -8849,16 +8849,16 @@ HRESULT ProfToEEInterfaceImpl::GetRuntimeInformation(USHORT * pClrInstanceId,
     }
 
     if (pMajorVersion != NULL)
-        *pMajorVersion = VER_MAJORVERSION;
+        *pMajorVersion = CLR_MAJOR_VERSION;
 
     if (pMinorVersion != NULL)
-        *pMinorVersion = VER_MINORVERSION;
+        *pMinorVersion = CLR_MINOR_VERSION;
 
     if (pBuildNumber != NULL)
-        *pBuildNumber = VER_PRODUCTBUILD;
+        *pBuildNumber = CLR_BUILD_VERSION;
 
     if (pQFEVersion != NULL)
-        *pQFEVersion = VER_PRODUCTBUILD_QFE;
+        *pQFEVersion = CLR_BUILD_VERSION_QFE;
 
     return S_OK;
 }
diff --git a/src/zap/zapper.cpp b/src/zap/zapper.cpp
index b7dc540e09..1b30ceb0e6 100644
--- a/src/zap/zapper.cpp
+++ b/src/zap/zapper.cpp
@@ -25,37 +25,6 @@ bool g_fReadyToRunCompilation;
 
 static bool s_fNGenNoMetaData;
 
-// Event logging helper
-void Zapper::ReportEventNGEN(WORD wType, DWORD dwEventID, LPCWSTR format, ...)
-{
-    SString s;
-    va_list args;
-    va_start(args, format);
-    s.VPrintf(format, args);
-    va_end(args);
-
-    SString message;
-    message.Printf(W(".NET Runtime Optimization Service (%s) - %s"), VER_FILEVERSION_STR_L, s.GetUnicode());
-
-    // Note: We are using the same event log source as the ngen service. This may become problem 
-    // if we ever want to split the ngen service from the rest of the .NET Framework.
-    ClrReportEvent(W(".NET Runtime Optimization Service"),
-        wType,                  // event type 
-        0,                      // category zero
-        dwEventID,              // event identifier
-        NULL,                   // no user security identifier
-        message.GetUnicode());
-
-    // Output the message to the logger as well.
-    if (wType == EVENTLOG_WARNING_TYPE)
-        Warning(W("%s\n"), s.GetUnicode());
-}
-
-
-/* --------------------------------------------------------------------------- *
- * Private fusion entry points
- * --------------------------------------------------------------------------- */
-
 /* --------------------------------------------------------------------------- *
  * Public entry points for ngen
  * --------------------------------------------------------------------------- */