diff --git a/adm/cmake/occt_csf.cmake b/adm/cmake/occt_csf.cmake
index 272fb9fdd6..ec05ffc76a 100644
--- a/adm/cmake/occt_csf.cmake
+++ b/adm/cmake/occt_csf.cmake
@@ -63,7 +63,7 @@ if (WIN32)
   set (CSF_gdi32         "gdi32.lib")
   set (CSF_user32        "user32.lib")
   set (CSF_wsock32       "wsock32.lib")
-  set (CSF_psapi         "Psapi.lib")
+  set (CSF_psapi         "psapi.lib")
   set (CSF_d3d9          "D3D9.lib")
   if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
     set (CSF_OpenGlLibs  "libEGL libGLESv2")
diff --git a/src/Draw/CommandWindow.cxx b/src/Draw/CommandWindow.cxx
index e7bf906535..5e9909dd5a 100644
--- a/src/Draw/CommandWindow.cxx
+++ b/src/Draw/CommandWindow.cxx
@@ -17,9 +17,9 @@
 #ifdef _WIN32
 #include <windows.h>
 
-#include <CommandWindow.h>
+#include <COMMANDWINDOW.h>
 #include <Draw_Window.hxx>
-#include <MainWindow.h>
+#include <MAINWINDOW.h>
 #include <Draw_Appli.hxx>
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/Draw/COMMANDWINDOW.h b/src/Draw/CommandWindow.h
similarity index 100%
rename from src/Draw/COMMANDWINDOW.h
rename to src/Draw/CommandWindow.h
diff --git a/src/Draw/FILES b/src/Draw/FILES
index b4eb578743..c43b33613f 100755
--- a/src/Draw/FILES
+++ b/src/Draw/FILES
@@ -1,5 +1,5 @@
 CommandWindow.cxx
-COMMANDWINDOW.h
+CommandWindow.h
 Draw.cxx
 Draw.hxx
 Draw_Appli.hxx
@@ -75,4 +75,4 @@ DrawRessource.h
 init.cxx
 init.h
 MainWindow.cxx
-MAINWINDOW.h
+MainWindow.h
diff --git a/src/Draw/MAINWINDOW.h b/src/Draw/MainWindow.h
similarity index 98%
rename from src/Draw/MAINWINDOW.h
rename to src/Draw/MainWindow.h
index db092a750c..6957cd29a9 100644
--- a/src/Draw/MAINWINDOW.h
+++ b/src/Draw/MainWindow.h
@@ -26,7 +26,7 @@
 /*
 ** PROCEDURES DE MAIN WINDOW
 */
-#include <Windows.h>
+#include <windows.h>
 
 LRESULT APIENTRY WndProc(HWND, UINT, WPARAM, LPARAM);
 BOOL CreateProc(HWND);
