diff --git a/uppsrc/Core/Socket.cpp b/uppsrc/Core/Socket.cpp
index aa32c71..53e4df6 100644
--- a/uppsrc/Core/Socket.cpp
+++ b/uppsrc/Core/Socket.cpp
@@ -2,7 +2,7 @@
 
 #ifdef PLATFORM_WIN32
 #include <winsock2.h>
-#include <Ws2tcpip.h>
+#include <ws2tcpip.h>
 #endif
 
 #ifdef PLATFORM_POSIX
diff --git a/uppsrc/CtrlCore/Win32Gui.h b/uppsrc/CtrlCore/Win32Gui.h
index 9f94afd..38e6c9d 100644
--- a/uppsrc/CtrlCore/Win32Gui.h
+++ b/uppsrc/CtrlCore/Win32Gui.h
@@ -355,7 +355,7 @@ END_UPP_NAMESPACE
 #ifdef PLATFORM_WIN32
 #ifndef PLATFORM_WINCE
 
-#include <ShellAPI.h>
+#include <shellapi.h>
 
 #endif
 #endif
diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init
index 1dffbde..834bce0 100644
--- a/uppsrc/CtrlCore/init
+++ b/uppsrc/CtrlCore/init
@@ -1,9 +1,9 @@
-#ifndef _CtrlCore_icpp_init_stub
-#define _CtrlCore_icpp_init_stub
-#include "Draw/init"
-#include "plugin\bmp/init"
-#include "RichText/init"
-#define BLITZ_INDEX__ Fabd53e6bbfc025249fe3b02cd8be7b6c
-#include "CtrlCore.icpp"
-#undef BLITZ_INDEX__
-#endif
+#ifndef _CtrlCore_icpp_init_stub
+#define _CtrlCore_icpp_init_stub
+#include "Draw/init"
+#include "plugin\bmp/init"
+#include "RichText/init"
+#define BLITZ_INDEX__ Fabd53e6bbfc025249fe3b02cd8be7b6c
+#include "CtrlCore.icpp"
+#undef BLITZ_INDEX__
+#endif
diff --git a/uppsrc/CtrlLib/TrayIconWin32.cpp b/uppsrc/CtrlLib/TrayIconWin32.cpp
index 7117a9c..ceedc1f 100644
--- a/uppsrc/CtrlLib/TrayIconWin32.cpp
+++ b/uppsrc/CtrlLib/TrayIconWin32.cpp
@@ -5,7 +5,7 @@
 
 #include <commdlg.h>
 #include <cderr.h>
-#include <ShellApi.h>
+#include <shellapi.h>
 
 #endif
 #endif
diff --git a/uppsrc/CtrlLib/init b/uppsrc/CtrlLib/init
index 0451555..8465b81 100644
--- a/uppsrc/CtrlLib/init
+++ b/uppsrc/CtrlLib/init
@@ -1,8 +1,8 @@
-#ifndef _CtrlLib_icpp_init_stub
-#define _CtrlLib_icpp_init_stub
-#include "CtrlCore/init"
-#include "PdfDraw/init"
-#define BLITZ_INDEX__ F73a88dfc92373ef6f2379fafa069fdce
-#include "CtrlLib.icpp"
-#undef BLITZ_INDEX__
-#endif
+#ifndef _CtrlLib_icpp_init_stub
+#define _CtrlLib_icpp_init_stub
+#include "CtrlCore/init"
+#include "PdfDraw/init"
+#define BLITZ_INDEX__ F73a88dfc92373ef6f2379fafa069fdce
+#include "CtrlLib.icpp"
+#undef BLITZ_INDEX__
+#endif
diff --git a/uppsrc/ide/Debuggers/Pdb.h b/uppsrc/ide/Debuggers/Pdb.h
index f254ffe..f4efcd7 100644
--- a/uppsrc/ide/Debuggers/Pdb.h
+++ b/uppsrc/ide/Debuggers/Pdb.h
@@ -1,5 +1,5 @@
-#include <WinVer.h>
-#include <DbgHelp.h>
+#include <winver.h>
+#include <dbghelp.h>
 #include <psapi.h>
 #include "cvconst.h"
 
