Index: common/CRT/free.cpp
===================================================================
--- common/CRT/free.cpp	(revision 1425)
+++ common/CRT/free.cpp	(working copy)
@@ -1,5 +1,5 @@
+#include <windows.h>
 #include "crt.hpp"
-#include <windows.h>
 
 void __cdecl free(void *block)
 {
Index: common/CRT/malloc.cpp
===================================================================
--- common/CRT/malloc.cpp	(revision 1425)
+++ common/CRT/malloc.cpp	(working copy)
@@ -1,5 +1,5 @@
+#include <windows.h>
 #include "crt.hpp"
-#include <windows.h>
 
 void * __cdecl malloc(size_t size)
 {
Index: common/CRT/realloc.cpp
===================================================================
--- common/CRT/realloc.cpp	(revision 1425)
+++ common/CRT/realloc.cpp	(working copy)
@@ -1,5 +1,5 @@
+#include <windows.h>
 #include "crt.hpp"
-#include <windows.h>
 
 void * __cdecl realloc(void *block, size_t size)
 {
Index: common/CRT/strdup.cpp
===================================================================
--- common/CRT/strdup.cpp	(revision 1425)
+++ common/CRT/strdup.cpp	(working copy)
@@ -1,5 +1,5 @@
+#include <windows.h>
 #include "crt.hpp"
-#include <windows.h>
 
 TCHAR * __cdecl
 #ifndef UNICODE
Index: emenu/Plugin.h
===================================================================
--- emenu/Plugin.h	(revision 1425)
+++ emenu/Plugin.h	(working copy)
@@ -1,8 +1,8 @@
 #ifndef _PLUGIN_H_
 #define _PLUGIN_H_
 
+#include "plugin.hpp"
 #include <CRT/crt.hpp>
-#include "plugin.hpp"
 #include <shlobj.h>
 #include <tchar.h>
 #include "auto_sz.h"
Index: farcmds/FARCmds.cpp
===================================================================
--- farcmds/FARCmds.cpp	(revision 1425)
+++ farcmds/FARCmds.cpp	(working copy)
@@ -1,6 +1,6 @@
 #define _FAR_USE_FARFINDDATA
+#include <plugin.hpp>
 #include <CRT/crt.hpp>
-#include <plugin.hpp>
 #include "farcmds.hpp"
 #include "lang.hpp"
 
Index: hlfviewer/HlfViewer.cpp
===================================================================
--- hlfviewer/HlfViewer.cpp	(revision 1425)
+++ hlfviewer/HlfViewer.cpp	(working copy)
@@ -1,7 +1,7 @@
 #define STRICT
 #define _FAR_USE_FARFINDDATA
+#include <plugin.hpp>
 #include <CRT/crt.hpp>
-#include <plugin.hpp>
 #include <farkeys.hpp>
 #include "HlfViewer.hpp"
 #include "lang.hpp"
Index: network/makefile_vc
===================================================================
--- network/makefile_vc	(revision 1425)
+++ network/makefile_vc	(working copy)
@@ -13,8 +13,9 @@
 $(OBJDIR)\NetReg.obj
 
 !if defined(DEBUG) && !defined(NO_LOG)
-USERCPP=/DNETWORK_LOGGING
-NEEDDEFLIB=1
+USERCPP = /DNETWORK_LOGGING
+NEEDDEFLIB = 1
+NEEDENTRY = 1
 !endif
 
 !include ..\makefile_vc_def_inc
Index: network/NetCfg.cpp
===================================================================
--- network/NetCfg.cpp	(revision 1425)
+++ network/NetCfg.cpp	(working copy)
@@ -1,7 +1,7 @@
-#include "NetCfg.hpp"
 #include "NetCommon.hpp"
 #include "NetFavorites.hpp"
 #include "NetReg.hpp"
+#include "NetCfg.hpp"
 
 const TCHAR *StrAddToDisksMenu=_T("AddToDisksMenu");
 const TCHAR *StrAddToPluginsMenu=_T("AddToPluginsMenu");
Index: network/NetClass.cpp
===================================================================
--- network/NetClass.cpp	(revision 1425)
+++ network/NetClass.cpp	(working copy)
@@ -1,8 +1,8 @@
-#include "NetClass.hpp"
+#include "NetCommon.hpp"
 #include "NetFavorites.hpp"
-#include "NetCommon.hpp"
 #include "NetReg.hpp"
 #include "NetCfg.hpp"
+#include "NetClass.hpp"
 
 NetResourceList *CommonRootResources;
 BOOL SavedCommonRootResources = FALSE;
Index: network/NetNT.cpp
===================================================================
--- network/NetNT.cpp	(revision 1425)
+++ network/NetNT.cpp	(working copy)
@@ -1,5 +1,5 @@
+#include "NetCommon.hpp"
 #include "NetClass.hpp"
-#include "NetCommon.hpp"
 
 void NetBrowser::GetHideShareNT()
 {