--- cppuhelper/test/testdefaultbootstrapping.cxx.orig	2008-04-11 12:49:59.397516576 +0200
+++ cppuhelper/test/testdefaultbootstrapping.cxx	2008-04-11 12:50:15.684149043 +0200
@@ -43,6 +43,7 @@
 #include <cstdio>
 
 #include <rtl/process.h>
+#include <cppuhelper/component_context.hxx>
 #include <cppuhelper/bootstrap.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
--- cppuhelper/test/testlib/defbootstrap_lib.cxx.orig	2008-04-11 12:53:27.152831422 +0200
+++ cppuhelper/test/testlib/defbootstrap_lib.cxx	2008-04-11 13:02:53.662057191 +0200
@@ -44,6 +44,7 @@
 
 #include <osl/module.hxx>
 #include <rtl/process.h>
+#include <cppuhelper/component_context.hxx>
 #include <cppuhelper/bootstrap.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -116,7 +117,7 @@
     dXSARGS;
     char* file = __FILE__;
 
-/*    XS_VERSION_BOOTCHECK ;*/
+    /* XS_VERSION_BOOTCHECK ; */
 
 	newXS("UNO::tryService", XS_UNO_tryService, file);
     XSRETURN_YES;
--- cppuhelper/test/testlib/makefile.mk.orig	2008-04-11 13:27:44.642877569 +0200
+++ cppuhelper/test/testlib/makefile.mk	2008-04-11 13:29:12.735963988 +0200
@@ -56,10 +56,11 @@
 
 .IF "$(GUI)"=="WNT"
 PERLLIB=perl58.lib
-
 LIB!:=$(LIB);$(PERLLIBS)
 .EXPORT : LIB
-
+.ELSE
+PERLLIB=-L$(PERLLIBS) -lperl
+EXTRALIBPATHS+=-L$(PERLLIBS) 
 .ENDIF
 
 # --- Files --------------------------------------------------------