diff --git a/include/dxc/dxcapi.h b/include/dxc/dxcapi.h
index 98f9b42327..897368c07b 100644
--- a/include/dxc/dxcapi.h
+++ b/include/dxc/dxcapi.h
@@ -55,7 +55,7 @@ typedef HRESULT(__stdcall *DxcCreateInstance2Proc)(
 /// The CLSID associated with the data and code that will be used to create the object.
 /// </param>
 /// <param name="riid">
-/// A reference to the identifier of the interface to be used to communicate 
+/// A reference to the identifier of the interface to be used to communicate
 /// with the object.
 /// </param>
 /// <param name="ppv">
diff --git a/include/dxc/dxcapi.internal.h b/include/dxc/dxcapi.internal.h
index 1381ea6608..2acabebcf8 100644
--- a/include/dxc/dxcapi.internal.h
+++ b/include/dxc/dxcapi.internal.h
@@ -138,7 +138,7 @@ IDxcIntrinsicTable : public IUnknown
 
   // Get the lowering strategy for an hlsl extension intrinsic.
   virtual HRESULT STDMETHODCALLTYPE GetLoweringStrategy(UINT opcode, LPCSTR *pStrategy) = 0;
-  
+
   // Callback to support custom naming of hlsl extension intrinsic functions in dxil.
   // Return the empty string to get the default intrinsic name, which is the mangled
   // name of the high level intrinsic function.
diff --git a/include/dxc/dxctools.h b/include/dxc/dxctools.h
index 98a91d9221..49a2830f51 100644
--- a/include/dxc/dxctools.h
+++ b/include/dxc/dxctools.h
@@ -68,9 +68,9 @@ IDxcRewriter2 : public IDxcRewriter {
 
   virtual HRESULT STDMETHODCALLTYPE RewriteWithOptions(_In_ IDxcBlobEncoding *pSource,
                                                      // Optional file name for pSource. Used in errors and include handlers.
-                                                     _In_opt_ LPCWSTR pSourceName, 
+                                                     _In_opt_ LPCWSTR pSourceName,
                                                      // Compiler arguments
-                                                     _In_count_(argCount) LPCWSTR *pArguments, _In_ UINT32 argCount, 
+                                                     _In_count_(argCount) LPCWSTR *pArguments, _In_ UINT32 argCount,
                                                      // Defines
                                                      _In_count_(defineCount) DxcDefine *pDefines, _In_ UINT32 defineCount,
                                                      // user-provided interface to handle #include directives (optional)
diff --git a/lib/HLSL/DxilContainerReflection.cpp b/lib/HLSL/DxilContainerReflection.cpp
index ceb8cf9255..5235a9a9c3 100644
--- a/lib/HLSL/DxilContainerReflection.cpp
+++ b/lib/HLSL/DxilContainerReflection.cpp
@@ -390,7 +390,7 @@ HRESULT DxilContainerReflection::GetPartReflection(UINT32 idx, REFIID iid, void
       }
     }
   }
-  
+
   const DxilProgramHeader *pProgramHeader =
     reinterpret_cast<const DxilProgramHeader*>(GetDxilPartData(pPart));
   if (!IsValidDxilProgramHeader(pProgramHeader, pPart->PartSize)) {
@@ -2566,9 +2566,9 @@ HRESULT CFunctionReflection::GetDesc(D3D12_FUNCTION_DESC *pDesc) {
   pDesc->BoundResources = (UINT)m_UsedResources.size();
 
   //Unset:  UINT                    InstructionCount;            // Number of emitted instructions
-  //Unset:  UINT                    TempRegisterCount;           // Number of temporary registers used 
+  //Unset:  UINT                    TempRegisterCount;           // Number of temporary registers used
   //Unset:  UINT                    TempArrayCount;              // Number of temporary arrays used
-  //Unset:  UINT                    DefCount;                    // Number of constant defines 
+  //Unset:  UINT                    DefCount;                    // Number of constant defines
   //Unset:  UINT                    DclCount;                    // Number of declarations (input + output)
   //Unset:  UINT                    TextureNormalInstructions;   // Number of non-categorized texture instructions
   //Unset:  UINT                    TextureLoadInstructions;     // Number of texture load instructions
diff --git a/tools/clang/tools/dxcompiler/dxcapi.cpp b/tools/clang/tools/dxcompiler/dxcapi.cpp
index e0785f4e44..7fc8fb1988 100644
--- a/tools/clang/tools/dxcompiler/dxcapi.cpp
+++ b/tools/clang/tools/dxcompiler/dxcapi.cpp
@@ -83,7 +83,7 @@ HRESULT CreateDxcContainerReflection(_In_ REFIID riid, _Out_ LPVOID *ppv) {
 }
 
 HRESULT CreateDxcContainerBuilder(_In_ REFIID riid, _Out_ LPVOID *ppv) {
-  // Call dxil.dll's containerbuilder 
+  // Call dxil.dll's containerbuilder
   *ppv = nullptr;
   const char *warning;
   HRESULT hr = DxilLibCreateInstance(CLSID_DxcContainerBuilder, (IDxcContainerBuilder**)ppv);
diff --git a/tools/clang/tools/dxcompiler/dxcompilerobj.cpp b/tools/clang/tools/dxcompiler/dxcompilerobj.cpp
index 69a072a54f..53c3147b48 100644
--- a/tools/clang/tools/dxcompiler/dxcompilerobj.cpp
+++ b/tools/clang/tools/dxcompiler/dxcompilerobj.cpp
@@ -367,7 +367,7 @@ class HLSLExtensionsCodegenHelperImpl : public HLSLExtensionsCodegenHelper {
   virtual std::string GetIntrinsicName(UINT opcode) override {
     return m_langExtensionsHelper.GetIntrinsicName(opcode);
   }
-  
+
   virtual bool GetDxilOpcode(UINT opcode, OP::OpCode &dxilOpcode) override {
     UINT dop = static_cast<UINT>(OP::OpCode::NumOpCodes);
     if (m_langExtensionsHelper.GetDxilOpCode(opcode, dop)) {
@@ -436,7 +436,7 @@ class DxcCompiler : public IDxcCompiler3,
 
   HRESULT STDMETHODCALLTYPE RegisterDxilContainerEventHandler(IDxcContainerEventsHandler *pHandler, UINT64 *pCookie) override {
     DXASSERT(m_pDxcContainerEventsHandler == nullptr, "else events handler is already registered");
-    *pCookie = 1; // Only one EventsHandler supported 
+    *pCookie = 1; // Only one EventsHandler supported
     m_pDxcContainerEventsHandler = pHandler;
     return S_OK;
   };
@@ -965,7 +965,7 @@ class DxcCompiler : public IDxcCompiler3,
 
     HRESULT hr = S_OK;
     DxcEtw_DXCompilerDisassemble_Start();
-    DxcThreadMalloc TM(m_pMalloc); 
+    DxcThreadMalloc TM(m_pMalloc);
     try {
       DefaultFPEnvScope fpEnvScope;