diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 7d98f03..707a93c 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -1,3 +1,7 @@
+if(WIN32)
+  return()
+endif()
+
 set(CMAKE_C_VERBOSE_FLAG "-v")
 
 set(CMAKE_C_FLAGS_INIT "")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 36a838d..4a4786e 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -1,3 +1,7 @@
+if(WIN32)
+  return()
+endif()
+
 set(CMAKE_CXX_VERBOSE_FLAG "-v")
 
 set(CMAKE_CXX_FLAGS_INIT "")
diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake
index 34e6b37..a0a0212 100644
--- a/Modules/Platform/Windows-Intel.cmake
+++ b/Modules/Platform/Windows-Intel.cmake
@@ -25,4 +25,5 @@ macro(__windows_compiler_intel lang)
   foreach(rule CREATE_SHARED_LIBRARY CREATE_SHARED_MODULE LINK_EXECUTABLE)
     string(REPLACE "<CMAKE_LINKER>" "xilink" CMAKE_${lang}_${rule} "${CMAKE_${lang}_${rule}}")
   endforeach()
+  set(CMAKE_DEPFILE_FLAGS_${lang} "/QMMD /QMT <OBJECT> /QMF <DEPFILE>")
 endmacro()

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 26eadbe..d1c7530 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -360,11 +360,12 @@ cmNinjaTargetGenerator
 
   cmMakefile* mf = this->GetMakefile();
 
-  const bool usingMSVC = std::string("MSVC") ==
-                       (mf->GetDefinition("CMAKE_C_COMPILER_ID") ?
+  const std::string cId = (mf->GetDefinition("CMAKE_C_COMPILER_ID") ?
                     mf->GetSafeDefinition("CMAKE_C_COMPILER_ID") :
                     mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"));
 
+  const bool usingMSVC = (cId == "MSVC" || cId == "Intel");
+
   // Tell ninja dependency format so all deps can be loaded into a database
   std::string deptype;
   std::string depfile;