Index: rtl/unix/sysutils.pp
===================================================================
--- rtl/unix/sysutils.pp	(revision 12732)
+++ rtl/unix/sysutils.pp	(working copy)
@@ -182,7 +182,8 @@
   lockres: cint;
 begin
   DoFileLocking:=Handle;
-{$ifndef beos}
+{$ifdef beos}
+{$else}
   if (Handle>=0) then
     begin
 {$ifdef solaris}
Index: rtl/unix/dl.pp
===================================================================
--- rtl/unix/dl.pp	(revision 12732)
+++ rtl/unix/dl.pp	(working copy)
@@ -20,7 +20,11 @@
 {$ifdef BSD}   // dlopen is in libc on FreeBSD.
   LibDL = 'c';
 {$else}
-  LibDL = 'dl';
+  {$ifdef HAIKU}
+    LibDL = 'root';
+  {$else}
+    LibDL = 'dl';
+  {$endif}
 {$endif}
 
 {$if defined(linux) and defined(cpuarm)}
Index: rtl/beos/termios.inc
===================================================================
--- rtl/beos/termios.inc	(revision 12732)
+++ rtl/beos/termios.inc	(working copy)
@@ -420,4 +420,4 @@
   /* these currently work only on sockets */	
 }
 	FIONBIO  = $be000000;
-	FIONREAD = $be000001;
\ No newline at end of file
+	FIONREAD = $be000001;
Index: rtl/haiku/Makefile.fpc
===================================================================
--- rtl/haiku/Makefile.fpc	(revision 12732)
+++ rtl/haiku/Makefile.fpc	(working copy)
@@ -15,7 +15,8 @@
       cpu mmx getopts heaptrc lineinfo lnfodwrf variants \
       rtlconsts syscall unix unixutil strutils termio initc \
       cmem crt video mouse keyboard \
-      dateutils fmtbcd sockets dynlibs cwstring cthreads
+      dateutils fmtbcd sockets dynlibs cwstring cthreads \
+      fpintres clocale
 rsts=math varutils typinfo variants sysconst rtlconsts dateutils
 implicitunits=exeinfo
 
Index: rtl/haiku/termios.inc
===================================================================
--- rtl/haiku/termios.inc	(revision 12732)
+++ rtl/haiku/termios.inc	(working copy)
@@ -420,4 +420,4 @@
   /* these currently work only on sockets */	
 }
 	FIONBIO  = $be000000;
-	FIONREAD = $be000001;
\ No newline at end of file
+	FIONREAD = $be000001;
Index: rtl/inc/stdsock.inc
===================================================================
--- rtl/inc/stdsock.inc	(revision 12732)
+++ rtl/inc/stdsock.inc	(working copy)
@@ -146,4 +146,4 @@
   fpsocketpair:=cfpsocketpair(d,xtype,protocol,sv);
   internal_socketerror:=fpgeterrno;
 end;
-{$endif}
\ No newline at end of file
+{$endif}
Index: packages/fcl-db/Makefile.fpc
===================================================================
--- packages/fcl-db/Makefile.fpc	(revision 12732)
+++ packages/fcl-db/Makefile.fpc	(working copy)
@@ -9,6 +9,7 @@
 [target]
 dirs=src/sdf src/memds src/sqldb src/base 
 dirs_beos=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
+dirs_haiku=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
 dirs_linux=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen 
 dirs_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
 dirs_darwin=src/dbase src/sqlite
Index: packages/pxlib/Makefile.fpc
===================================================================
--- packages/pxlib/Makefile.fpc	(revision 12732)
+++ packages/pxlib/Makefile.fpc	(working copy)
@@ -8,6 +8,7 @@
 
 [target]
 units_beos=pxlib
+units_haiku=pxlib
 units_linux=pxlib
 units_win32=pxlib
 units_darwin=pxlib
@@ -15,6 +16,7 @@
 units_openbsd=pxlib
 units_netbsd=pxlib
 exampledirs_beos=examples
+exampledirs_haiku=examples
 exampledirs_linux=examples
 exampledirs_win32=examples
 exampledirs_darwin=examples