diff --git a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt
index 2c72d282d2b..4936ec319fc 100644
--- a/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt
+++ b/Tools/MediaDriverTools/GenDmyHex/CMakeLists.txt
@@ -22,6 +22,4 @@ cmake_minimum_required (VERSION 2.8)
 project(IntelGenDmyHexTool) 
 add_compile_options(-std=c++11)
 
-add_definitions(-DLINUX_)
-
 add_executable(GenDmyHex main.cpp)
diff --git a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt
index cc586ba766d..a23a6cad9c3 100644
--- a/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt
+++ b/Tools/MediaDriverTools/GenKrnBin/CMakeLists.txt
@@ -31,6 +31,4 @@ set(HEADERS_
     linkfile.h
 )
 
-add_definitions(-DLINUX_)
-
 add_executable(GenKrnBin ${SOURCE_} ${HEADERS_})
diff --git a/Tools/MediaDriverTools/GenKrnBin/linkfile.cpp b/Tools/MediaDriverTools/GenKrnBin/linkfile.cpp
index bb113065051..0a8a96e6ebc 100644
--- a/Tools/MediaDriverTools/GenKrnBin/linkfile.cpp
+++ b/Tools/MediaDriverTools/GenKrnBin/linkfile.cpp
@@ -9,12 +9,12 @@
 #include <stdlib.h>
 #include "linkfile.h"
 
-#ifdef LINUX_
+#ifdef __linux__
 #include <strings.h>
 #include <cstring>
 #endif
 
-#ifdef LINUX_
+#ifdef __linux__
 #define StrCmp strcasecmp
 #else
 #define StrCmp stricmp
@@ -81,7 +81,7 @@ void CreateLinkFile(char *pDirectoryName, list <string> &kernels)
     string name_hex;
 
     // Create full LinkFile binary name
-#ifdef LINUX_
+#ifdef __linux__
     sprintf(LinkFileTxt, "%s/%s", pDirectoryName, "LinkFile.txt");
 #else
     sprintf(LinkFileTxt, "%s\\%s", pDirectoryName, "LinkFile.txt");
@@ -90,7 +90,7 @@ void CreateLinkFile(char *pDirectoryName, list <string> &kernels)
     if (hText == NULL) goto done;
 
     // Create full LinkFile binary name - remove pre-existing file
-#ifdef LINUX_
+#ifdef __linux__
     sprintf(LinkFileBin, "%s/%s", pDirectoryName, "LinkFile.krn");
 #else
     sprintf(LinkFileBin, "%s\\%s", pDirectoryName, "LinkFile.krn");
diff --git a/Tools/MediaDriverTools/GenKrnBin/main.cpp b/Tools/MediaDriverTools/GenKrnBin/main.cpp
index 30f0cfff470..5a94271e7b2 100755
--- a/Tools/MediaDriverTools/GenKrnBin/main.cpp
+++ b/Tools/MediaDriverTools/GenKrnBin/main.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include "linkfile.h"
 
-#ifdef LINUX_
+#ifdef __linux__
 #include <dirent.h>
 #include <sys/stat.h>
 #include <strings.h>
@@ -80,7 +80,7 @@ static const char *COPYRIGHT        =
 #define KERNEL_ID_ENTRY(index)           "    _" "T(\"%03d\"),\\\n",                      \
     index
 
-#ifdef LINUX_
+#ifdef __linux__
 #define StrCmp strncasecmp
 #else
 #define StrCmp strnicmp
@@ -106,7 +106,7 @@ unsigned int  *g_pOffsetTable;
 unsigned int   g_dwOffsetTableSize;
 unsigned int   g_dwCurrentKernel;
 
-#ifdef LINUX_
+#ifdef __linux__
 char strupr(char *str) 
 { 
     char *ptr = str;
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
         ++idx;
     }
 
-#ifdef LINUX_
+#ifdef __linux__
     sprintf(KERNEL_COMPONENT_DIR,"%s", argv[1]);
     strncpy(KERNEL_HEADER_PREFIX, argv[2], sizeof(KERNEL_HEADER_PREFIX));
     strncpy(KERNEL_HEADER_GEN, argv[3], sizeof(KERNEL_HEADER_GEN));
@@ -189,7 +189,7 @@ int main(int argc, char *argv[])
     /////////////////////////////////////////////////
 
 
-#ifdef LINUX_
+#ifdef __linux__
     sprintf(SearchString, "%s", KERNEL_COMPONENT_DIR);
  
     struct dirent* ent = NULL;
@@ -319,7 +319,7 @@ int main(int argc, char *argv[])
     fwrite( g_pOffsetTable, 1, g_dwOffsetTableSize, (FILE *)g_hKernelBinary);
 
     // create link information for the current family folder
-#ifdef LINUX_
+#ifdef __linux__
     sprintf(KernelNameFull, "%s", KERNEL_COMPONENT_DIR);
 #else
     sprintf(KernelNameFull, "%s", KERNEL_COMPONENT_DIR);