diff --git a/src/OSD/OSD.cxx b/src/OSD/OSD.cxx
index 38a28e6c28..b8c975744c 100644
--- a/src/OSD/OSD.cxx
+++ b/src/OSD/OSD.cxx
@@ -61,7 +61,7 @@ Standard_Boolean OSD::CStringToReal(const Standard_CString aString,
 //=======================================================================
 
 #ifdef _WIN32
-# include <Windows.h>
+# include <windows.h>
 # define SLEEP(NSEC)                 Sleep(1000*(NSEC))
 #else
 #include <unistd.h>
diff --git a/src/OSD/OSD_Error.cxx b/src/OSD/OSD_Error.cxx
index 0be6517c95..89c1b35108 100755
--- a/src/OSD/OSD_Error.cxx
+++ b/src/OSD/OSD_Error.cxx
@@ -448,7 +448,7 @@ void OSD_Error::Perror() {
 #include <TCollection_ExtendedString.hxx>
 
 #include <windows.h>
-#include <Strsafe.h>
+#include <strsafe.h>
 
 typedef struct _error_table {
 
diff --git a/src/OSD/OSD_File.cxx b/src/OSD/OSD_File.cxx
index 43ef8a2370..4b759ed147 100644
--- a/src/OSD/OSD_File.cxx
+++ b/src/OSD/OSD_File.cxx
@@ -34,7 +34,7 @@
   #include <stdio.h>
   #include <io.h>
 
-  #include <Strsafe.h>
+  #include <strsafe.h>
 
   #define ACE_HEADER_SIZE (sizeof(ACCESS_ALLOWED_ACE) - sizeof (DWORD))
 
diff --git a/src/OSD/OSD_FileNode.cxx b/src/OSD/OSD_FileNode.cxx
index 2ffcd5fe42..5155543808 100644
--- a/src/OSD/OSD_FileNode.cxx
+++ b/src/OSD/OSD_FileNode.cxx
@@ -379,7 +379,7 @@ Standard_Integer OSD_FileNode::Error()const{
 # include <tchar.h>
 #endif  // _INC_TCHAR
 
-#include <Strsafe.h>
+#include <strsafe.h>
 
 #define TEST_RAISE( arg ) _test_raise (  fName, ( arg )  )
 #define RAISE( arg ) throw Standard_ProgramError (  ( arg )  )
diff --git a/src/OSD/OSD_MemInfo.cxx b/src/OSD/OSD_MemInfo.cxx
index 2d578d8bd4..d5eda9ee26 100644
--- a/src/OSD/OSD_MemInfo.cxx
+++ b/src/OSD/OSD_MemInfo.cxx
@@ -18,7 +18,7 @@
   #include <winbase.h>
   #include <process.h>
   #include <malloc.h>
-  #include <Psapi.h>
+  #include <psapi.h>
   #ifdef _MSC_VER
     #pragma comment(lib, "Psapi.lib")
   #endif
diff --git a/src/OSD/OSD_Process.cxx b/src/OSD/OSD_Process.cxx
index 8742261465..47178c9708 100644
--- a/src/OSD/OSD_Process.cxx
+++ b/src/OSD/OSD_Process.cxx
@@ -182,7 +182,7 @@ Standard_Integer OSD_Process::Error()const{
 #include <TCollection_ExtendedString.hxx>
 
 #include <OSD_WNT.hxx>
-#include <LMCONS.H> // for UNLEN - maximum user name length GetUserName()
+#include <lmcons.h> // for UNLEN - maximum user name length GetUserName()
 
 void _osd_wnt_set_error ( OSD_Error&, OSD_WhoAmI, ... );
 
diff --git a/src/OSD/OSD_WNT.cxx b/src/OSD/OSD_WNT.cxx
index 8bc78152e9..ef38d808fa 100644
--- a/src/OSD/OSD_WNT.cxx
+++ b/src/OSD/OSD_WNT.cxx
@@ -23,7 +23,7 @@
 /***/
 #include <OSD_WNT.hxx>
 
-#include <Strsafe.h>
+#include <strsafe.h>
 #include <wchar.h>
 #include <stdlib.h>
 
diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx
index 06b6394039..79031e6287 100644
--- a/src/OSD/OSD_signal.cxx
+++ b/src/OSD/OSD_signal.cxx
@@ -39,7 +39,7 @@ Standard_Boolean OSD::ToCatchFloatingSignals()
 #endif
 #include <windows.h>
 
-#include <Strsafe.h>
+#include <strsafe.h>
 
 #ifndef STATUS_FLOAT_MULTIPLE_FAULTS
   // <ntstatus.h>
diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx
index b75854a308..81889b4b26 100644
--- a/src/Standard/Standard_MMgrOpt.cxx
+++ b/src/Standard/Standard_MMgrOpt.cxx
@@ -35,7 +35,7 @@ extern "C" int getpagesize() ;
 #endif
 
 #ifdef _WIN32
-#include <Strsafe.h>
+#include <strsafe.h>
 #endif
 //======================================================================
 // Assumptions