diff --git a/uppsrc/ide/Debuggers/init b/uppsrc/ide/Debuggers/init
index 027b31c..8194b9f 100644
--- a/uppsrc/ide/Debuggers/init
+++ b/uppsrc/ide/Debuggers/init
@@ -1,9 +1,9 @@
-#ifndef _ide_Debuggers_icpp_init_stub
-#define _ide_Debuggers_icpp_init_stub
-#include "ide\Common/init"
-#include "plugin\ndisasm/init"
-#include "HexView/init"
-#define BLITZ_INDEX__ Ff98dcbb6b07843a5d0dee1900fadafd0
-#include "UppSimplifiers.icpp"
-#undef BLITZ_INDEX__
-#endif
+#ifndef _ide_Debuggers_icpp_init_stub
+#define _ide_Debuggers_icpp_init_stub
+#include "ide\Common/init"
+#include "plugin\ndisasm/init"
+#include "HexView/init"
+#define BLITZ_INDEX__ Ff98dcbb6b07843a5d0dee1900fadafd0
+#include "UppSimplifiers.icpp"
+#undef BLITZ_INDEX__
+#endif
diff --git a/uppsrc/ide/SrcUpdater/SrcUpdater.h b/uppsrc/ide/SrcUpdater/SrcUpdater.h
index eb6b01d..05e2fca 100644
--- a/uppsrc/ide/SrcUpdater/SrcUpdater.h
+++ b/uppsrc/ide/SrcUpdater/SrcUpdater.h
@@ -5,7 +5,7 @@
 #include <usvn/usvn.h>
 #include <ide/version.h>
 
-#ifndef PLATFORM_POSIX
+#if !defined(PLATFORM_POSIX) && !defined(flagWIN32)
 #error Updater is only implemented for POSIX compliant platforms
 #endif
 
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index 5816486..cedf024 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -668,7 +668,7 @@ void Uninstall();
 bool SilentMode;
 
 #ifdef PLATFORM_WIN32
-#include <Wincon.h>
+#include <wincon.h>
 
 void Puts(const char *s)
 {
diff --git a/uppsrc/ide/init b/uppsrc/ide/init
index dc2d332..a677f8e 100644
--- a/uppsrc/ide/init
+++ b/uppsrc/ide/init
@@ -1,23 +1,23 @@
-#ifndef _ide_icpp_init_stub
-#define _ide_icpp_init_stub
-#include "ide\Common/init"
-#include "ide\Core/init"
-#include "ide\LayDes/init"
-#include "ide\IconDes/init"
-#include "ide\Builders/init"
-#include "ide\Debuggers/init"
-#include "ide\Browser/init"
-#include "CodeEditor/init"
-#include "CtrlLib/init"
-#include "plugin\bz2/init"
-#include "HexView/init"
-#include "art\BlueBar/init"
-#include "plugin/astyle/init"
-#include "usvn/init"
-#include "TextDiffCtrl/init"
-#include "TabBar/init"
-#include "ide/Designers/init"
-#include "ide/Android/init"
-#include "ide/Java/init"
-#include "ide\SrcUpdater/init"
-#endif
+#ifndef _ide_icpp_init_stub
+#define _ide_icpp_init_stub
+#include "ide\Common/init"
+#include "ide\Core/init"
+#include "ide\LayDes/init"
+#include "ide\IconDes/init"
+#include "ide\Builders/init"
+#include "ide\Debuggers/init"
+#include "ide\Browser/init"
+#include "CodeEditor/init"
+#include "CtrlLib/init"
+#include "plugin\bz2/init"
+#include "HexView/init"
+#include "art\BlueBar/init"
+#include "plugin/astyle/init"
+#include "usvn/init"
+#include "TextDiffCtrl/init"
+#include "TabBar/init"
+#include "ide/Designers/init"
+#include "ide/Android/init"
+#include "ide/Java/init"
+#include "ide\SrcUpdater/init"
+#endif
diff --git a/uppsrc/plugin/bz2/init b/uppsrc/plugin/bz2/init
index 04b47c2..562898c 100644
--- a/uppsrc/plugin/bz2/init
+++ b/uppsrc/plugin/bz2/init
@@ -1,4 +1,4 @@
-#ifndef _plugin_bz2_icpp_init_stub
-#define _plugin_bz2_icpp_init_stub
-#include "Core/init"
-#endif
+#ifndef _plugin_bz2_icpp_init_stub
+#define _plugin_bz2_icpp_init_stub
+#include "Core/init"
+#endif