@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
     {
         // check if this kernel exists for this platform
         // cFileName contains file name
-#ifdef LINUX_
+#ifdef __linux__
         sprintf(KernelNameFull, "%s/%s", KERNEL_COMPONENT_DIR, iterator->c_str());
 #else
         sprintf(KernelNameFull, "%s\\%s", KERNEL_COMPONENT_DIR, iterator->c_str());
@@ -347,7 +347,7 @@ int main(int argc, char *argv[])
 
     fclose(g_hKernelBinary);
 
-#ifdef LINUX_
+#ifdef __linux__
     sprintf(KernelNameFull, "%s", KERNEL_COMPONENT_DIR);
 #else
     sprintf(KernelNameFull, "%s", KERNEL_COMPONENT_DIR);
diff --git a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt
index 713d08600ec..957eaf65276 100644
--- a/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt
+++ b/Tools/MediaDriverTools/KernelBinToSource/CMakeLists.txt
@@ -22,6 +22,4 @@ cmake_minimum_required (VERSION 2.8)
 project(IntelKernelBinToSourceTool) 
 add_compile_options(-std=c++11)
 
-add_definitions(-DLINUX_) 
-
 add_executable(KernelBinToSource KernelBinToSource.cpp) 
diff --git a/Tools/MediaDriverTools/KernelBinToSource/KernelBinToSource.cpp b/Tools/MediaDriverTools/KernelBinToSource/KernelBinToSource.cpp
index cf1c1f651f8..ed1ca04a9ab 100755
--- a/Tools/MediaDriverTools/KernelBinToSource/KernelBinToSource.cpp
+++ b/Tools/MediaDriverTools/KernelBinToSource/KernelBinToSource.cpp
@@ -42,7 +42,7 @@ static const char *PARAM_V          = "-v";
 static const char *PARAM_INDEX      = "-index";
 static const char *PARAM_TOTAL      = "-t";
 
-#ifdef LINUX_
+#ifdef __linux__
 static const char *FILE_SEP         = "/";
 #else
 static const char *FILE_SEP         = "\\";
@@ -111,7 +111,7 @@ std::string appendPath(
 //-----------------------------------------------------------------------------
 std::string getFileName(const std::string &sFilePath)
 {
-#ifdef LINUX_
+#ifdef __linux__
     std::string::size_type uiLoc = sFilePath.rfind("/");
 #else
     std::string::size_type uiLoc = sFilePath.rfind("\\");
diff --git a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt
index a3cb7341c6e..bb07d2fe7cd 100644
--- a/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt
+++ b/Tools/MediaDriverTools/KrnToHex/CMakeLists.txt
@@ -22,6 +22,4 @@ cmake_minimum_required (VERSION 2.8)
 project(KrnToHexTool) 
 add_compile_options(-std=c++11)
 
-add_definitions(-DLINUX_) 
-
 add_executable(KrnToHex KrnToHex.cpp) 
diff --git a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt
index af622be19cb..b6958276c70 100644
--- a/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt
+++ b/Tools/MediaDriverTools/KrnToHex_IGA/CMakeLists.txt
@@ -26,6 +26,4 @@ set(SOURCE_
     KrnToHex_IGA.cpp
 )
 
-add_definitions(-DLINUX_)
-
 add_executable(KrnToHex_IGA ${SOURCE_})
diff --git a/Tools/MediaDriverTools/KrnToHex_IGA/KrnToHex_IGA.cpp b/Tools/MediaDriverTools/KrnToHex_IGA/KrnToHex_IGA.cpp
index eb0a4219320..aec6703989c 100644
--- a/Tools/MediaDriverTools/KrnToHex_IGA/KrnToHex_IGA.cpp
+++ b/Tools/MediaDriverTools/KrnToHex_IGA/KrnToHex_IGA.cpp
@@ -27,7 +27,7 @@
 #define MAX_FILE_PATH 4096
 #define MAX_FILE_NAME 260
 
-#ifdef LINUX_
+#ifdef __linux__
 #define StrCmp strcasecmp
 #else
 #define StrCmp stricmp
diff --git a/media_driver/agnostic/common/cm/cm_hal_dump.cpp b/media_driver/agnostic/common/cm/cm_hal_dump.cpp
index dfbb3ca5d01..c5aa0938615 100644
--- a/media_driver/agnostic/common/cm/cm_hal_dump.cpp
+++ b/media_driver/agnostic/common/cm/cm_hal_dump.cpp
@@ -28,7 +28,7 @@
 #include "renderhal_platform_interface.h"
 
 #if (MDF_COMMAND_BUFFER_DUMP || MDF_CURBE_DATA_DUMP || MDF_SURFACE_STATE_DUMP)
-#if defined(ANDROID) || defined(LINUX)
+#if defined(ANDROID) || defined(__linux__)
 #define PlatformSNPrintf snprintf
 #define PLATFORM_DIR_SEPERATOR   "/"
 #else
diff --git a/media_driver/agnostic/common/cm/cm_media_state.cpp b/media_driver/agnostic/common/cm/cm_media_state.cpp
index 5906754b82e..cb3204ea329 100644
--- a/media_driver/agnostic/common/cm/cm_media_state.cpp
+++ b/media_driver/agnostic/common/cm/cm_media_state.cpp
@@ -88,7 +88,7 @@ MOS_STATUS CmMediaState::Submit()
     return MOS_STATUS_SUCCESS;
 }
 
-#if defined(ANDROID) || defined(LINUX)
+#if defined(ANDROID) || defined(__linux__)
 #define PLATFORM_DIR_SEPERATOR   "/"
 #else
 #define PLATFORM_DIR_SEPERATOR   "\\"
diff --git a/media_driver/agnostic/common/cm/cm_mem_sse2_impl.cpp b/media_driver/agnostic/common/cm/cm_mem_sse2_impl.cpp
index 30b96776018..67714de181c 100644
--- a/media_driver/agnostic/common/cm/cm_mem_sse2_impl.cpp
+++ b/media_driver/agnostic/common/cm/cm_mem_sse2_impl.cpp
@@ -27,7 +27,7 @@
 #include "cm_mem.h"
 #include "cm_mem_sse2_impl.h"
 
-#if defined(__SSE2__) || !(defined(LINUX) || defined(ANDROID))
+#if defined(__SSE2__) || !(defined(__linux__) || defined(ANDROID))
 
 #include <mmintrin.h>
 
@@ -311,4 +311,4 @@ void CmFastMemCopyWC_SSE2( void* dst, const void* src, const size_t bytes )
   }
 }
 
