diff --git a/rtl/inc/cgenmath.inc b/rtl/inc/cgenmath.inc
index b9558f4c79..3292796391 100644
--- a/rtl/inc/cgenmath.inc
+++ b/rtl/inc/cgenmath.inc
@@ -85,10 +85,10 @@
   {$ifdef INTERNCONSTINTF}
     function fpc_sqrt_real(d:Real):Real;compilerproc; {$ifdef MATHINLINE}inline;{$endif}
   {$else}    
-    function sqrt(d:Real):Real;[internproc:fpc_in_const_sqrt];[public, alias: 'FPC_SQRT_REAL']; {$ifdef MATHINLINE}inline;{$endif}
     {$ifdef hascompilerproc}
-      function fpc_sqrt_real(d:Real):Real;compilerproc; external name 'FPC_SQRT_REAL';
+    function fpc_sqrt_real(d:Real):Real;compilerproc; external name 'FPC_SQRT_REAL';
     {$endif hascompilerproc}
+    function sqrt(d:Real):Real;[internconst:fpc_in_const_sqrt];[public, alias: 'FPC_SQRT_REAL']; {$ifdef MATHINLINE}inline;{$endif}
   {$endif}  
     begin
       result := c_sqrt(d);
@@ -190,7 +190,7 @@ Not supported on Mac OS X 10.1
     function c_atan(d: double): double; cdecl; external 'c' name 'atan';
 
   {$ifdef INTERNCONSTINTF}
-    function fpc_ArcTan_real(d:Real):Real;compiler; {$ifdef MATHINLINE}inline;{$endif}
+    function fpc_ArcTan_real(d:Real):Real;compilerproc; {$ifdef MATHINLINE}inline;{$endif}
   {$else}  
     function ArcTan(d:Real):Real;[internconst:fpc_in_const_arctan];{$ifdef MATHINLINE}inline;{$endif}
   {$endif}  
@@ -203,7 +203,10 @@ Not supported on Mac OS X 10.1
 
 {
   $Log$
-  Revision 1.4  2004-11-21 15:35:23  peter
+  Revision 1.5  2004-11-21 16:14:59  jonas
+    * fixed remaining compilation problems
+
+  Revision 1.4  2004/11/21 15:35:23  peter
     * float routines all use internproc and compilerproc helpers
 
   Revision 1.3  2004/11/20 15:49:21  jonas
diff --git a/rtl/inc/cgenstr.inc b/rtl/inc/cgenstr.inc
index 3a7869ce6f..fcf431a280 100644
--- a/rtl/inc/cgenstr.inc
+++ b/rtl/inc/cgenstr.inc
@@ -17,17 +17,6 @@
 { as cdecl and external in libc cause problems because the calling         }
 { convention the interface is different                                    }
 
-{$ifndef FPC_UNIT_HAS_STRLEN}
-{$define FPC_UNIT_HAS_STRLEN}
- function libc_strlen(const p: pchar): cardinal; cdecl; external 'c' name 'strlen';
-
- function strlen(P : pchar) : longint;{$ifdef SYSTEMINLINE}inline;{$endif}
-   begin
-     strlen := libc_strlen(p);
-   end;
-{$endif FPC_UNIT_HAS_STRLEN}
-
-
 {$ifndef FPC_UNIT_HAS_STREND}
 {$define FPC_UNIT_HAS_STREND}
 
@@ -142,7 +131,10 @@
 
 {
   $Log$
-  Revision 1.3  2004-08-24 11:49:56  jonas
+  Revision 1.4  2004-11-21 16:14:59  jonas
+    * fixed remaining compilation problems
+
+  Revision 1.3  2004/08/24 11:49:56  jonas
     * made strlen wrapper inline
 
   Revision 1.2  2004/05/01 23:55:18  peter
diff --git a/rtl/inc/compproc.inc b/rtl/inc/compproc.inc
index caa02f0a27..1c73559cc2 100644
--- a/rtl/inc/compproc.inc
+++ b/rtl/inc/compproc.inc
@@ -253,6 +253,8 @@ function fpc_sqr_real(d : ValReal) : ValReal;compilerproc;
 function fpc_sqrt_real(d : ValReal) : ValReal;compilerproc;{$ifdef MATHINLINE}inline;{$endif}
 function fpc_round_real(d : ValReal) : int64;compilerproc;
 function fpc_trunc_real(d : ValReal) : int64;compilerproc;
+{$else INTERNCONSTINTF}
+function fpc_round(d : ValReal) : int64;compilerproc;
 {$endif INTERNCONSTINTF}
 
 function fpc_do_is(aclass : tclass;aobject : tobject) : boolean; compilerproc;
@@ -346,7 +348,10 @@ function fpc_qword_to_double(q: qword): double; compilerproc;
 
 {
   $Log$
-  Revision 1.60  2004-11-21 15:35:23  peter
+  Revision 1.61  2004-11-21 16:14:59  jonas
+    * fixed remaining compilation problems
+
+  Revision 1.60  2004/11/21 15:35:23  peter
     * float routines all use internproc and compilerproc helpers
 
   Revision 1.59  2004/11/09 23:10:22  peter
diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc
index 2954432f08..92ea68038d 100644
--- a/rtl/inc/system.inc
+++ b/rtl/inc/system.inc
@@ -85,7 +85,6 @@ Procedure Rewrite(var f : TypedFile); [INTERNPROC: fpc_in_Rewrite_TypedFile];
 { prefer libc implementations over our own, as they're most likely faster }
 {$i cgeneric.inc}
 { is now declared as external reference to another routine in the interface }
-{$define FPC_UNIT_HAS_STRLEN}
 {$i cgenstr.inc}
 {$endif FPC_USE_LIBC}
 
@@ -1000,7 +999,10 @@ end;
 
 {
   $Log$
-  Revision 1.69  2004-11-20 15:49:21  jonas
+  Revision 1.70  2004-11-21 16:14:59  jonas
+    * fixed remaining compilation problems
+
+  Revision 1.69  2004/11/20 15:49:21  jonas
     * some compilation fixes for powerpc after all the internconst and
       internproc changes, still crashes with internalerror(88) for ppc1
       on real2str.inc(193,39)
diff --git a/rtl/powerpc/math.inc b/rtl/powerpc/math.inc
index 422af9a10f..db332eae56 100644
--- a/rtl/powerpc/math.inc
+++ b/rtl/powerpc/math.inc
@@ -56,10 +56,10 @@ const
     function pi : double;[internproc:fpc_in_pi];
 
     {$define FPC_SYSTEM_HAS_ABS}
-    function abs(d : extended) : extended;[internproc:fpc_in_abs_extended];
+    function abs(d : extended) : extended;[internproc:fpc_in_abs_real];
 
     {$define FPC_SYSTEM_HAS_SQR}
-    function sqr(d : extended) : extended;[internproc:fpc_in_sqr_extended];
+    function sqr(d : extended) : extended;[internproc:fpc_in_sqr_real];
 {$endif ndef INTERNCONSTINTF}
 
       const
@@ -349,7 +349,10 @@ end;
 
 {
   $Log$
-  Revision 1.37  2004-11-21 15:35:23  peter
+  Revision 1.38  2004-11-21 16:14:59  jonas
+    * fixed remaining compilation problems
+
+  Revision 1.37  2004/11/21 15:35:23  peter
     * float routines all use internproc and compilerproc helpers
 
   Revision 1.36  2004/11/20 15:49:21  jonas