diff --git a/.gitattributes b/.gitattributes
index 7761b69595..7b75acdd16 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1014,13 +1014,13 @@ fcl/unix/pipes.inc svneol=native#text/plain
 fcl/unix/process.inc svneol=native#text/plain
 fcl/unix/resolve.inc svneol=native#text/plain
 fcl/unix/simpleipc.inc svneol=native#text/plain
-fcl/win32/eventlog.inc svneol=native#text/plain
+fcl/win/eventlog.inc svneol=native#text/plain
+fcl/win/pipes.inc svneol=native#text/plain
 fcl/win32/fclel.mc -text
 fcl/win32/fclel.rc -text
 fcl/win32/fclel.res -text
 fcl/win32/fileinfo.pp svneol=native#text/plain
 fcl/win32/httpapp.pp svneol=native#text/plain
-fcl/win32/pipes.inc svneol=native#text/plain
 fcl/win32/process.inc svneol=native#text/plain
 fcl/win32/resolve.inc svneol=native#text/plain
 fcl/win32/simpleipc.inc svneol=native#text/plain
diff --git a/fcl/Makefile b/fcl/Makefile
index f9f28e5481..7e17f7071f 100644
--- a/fcl/Makefile
+++ b/fcl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/18]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince powerpc64-linux
@@ -942,7 +942,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
 override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  win
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
@@ -1038,7 +1038,7 @@ ifeq ($(FULL_TARGET),x86_64-freebsd)
 override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  win
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
diff --git a/fcl/Makefile.fpc b/fcl/Makefile.fpc
index 250d6bf579..648c16bc4a 100644
--- a/fcl/Makefile.fpc
+++ b/fcl/Makefile.fpc
@@ -55,6 +55,8 @@ includedir_solaris=unix
 includedir_qnx=unix
 includedir_beos=unix
 includedir_emx=os2
+includedir_win32=win
+includedir_win64=win
 sourcedir=$(OS_TARGET) inc
 
 [install]
diff --git a/fcl/inc/pipes.pp b/fcl/inc/pipes.pp
index 9c3897899d..9df07726e6 100644
--- a/fcl/inc/pipes.pp
+++ b/fcl/inc/pipes.pp
@@ -43,7 +43,7 @@ Type
       Function Read (Var Buffer; Count : Longint) : longint; Override;
     end;
 
-Function CreatePipeHandles (Var Inhandle,OutHandle : Longint) : Boolean;
+Function CreatePipeHandles (Var Inhandle,OutHandle : THandle) : Boolean;
 Procedure CreatePipeStreams (Var InPipe : TInputPipeStream;
                              Var OutPipe : TOutputPipeStream);
 
@@ -60,7 +60,7 @@ Implementation
 Procedure CreatePipeStreams (Var InPipe : TInputPipeStream;
                              Var OutPipe : TOutputPipeStream);
 
-Var InHandle,OutHandle : Longint;
+Var InHandle,OutHandle : THandle;
 
 begin
   if CreatePipeHandles (InHandle, OutHandle) then
diff --git a/fcl/win32/eventlog.inc b/fcl/win/eventlog.inc
similarity index 100%
rename from fcl/win32/eventlog.inc
rename to fcl/win/eventlog.inc
diff --git a/fcl/win32/pipes.inc b/fcl/win/pipes.inc
similarity index 91%
rename from fcl/win32/pipes.inc
rename to fcl/win/pipes.inc
index f5a47e23d1..2743f2b7aa 100644
--- a/fcl/win32/pipes.inc
+++ b/fcl/win/pipes.inc
@@ -2,7 +2,7 @@
     This file is part of the Free Pascal run time library.
     Copyright (c) 1998 by Michael Van Canneyt
 
-    Win32 part of pipe stream.
+    Win part of pipe stream.
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -28,7 +28,7 @@ Const piInheritablePipe : TSecurityAttributes = (
       PipeBufSize = 1024;
 
 
-Function CreatePipeHandles (Var Inhandle,OutHandle : Longint) : Boolean;
+Function CreatePipeHandles (Var Inhandle,OutHandle : THandle) : Boolean;
 
 begin
   Result := CreatePipe (@Inhandle,@OutHandle,@piInheritablePipe,PipeBufSize);