-#endif // __SSE2__ || !(LINUX || ANDROID)
+#endif // __SSE2__ || !(__linux__ || ANDROID)
diff --git a/media_driver/agnostic/common/cm/cm_ssh.cpp b/media_driver/agnostic/common/cm/cm_ssh.cpp
index 5d0a4e656c4..d7124be7fa7 100644
--- a/media_driver/agnostic/common/cm/cm_ssh.cpp
+++ b/media_driver/agnostic/common/cm/cm_ssh.cpp
@@ -531,7 +531,7 @@ MOS_STATUS CmSSH::PrepareResourcesForCp()
 
 using namespace std;
 
-#if defined(ANDROID) || defined(LINUX)
+#if defined(ANDROID) || defined(__linux__)
 #define PLATFORM_DIR_SEPERATOR   "/"
 #else
 #define PLATFORM_DIR_SEPERATOR   "\\"
diff --git a/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp b/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp
index 29dd858c728..74f562f2f22 100644
--- a/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp
+++ b/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp
@@ -1883,7 +1883,7 @@ MOS_STATUS CodechalEncodeCscDs::RawSurfaceMediaCopy(MOS_FORMAT srcFormat)
     auto cscSurface = m_encoder->m_trackedBuf->GetCscSurface(CODEC_CURR_TRACKED_BUFFER);
 
     // Copy through VEBOX from Linear/TileY to TileY
-#ifdef LINUX
+#ifdef __linux__
     CODECHAL_ENCODE_CHK_STATUS_RETURN(m_pMosMediaCopy->MediaCopy(
         &m_rawSurfaceToEnc->OsResource,
         &cscSurface->OsResource,
@@ -1894,7 +1894,7 @@ MOS_STATUS CodechalEncodeCscDs::RawSurfaceMediaCopy(MOS_FORMAT srcFormat)
         &cscSurface->OsResource,
         false,
         MCPY_METHOD_BALANCE));
-#endif // LINUX
+#endif // __linux__
 
     CODECHAL_ENCODE_CHK_STATUS_RETURN(SetSurfacesToEncPak());
 
diff --git a/media_driver/agnostic/common/vp/hal/vphal.cpp b/media_driver/agnostic/common/vp/hal/vphal.cpp
index 4aff2840b87..c4d1a96e636 100755
--- a/media_driver/agnostic/common/vp/hal/vphal.cpp
+++ b/media_driver/agnostic/common/vp/hal/vphal.cpp
@@ -791,7 +791,7 @@ MOS_STATUS VphalState::GetStatusReport(
             continue;
         }
 
-#if (LINUX || ANDROID)
+#if (__linux__ || ANDROID)
         dwGpuTag    = pOsContext->GetGPUTag(m_osInterface, pStatusEntry->GpuContextOrdinal);
 #else
         dwGpuTag    = m_osInterface->pfnGetGpuStatusSyncTag(m_osInterface, pStatusEntry->GpuContextOrdinal);
@@ -818,7 +818,7 @@ MOS_STATUS VphalState::GetStatusReport(
         }
         else
         {   // here we have the first not ready entry.
-#if (LINUX || ANDROID)
+#if (__linux__ || ANDROID)
             uiNewHead = (uiIndex + 1) & (VPHAL_STATUS_TABLE_MAX_SIZE - 1);
 #else
             uiNewHead = uiIndex;
diff --git a/media_driver/agnostic/common/vp/hal/vphal_debug.c b/media_driver/agnostic/common/vp/hal/vphal_debug.c
index cf84fc98047..1a8e6eefc68 100644
--- a/media_driver/agnostic/common/vp/hal/vphal_debug.c
+++ b/media_driver/agnostic/common/vp/hal/vphal_debug.c
@@ -2159,7 +2159,7 @@ void VphalSurfaceDumper::GetSurfaceDumpSpec()
             UserFeatureData.StringData.pStringData,
             UserFeatureData.StringData.uSize);
     }
-#if !defined(LINUX) && !defined(ANDROID)
+#if !defined(__linux__) && !defined(ANDROID)
     else
     {
         std::string vphalDumpFilePath;
@@ -2519,7 +2519,7 @@ void VphalHwStateDumper::GetStateDumpSpec()
             pUserFeatureData->StringData.pStringData,
             pUserFeatureData->StringData.uSize);
     }
-#if !defined(LINUX) && !defined(ANDROID)
+#if !defined(__linux__) && !defined(ANDROID)
     else
     {
         std::string vphalDumpFilePath;
@@ -3161,7 +3161,7 @@ void VphalParameterDumper::GetParametersDumpSpec()
             UserFeatureData.StringData.uSize);
         bDumpEnabled = true;
     }
