diff --git a/.gitattributes b/.gitattributes
index 5407d0f4a2..efe568a036 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3702,7 +3702,6 @@ packages/fcl-net/src/servlets.pp svneol=native#text/plain
 packages/fcl-net/src/ssockets.pp svneol=native#text/plain
 packages/fcl-net/src/unix/resolve.inc svneol=native#text/plain
 packages/fcl-net/src/win/resolve.inc svneol=native#text/plain
-packages/fcl-net/src/wince/resolve.inc svneol=native#text/plain
 packages/fcl-net/src/xmlrpc.pp svneol=native#text/plain
 packages/fcl-passrc/Makefile svneol=native#text/plain
 packages/fcl-passrc/Makefile.fpc svneol=native#text/plain
diff --git a/packages/fcl-net/src/fpsock.pp b/packages/fcl-net/src/fpsock.pp
index ab98e168b4..4144f8d869 100644
--- a/packages/fcl-net/src/fpsock.pp
+++ b/packages/fcl-net/src/fpsock.pp
@@ -12,6 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
 
+{$mode objfpc}
+{$H+}
+
 unit fpSock;
 
 interface
diff --git a/packages/fcl-net/src/httpbase.pp b/packages/fcl-net/src/httpbase.pp
index 13d370859c..72699a4a7d 100644
--- a/packages/fcl-net/src/httpbase.pp
+++ b/packages/fcl-net/src/httpbase.pp
@@ -11,11 +11,14 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
 
+{$mode objfpc}
+{$H+}
 
 unit HTTPBase;
 
 interface
 
+
 uses Classes, fpAsync;
 
 const
diff --git a/packages/fcl-net/src/httpclient.pp b/packages/fcl-net/src/httpclient.pp
index bd0f2b5f26..b4475a0329 100644
--- a/packages/fcl-net/src/httpclient.pp
+++ b/packages/fcl-net/src/httpclient.pp
@@ -16,6 +16,9 @@ unit HTTPClient;
 
 interface
 
+{$mode objfpc}
+{$H+}
+
 uses Classes, HTTPBase, fpSock, fpAsync;
 
 type
diff --git a/packages/fcl-net/src/httpsvlt.pp b/packages/fcl-net/src/httpsvlt.pp
index 4ea65f3290..24364711c3 100644
--- a/packages/fcl-net/src/httpsvlt.pp
+++ b/packages/fcl-net/src/httpsvlt.pp
@@ -14,6 +14,9 @@
 
 unit HTTPSvlt;
 
+{$Mode objfpc}
+{$H+}
+
 interface
 
 uses SysUtils, Classes, fpAsync, fpSock, HTTPBase, Servlets;
diff --git a/packages/fcl-net/src/mkxmlrpc.pp b/packages/fcl-net/src/mkxmlrpc.pp
index 978dafbfb2..10113404b3 100644
--- a/packages/fcl-net/src/mkxmlrpc.pp
+++ b/packages/fcl-net/src/mkxmlrpc.pp
@@ -11,9 +11,11 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
-
-
 program MkXMLRPC;
+
+{$mode objfpc}
+{$H+}
+
 uses SysUtils, Classes, PParser, PasTree, PasWrite;
 
 resourcestring
diff --git a/packages/fcl-net/src/servlets.pp b/packages/fcl-net/src/servlets.pp
index 647f421783..85eaba8253 100644
--- a/packages/fcl-net/src/servlets.pp
+++ b/packages/fcl-net/src/servlets.pp
@@ -11,7 +11,7 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
-
+{$mode objfpc}{$H+}
 unit Servlets;
 
 interface
diff --git a/packages/fcl-net/src/ssockets.pp b/packages/fcl-net/src/ssockets.pp
index 5ee0f729c7..a8f50e82a5 100644
--- a/packages/fcl-net/src/ssockets.pp
+++ b/packages/fcl-net/src/ssockets.pp
@@ -10,7 +10,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-{$MODE objfpc}
+{$MODE objfpc}{$H+}
 
 unit ssockets;
 
diff --git a/packages/fcl-net/src/wince/resolve.inc b/packages/fcl-net/src/wince/resolve.inc
deleted file mode 100644
index 2ee0803667..0000000000
--- a/packages/fcl-net/src/wince/resolve.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-
-uses winsock;
-
-Type
-  PHostEntry = PHostEnt;
-  PNetEntry = PNetEnt;
-  PServEntry = PServEnt;
-
-Const
-  DNSErr : Integer = 0;
-
-function getnetbyname ( Name : pchar) : PNetEntry;
-
-begin
-  DNSErr:=-1;
-  Result:=Nil;
-end;
-
-function getnetbyaddr ( Net : Longint; nettype : Longint) : PNetEntry;
-
-begin
-  DNSErr:=-2;
-  Result:=Nil;
-end;
-
-Function GetDNSError : Longint;
-
-begin
-  If DNSErr<>0 then
-    begin
-    GetDNSError:=-DNSErr;
-    DNSErr:=0;
-    end
-  else
-    GetDNSError:=0; // Must get win32 error ?
-end;
-
-Function InitResolve : Boolean;
-
-var
-   wsaData : TWsaData;
-
-begin
-  Result:=WSAStartup(1,wsaData)=0;
-end;
-
-Function FinalResolve : Boolean;
-
-begin
-  Result:=True;
-end;
diff --git a/packages/fcl-net/src/xmlrpc.pp b/packages/fcl-net/src/xmlrpc.pp
index e9bc8448c0..a998df30b3 100644
--- a/packages/fcl-net/src/xmlrpc.pp
+++ b/packages/fcl-net/src/xmlrpc.pp
@@ -11,7 +11,7 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
-
+{$mode objfpc}{$H+}
 unit XMLRPC;
 
 interface