diff --git a/compiler/pdecsub.pas b/compiler/pdecsub.pas
index 76b19db171..897be186a1 100644
--- a/compiler/pdecsub.pas
+++ b/compiler/pdecsub.pas
@@ -2352,6 +2352,7 @@ begin
     pd.proccalloption:=pocall_cdecl
   else
     pd.proccalloption:=pocall_stdcall;
+  include(pd.procoptions,po_hascallingconvention);
 end;
 
 
diff --git a/packages/winunits-base/src/httpapi.pp b/packages/winunits-base/src/httpapi.pp
index edf862db79..efd6566213 100644
--- a/packages/winunits-base/src/httpapi.pp
+++ b/packages/winunits-base/src/httpapi.pp
@@ -64,23 +64,6 @@ interface
 {$PACKRECORDS C}
 {$ENDIF}
 
-{$IFDEF VER3_0}
-  type
-    PWSTR = PWideChar;
-
-{$MACRO ON}
-{$DEFINE winapi:=stdcall}
-
-{$ENDIF}
-
-  type
-    SOCKADDR_STORAGE = record
-      ss_family: Int16;
-      __ss_pad1: array[0..47] of Byte;
-      __ss_align: Int64;
-      __ss_pad2: array[0..64] of Byte;
-    end;
-
   const
     HTTP_INITIALIZE_SERVER = $00000001;    
     HTTP_INITIALIZE_CONFIG = $00000002;