-#if !defined(LINUX) && !defined(ANDROID)
+#if !defined(__linux__) && !defined(ANDROID)
     else
     {
         std::string vphalDumpFilePath;
diff --git a/media_driver/agnostic/common/vp/hal/vphal_debug.h b/media_driver/agnostic/common/vp/hal/vphal_debug.h
index 55b2105c1a8..4619b888cb7 100644
--- a/media_driver/agnostic/common/vp/hal/vphal_debug.h
+++ b/media_driver/agnostic/common/vp/hal/vphal_debug.h
@@ -40,7 +40,7 @@
 #include "renderhal.h"
 #include "mhw_vebox.h"
 
-#if !defined(LINUX) && !defined(ANDROID)
+#if !defined(__linux__) && !defined(ANDROID)
 #include "UmdStateSeparation.h"
 #endif
 
diff --git a/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.cpp b/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.cpp
index 4e9f9dd6518..f17d733ce08 100644
--- a/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.cpp
+++ b/media_driver/agnostic/common/vp/hal/vphal_render_16alignment.cpp
@@ -154,7 +154,7 @@ MOS_STATUS VpHal_16AlignLoadStaticData(
             eStatus = MOS_STATUS_INVALID_PARAMETER;
             break;
     }
-#if defined(LINUX)
+#if defined(__linux__)
     WalkerStatic.DW10.Output_Pitch            = p16AlignState->pTarget->OsResource.iPitch;
     WalkerStatic.DW10.Output_Height           = p16AlignState->pTarget->OsResource.iHeight;
 #endif
@@ -1049,7 +1049,7 @@ MOS_STATUS VpHal_16AlignSetupSurfaceStatesInt(
     PRENDERHAL_SURFACE_STATE_ENTRY      pSurfaceEntry;
     MOS_FORMAT                          format  = pSurface->Format;
     uint32_t                            width   = pSurface->dwWidth;
-#if defined(LINUX)
+#if defined(__linux__)
     uint32_t                            dwSize  = pSurface->dwHeight * pSurface->OsResource.iPitch;
 #else
     uint32_t                            dwSize  = pSurface->dwHeight * pSurface->dwPitch;
diff --git a/media_driver/agnostic/common/vp/hal/vphal_render_fast1ton.cpp b/media_driver/agnostic/common/vp/hal/vphal_render_fast1ton.cpp
index 8071e72eff4..8193eae5b24 100644
--- a/media_driver/agnostic/common/vp/hal/vphal_render_fast1ton.cpp
+++ b/media_driver/agnostic/common/vp/hal/vphal_render_fast1ton.cpp
@@ -108,7 +108,7 @@ MOS_STATUS VpHal_Fast1toNLoadStaticData(
         {
             WalkerStatic.DW4.Dst_Index0      = FAST1TON_DST_INDEX0;
             WalkerStatic.DW10.Dst_16Aligned |= ALIGN16_DST0;
-#if defined(LINUX)
+#if defined(__linux__)
             WalkerStatic.DW10.Dst_pitch0     = pFast1toNState->pTarget[0]->OsResource.iPitch;
             WalkerStatic.DW12.Dst_UVOffset0  = pFast1toNState->pTarget[0]->OsResource.iHeight;
 #endif
@@ -131,7 +131,7 @@ MOS_STATUS VpHal_Fast1toNLoadStaticData(
         {
             WalkerStatic.DW6.Dst_Index1      = FAST1TON_DST_INDEX1;
             WalkerStatic.DW10.Dst_16Aligned |= ALIGN16_DST1;
-#if defined(LINUX)
+#if defined(__linux__)
             WalkerStatic.DW11.Dst_pitch1     = pFast1toNState->pTarget[1]->OsResource.iPitch;
             WalkerStatic.DW12.Dst_UVOffset1  = pFast1toNState->pTarget[1]->OsResource.iHeight;
 #endif
@@ -154,7 +154,7 @@ MOS_STATUS VpHal_Fast1toNLoadStaticData(
         {
             WalkerStatic.DW8.Dst_Index2      = FAST1TON_DST_INDEX2;
             WalkerStatic.DW10.Dst_16Aligned |= ALIGN16_DST2;
-#if defined(LINUX)
+#if defined(__linux__)
             WalkerStatic.DW11.Dst_pitch2     = pFast1toNState->pTarget[2]->OsResource.iPitch;
             WalkerStatic.DW13.Dst_UVOffset2  = pFast1toNState->pTarget[2]->OsResource.iHeight;
 #endif
@@ -1047,7 +1047,7 @@ MOS_STATUS VpHal_Fast1toNSetupSurfaceStates(
             format   = pFast1toNState->pTarget[index]->Format;
             width    = pFast1toNState->pTarget[index]->dwWidth;
             pFast1toNState->pTarget[index]->Format  = Format_RAW;
-#if defined(LINUX)
+#if defined(__linux__)
             pFast1toNState->pTarget[index]->dwWidth = (pFast1toNState->pTarget[index]->dwHeight * pFast1toNState->pTarget[index]->OsResource.iPitch) * 3/2;
 #endif
             pFast1toNState->pTarget[index]->dwWidth = MOS_ALIGN_CEIL(pFast1toNState->pTarget[index]->dwWidth, 128);
diff --git a/media_driver/agnostic/common/vp/hal/vphal_render_vebox_memdecomp.cpp b/media_driver/agnostic/common/vp/hal/vphal_render_vebox_memdecomp.cpp
index e05854848de..a88a6e5fd44 100644
--- a/media_driver/agnostic/common/vp/hal/vphal_render_vebox_memdecomp.cpp
+++ b/media_driver/agnostic/common/vp/hal/vphal_render_vebox_memdecomp.cpp
@@ -200,7 +200,7 @@ MOS_STATUS MediaVeboxDecompState::MediaMemoryCopy(
     targetSurface.Format     = Format_Invalid;
     targetSurface.OsResource = *outputResource;
 
-#if !defined(LINUX) && !defined(ANDROID) && !EMUL
+#if !defined(__linux__) && !defined(ANDROID) && !EMUL
     // for Double Buffer copy, clear the allocationInfo temply
     MOS_ZeroMemory(&targetSurface.OsResource.AllocationInfo, sizeof(SResidencyInfo));
 #endif
@@ -355,7 +355,7 @@ MOS_STATUS MediaVeboxDecompState::MediaMemoryCopy2D(
     targetSurface.Format = Format_Invalid;
     targetSurface.OsResource = *outputResource;
 
-#if !defined(LINUX) && !defined(ANDROID) && !EMUL
+#if !defined(__linux__) && !defined(ANDROID) && !EMUL
     // for Double Buffer copy, clear the allocationInfo temply
     MOS_ZeroMemory(&targetSurface.OsResource.AllocationInfo, sizeof(SResidencyInfo));
 #endif
@@ -470,7 +470,7 @@ MOS_STATUS MediaVeboxDecompState::MediaMemoryTileConvert(
     targetSurface.Format = Format_Invalid;
     targetSurface.OsResource = *outputResource;
 
-#if !defined(LINUX) && !defined(ANDROID) && !EMUL
+#if !defined(__linux__) && !defined(ANDROID) && !EMUL
     // for Double Buffer copy, clear the allocationInfo temply
     MOS_ZeroMemory(&targetSurface.OsResource.AllocationInfo, sizeof(SResidencyInfo));
 #endif
diff --git a/media_driver/agnostic/common/vp/kdll/hal_kerneldll.c b/media_driver/agnostic/common/vp/kdll/hal_kerneldll.c
index ae93b13f9a3..cd246309081 100644
--- a/media_driver/agnostic/common/vp/kdll/hal_kerneldll.c
+++ b/media_driver/agnostic/common/vp/kdll/hal_kerneldll.c
@@ -34,8 +34,8 @@
 #if EMUL || VPHAL_LIB
 #include <math.h>
 #include "support.h"
-#elif LINUX
-#else  // !(EMUL | VPHAL_LIB) && !LINUX
+#elif __linux__
+#else  // !(EMUL | VPHAL_LIB) && !__linux__
 
 #endif // EMUL | VPHAL_LIB
 
@@ -4943,7 +4943,7 @@ bool KernelDll_BuildKernel_CmFc(Kdll_State *pState, Kdll_SearchState *pSearchSta
     VPHAL_RENDER_FUNCTION_ENTER;
 
     // Disable pop-up box window for STL assertion to avoid VM hang in auto test.
-#if (!LINUX)
+#if (!__linux__)
     ::SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
 #if defined(_MSC_VER)
     ::_set_error_mode(_OUT_TO_STDERR);
diff --git a/media_driver/agnostic/gen12/codec/hal/codechal_decode_vp9_g12.cpp b/media_driver/agnostic/gen12/codec/hal/codechal_decode_vp9_g12.cpp
index a3366191320..4cc0bde8fa2 100644
--- a/media_driver/agnostic/gen12/codec/hal/codechal_decode_vp9_g12.cpp
+++ b/media_driver/agnostic/gen12/codec/hal/codechal_decode_vp9_g12.cpp
@@ -1221,7 +1221,7 @@ MOS_STATUS CodechalDecodeVp9G12 :: DecodePrimitiveLevel()
         m_osInterface,
         &syncParams));
 
- #ifdef LINUX 
+ #ifdef __linux__ 
 #ifdef _DECODE_PROCESSING_SUPPORTED
     CODECHAL_DEBUG_TOOL(
     if (m_sfcState->m_sfcOutputSurface)
diff --git a/media_driver/agnostic/gen12/codec/hal/codechal_vdenc_vp9_g12.cpp b/media_driver/agnostic/gen12/codec/hal/codechal_vdenc_vp9_g12.cpp
index 0c56da2fdcc..0f9c0dc94bd 100644
--- a/media_driver/agnostic/gen12/codec/hal/codechal_vdenc_vp9_g12.cpp
+++ b/media_driver/agnostic/gen12/codec/hal/codechal_vdenc_vp9_g12.cpp
@@ -3324,7 +3324,7 @@ MOS_STATUS CodechalVdencVp9StateG12::SetSequenceStructs()
 
     CODECHAL_ENCODE_FUNCTION_ENTER;
 
-#ifdef LINUX
+#ifdef __linux__
     MOS_SURFACE rawSurface;
     PCODEC_VP9_ENCODE_SEQUENCE_PARAMS seqParams = (PCODEC_VP9_ENCODE_SEQUENCE_PARAMS)m_encodeParams.pSeqParams;
     rawSurface = *(m_encodeParams.psRawSurface);
diff --git a/media_driver/agnostic/gen12/vp/hal/vphal_render_vebox_g12_base.cpp b/media_driver/agnostic/gen12/vp/hal/vphal_render_vebox_g12_base.cpp
index e6fe01603e4..d58c2b1ebd7 100644
--- a/media_driver/agnostic/gen12/vp/hal/vphal_render_vebox_g12_base.cpp
+++ b/media_driver/agnostic/gen12/vp/hal/vphal_render_vebox_g12_base.cpp
@@ -3108,7 +3108,7 @@ MOS_STATUS VPHAL_VEBOX_STATE_G12_BASE::Initialize(
     // Read user feature key for MMC enable
     MOS_ZeroMemory(&UserFeatureData, sizeof(UserFeatureData));
     UserFeatureData.i32DataFlag = MOS_USER_FEATURE_VALUE_DATA_FLAG_CUSTOM_DEFAULT_VALUE_TYPE;
-#if(LINUX)
+#if(__linux__)
     UserFeatureData.bData       = !MEDIA_IS_WA(pVeboxState->m_pWaTable, WaDisableVPMmc); // enable MMC by default
 #else
     UserFeatureData.bData = true;
diff --git a/media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.cpp b/media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.cpp
index a83d8cfa40d..10ec5da7d76 100644
--- a/media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.cpp
+++ b/media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.cpp
@@ -54,7 +54,7 @@ MOS_STATUS VphalInterfacesG12Tgllp::Initialize(
     MOS_STATUS      *eStatus)
 {
     MOS_OS_CHK_NULL_RETURN(eStatus);
-#if LINUX
+#if __linux__
     bool bApogeiosEnable = true;
     MOS_USER_FEATURE_VALUE_DATA         UserFeatureData;
     MOS_ZeroMemory(&UserFeatureData, sizeof(UserFeatureData));
@@ -1050,4 +1050,4 @@ MOS_STATUS MediaInterfacesHwInfoDeviceG12Tgllp::Initialize(PLATFORM platform)
 {
     m_hwInfo.SetDeviceInfo(IP_VERSION_M12_0, platform.usRevId);
     return MOS_STATUS_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.h b/media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.h
index ad6e49dabcd..cc388285d20 100644
--- a/media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.h
+++ b/media_driver/media_interface/media_interfaces_m12_tgllp/media_interfaces_g12_tgllp.h
@@ -146,7 +146,7 @@
 
 #include "codechal_decode_histogram_g12.h"
 
-#if LINUX
+#if __linux__
 #include "vp_pipeline_adapter_g12.h"
 #endif
 
diff --git a/media_driver/media_softlet/agnostic/g12/g12_base/renderhal/renderhal_g12_base.cpp b/media_driver/media_softlet/agnostic/g12/g12_base/renderhal/renderhal_g12_base.cpp
index 9584e302664..a300702035e 100644
--- a/media_driver/media_softlet/agnostic/g12/g12_base/renderhal/renderhal_g12_base.cpp
+++ b/media_driver/media_softlet/agnostic/g12/g12_base/renderhal/renderhal_g12_base.cpp
@@ -856,7 +856,7 @@ MOS_STATUS XRenderHal_Interface_G12_Base::IsRenderHalMMCEnabled(
     MOS_ZeroMemory(&UserFeatureData, sizeof(UserFeatureData));
 
     UserFeatureData.i32DataFlag = MOS_USER_FEATURE_VALUE_DATA_FLAG_CUSTOM_DEFAULT_VALUE_TYPE;
-#if(LINUX)
+#if(__linux__)
     UserFeatureData.bData = !MEDIA_IS_WA(pRenderHal->pWaTable, WaDisableVPMmc) || !MEDIA_IS_WA(pRenderHal->pWaTable, WaDisableCodecMmc); // Enable MMC on Linux based on platforms settings
 #else
     UserFeatureData.bData = true; // init as default value to enable MMCD on Gen12LP
diff --git a/media_softlet/agnostic/common/os/mos_util_debug_next.cpp b/media_softlet/agnostic/common/os/mos_util_debug_next.cpp
index 12690ffe10c..7969fa33639 100644
--- a/media_softlet/agnostic/common/os/mos_util_debug_next.cpp
+++ b/media_softlet/agnostic/common/os/mos_util_debug_next.cpp
@@ -286,7 +286,7 @@ MOS_STATUS MosUtilDebug::MosHLTInit(MOS_CONTEXT_HANDLE mosCtx)
     MosLogFileNamePrefix(fileNamePrefix, mosCtx);
     MosUtilities::MosSecureStringPrint(hltFileName, MOS_MAX_HLT_FILENAME_LEN, MOS_MAX_HLT_FILENAME_LEN-1, m_mosLogPathTemplate, fileNamePrefix, nPID, "log");
 
-#if defined(LINUX) || defined(ANDROID)
+#if defined(__linux__) || defined(ANDROID)
     eStatus = MosUtilities::MosCreateDirectory(fileNamePrefix);
     if (MOS_FAILED(eStatus))
     {
diff --git a/media_softlet/agnostic/common/shared/media_debug_interface.cpp b/media_softlet/agnostic/common/shared/media_debug_interface.cpp
index c2ae1c4b740..00020b93a58 100644
--- a/media_softlet/agnostic/common/shared/media_debug_interface.cpp
+++ b/media_softlet/agnostic/common/shared/media_debug_interface.cpp
@@ -32,7 +32,7 @@
 #include <sstream>
 #include <iomanip>
 
-#if !defined(LINUX) && !defined(ANDROID)
+#if !defined(__linux__) && !defined(ANDROID)
 #include "UmdStateSeparation.h"
 #endif
 
@@ -86,7 +86,7 @@ MOS_STATUS MediaDebugInterface::SetOutputFilePath()
 
     MEDIA_DEBUG_FUNCTION_ENTER;
 
-#ifdef LINUX
+#ifdef __linux__
     char *customizedOutputPath = getenv("MOS_DEBUG_OUTPUT_LOCATION");
     if (customizedOutputPath != nullptr && strlen(customizedOutputPath) != 0)
     {
@@ -124,7 +124,7 @@ MOS_STATUS MediaDebugInterface::SetOutputFilePath()
         }
         else
         {
-#if defined(LINUX) || defined(ANDROID)
+#if defined(__linux__) || defined(ANDROID)
             m_outputFilePath = MOS_DEBUG_DEFAULT_OUTPUT_LOCATION;
 #else
             // Use state separation APIs to obtain appropriate storage location
@@ -461,7 +461,7 @@ MOS_STATUS MediaDebugInterface::DumpYUVSurfaceToBuffer(PMOS_SURFACE surface,
         uint32_t        sizeToBeCopied = 0;
         MOS_GFXRES_TYPE ResType;
 
-#if LINUX
+#if __linux__
         // Linux does not have OsResource->ResType
         ResType = surface->Type;
 #else
@@ -604,7 +604,7 @@ MOS_STATUS MediaDebugInterface::DumpYUVSurfaceToBuffer(PMOS_SURFACE surface,
         }
 
         uint8_t *vPlaneData = surfBaseAddr;
-#ifdef LINUX
+#ifdef __linux__
         data = surfBaseAddr + surface->UPlaneOffset.iSurfaceOffset;
         if (surface->Format == Format_422V || surface->Format == Format_IMC3)
         {
@@ -931,7 +931,7 @@ MOS_STATUS MediaDebugInterface::DumpYUVSurface(
         uint32_t        sizeToBeCopied = 0;
         MOS_GFXRES_TYPE ResType;
 
-#if LINUX
+#if __linux__
         // Linux does not have OsResource->ResType
         ResType = surface->Type;
 #else
@@ -1117,7 +1117,7 @@ MOS_STATUS MediaDebugInterface::DumpYUVSurface(
         }
 
         uint8_t *vPlaneData = surfBaseAddr;
-#ifdef LINUX
+#ifdef __linux__
         data = surfBaseAddr + surface->UPlaneOffset.iSurfaceOffset;
         if (surface->Format == Format_422V || surface->Format == Format_IMC3)
         {
@@ -1397,7 +1397,7 @@ MOS_STATUS MediaDebugInterface::DumpSurfaceInfo(
     FIELD_TO_OFS(bOverlay, );
     FIELD_TO_OFS(bFlipChain, );
 
-#if !defined(LINUX)
+#if !defined(__linux__)
     EMPTY_TO_OFS();
     UNION_STRUCT_START_TO_OFS();
     UNION_STRUCT_FIELD_TO_OFS(dwFirstArraySlice);
@@ -1473,7 +1473,7 @@ MOS_STATUS MediaDebugInterface::DumpMosSpecificResourceInfoToOfs(
 
     PMOS_RESOURCE ptr = pOsResource;
     ofs << "MOS_RESOURCE:" << std::endl;
-#if !defined(LINUX)
+#if !defined(__linux__)
     FIELD_TO_OFS(RunTimeHandle, );
 #else
     FIELD_TO_OFS(iWidth, );
@@ -1590,7 +1590,7 @@ MOS_STATUS MediaDebugInterface::DumpMosSpecificResourceInfoToOfs(
             FIELD_TO_OFS_8SHIFT(Info.Shared);
             FIELD_TO_OFS_8SHIFT(Info.SoftwareProtected);
             FIELD_TO_OFS_8SHIFT(Info.SVM);
-#if !defined(LINUX)
+#if !defined(__linux__)
             FIELD_TO_OFS_8SHIFT(Info.Tile4);
             FIELD_TO_OFS_8SHIFT(Info.Tile64);
 #endif
@@ -1601,7 +1601,7 @@ MOS_STATUS MediaDebugInterface::DumpMosSpecificResourceInfoToOfs(
             FIELD_TO_OFS_8SHIFT(Info.TiledYs);
             FIELD_TO_OFS_8SHIFT(Info.XAdapter);
             FIELD_TO_OFS_8SHIFT(Info.__PreallocatedResInfo);
-#if !defined(LINUX)
+#if !defined(__linux__)
             FIELD_TO_OFS_8SHIFT(Info.LMemBarPreferred);
             FIELD_TO_OFS_8SHIFT(Info.LMemBarOrNonlocalOnly);
             FIELD_TO_OFS_8SHIFT(Info.LMemBarIndifferent);
@@ -1621,7 +1621,7 @@ MOS_STATUS MediaDebugInterface::DumpMosSpecificResourceInfoToOfs(
             FIELD_TO_OFS_8SHIFT(Wa.DisableDisplayCcsClearColor);
             FIELD_TO_OFS_8SHIFT(Wa.DisableDisplayCcsCompression);
             FIELD_TO_OFS_8SHIFT(Wa.PreGen12FastClearOnly);
-#if !defined(LINUX)
+#if !defined(__linux__)
             FIELD_TO_OFS_8SHIFT(Wa.ForceStdAllocAlign);
 #endif
         }
@@ -1659,7 +1659,7 @@ MOS_STATUS MediaDebugInterface::DumpMosSpecificResourceInfoToOfs(
         FIELD_TO_OFS(GetSizeMainSurface(), );
         FIELD_TO_OFS(GmmGetTileMode(), );
 
-#if !defined(LINUX)
+#if !defined(__linux__)
         EMPTY_TO_OFS();
         FIELD_TO_OFS(GetMultiTileArch().Enable, );
 #endif
@@ -1905,7 +1905,7 @@ MOS_STATUS MediaDebugInterface::DumpNotSwizzled(
     const char *funcName = (m_mediafunction == MEDIA_FUNCTION_VP) ? "_VP" : ((m_mediafunction == MEDIA_FUNCTION_ENCODE) ? "_ENC" : "_DEC");
     int         YOffset  = surf.dwOffset + surf.YPlaneOffset.iYOffset * surf.dwPitch;
 
-#ifdef LINUX
+#ifdef __linux__
     int UOffset = surf.UPlaneOffset.iSurfaceOffset;
     int VOffset = surf.VPlaneOffset.iSurfaceOffset;
 #else
diff --git a/media_softlet/agnostic/common/vp/hal/bufferMgr/vp_allocator.cpp b/media_softlet/agnostic/common/vp/hal/bufferMgr/vp_allocator.cpp
index 6ab92ddc59a..b940caf43b3 100644
--- a/media_softlet/agnostic/common/vp/hal/bufferMgr/vp_allocator.cpp
+++ b/media_softlet/agnostic/common/vp/hal/bufferMgr/vp_allocator.cpp
@@ -669,7 +669,7 @@ MOS_STATUS VpAllocator::AllocParamsInitType(
     VP_FUNC_CALL();
     VP_PUBLIC_CHK_NULL_RETURN(surface);
 
-#if !EMUL && !LINUX
+#if !EMUL && !__linux__
     //  Need to reallocate surface according to expected tiletype instead of tiletype of the surface what we have
     if ( surface                           != nullptr &&
          surface->OsResource.pGmmResInfo   != nullptr &&
@@ -1213,7 +1213,7 @@ uint64_t VP_SURFACE::GetAllocationHandle(MOS_INTERFACE* osIntf)
     }
 #endif
 
-#if(LINUX)
+#if(__linux__)
     if (osSurface && osSurface->OsResource.bo)
     {
         return osSurface->OsResource.bo->handle;
diff --git a/media_softlet/agnostic/common/vp/hal/mmc/vp_mem_compression.cpp b/media_softlet/agnostic/common/vp/hal/mmc/vp_mem_compression.cpp
index 77d4a4003db..0e17b9b9cbf 100644
--- a/media_softlet/agnostic/common/vp/hal/mmc/vp_mem_compression.cpp
+++ b/media_softlet/agnostic/common/vp/hal/mmc/vp_mem_compression.cpp
@@ -38,7 +38,7 @@ VPMediaMemComp::VPMediaMemComp(
     m_mmcFeatureId      = __VPHAL_ENABLE_MMC_ID;
     m_mmcInuseFeatureId = __VPHAL_ENABLE_MMC_IN_USE_ID;
 
-#if(LINUX)
+#if(__linux__)
     m_bComponentMmcEnabled = !MEDIA_IS_WA(vpInterface.m_waTable, WaDisableVPMmc);
 #else
     m_bComponentMmcEnabled = true;
diff --git a/media_softlet/agnostic/common/vp/hal/pipeline/vp_pipeline_adapter_base.cpp b/media_softlet/agnostic/common/vp/hal/pipeline/vp_pipeline_adapter_base.cpp
index 37fa45c51c6..cfa823d9fb8 100644
--- a/media_softlet/agnostic/common/vp/hal/pipeline/vp_pipeline_adapter_base.cpp
+++ b/media_softlet/agnostic/common/vp/hal/pipeline/vp_pipeline_adapter_base.cpp
@@ -244,7 +244,7 @@ MOS_STATUS VpPipelineAdapterBase::GetStatusReport(
             continue;
         }
 
-#if (LINUX || ANDROID)
+#if (__linux__ || ANDROID)
         dwGpuTag = pOsContext->GetGPUTag(m_pOsInterface, pStatusEntry->GpuContextOrdinal);
 #else
         dwGpuTag = m_pOsInterface->pfnGetGpuStatusSyncTag(m_pOsInterface, pStatusEntry->GpuContextOrdinal);
@@ -271,7 +271,7 @@ MOS_STATUS VpPipelineAdapterBase::GetStatusReport(
         }
         else
         {  // here we have the first not ready entry.
-#if (LINUX || ANDROID)
+#if (__linux__ || ANDROID)
             uiNewHead = (uiIndex + 1) & (VPHAL_STATUS_TABLE_MAX_SIZE - 1);
 #else
             uiNewHead = uiIndex;
diff --git a/media_softlet/agnostic/common/vp/hal/utils/vp_dumper.cpp b/media_softlet/agnostic/common/vp/hal/utils/vp_dumper.cpp
index a9b641b4c30..c692de42828 100644
--- a/media_softlet/agnostic/common/vp/hal/utils/vp_dumper.cpp
+++ b/media_softlet/agnostic/common/vp/hal/utils/vp_dumper.cpp
@@ -1780,7 +1780,7 @@ void VpSurfaceDumper::GetSurfaceDumpSpec()
             UserFeatureData.StringData.pStringData,
             UserFeatureData.StringData.uSize);
     }
-#if !defined(LINUX) && !defined(ANDROID)
+#if !defined(__linux__) && !defined(ANDROID)
     else
     {
         std::string vphalDumpFilePath;
@@ -2319,7 +2319,7 @@ void VpParameterDumper::GetParametersDumpSpec()
             UserFeatureData.StringData.uSize);
         bDumpEnabled = true;
     }
-#if !defined(LINUX) && !defined(ANDROID)
+#if !defined(__linux__) && !defined(ANDROID)
     else
     {
         std::string vphalDumpFilePath;
@@ -3678,4 +3678,4 @@ const char * VpParameterDumper::GetDenoiseModeStr(VPHAL_NOISELEVEL noise_level)
 
     return nullptr;
 }
-#endif // (_DEBUG || _RELEASE_INTERNAL)
\ No newline at end of file
+#endif // (_DEBUG || _RELEASE_INTERNAL)
diff --git a/media_softlet/agnostic/common/vp/hal/utils/vp_dumper.h b/media_softlet/agnostic/common/vp/hal/utils/vp_dumper.h
index 0e543b19980..234485012a7 100644
--- a/media_softlet/agnostic/common/vp/hal/utils/vp_dumper.h
+++ b/media_softlet/agnostic/common/vp/hal/utils/vp_dumper.h
@@ -36,7 +36,7 @@
 #include "vphal_common.h"       // Common interfaces and structures
 #include "vp_pipeline_common.h"
 
-#if !defined(LINUX) && !defined(ANDROID)
+#if !defined(__linux__) && !defined(ANDROID)
 #include "UmdStateSeparation.h"
 #endif
 
@@ -822,4 +822,4 @@ MEDIA_CLASS_DEFINE_END(VpDumperTool)
 
 
 
-#endif // __VP_DUMPER_H__
\ No newline at end of file
+#endif // __VP_DUMPER_H__