diff --git a/ChangeLog b/ChangeLog
index 987309551..16516e130 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-10  Werner Lemberg  <wl@gnu.org>
+
+	* src/autofit/afangles.c, src/autofit/aftypes.h (af_angle_diff):
+	Comment out.  Unused.
+
+2005-11-10  Christian Biesinger  <cbiesinger@web.de>
+
+	* builds/beos/beos.mk: Call beos-def.mk before anything else to
+	define the separator.
+
+	* builds/unix/unix-cc.in (LINK_LIBRARY): Add `-no-undefined' flag.
+
 2005-11-07  Werner Lemberg  <wl@gnu.org>
 
 	* src/type1/t1afm.c (T1_Read_PFM): Zero offset means `no kerning
diff --git a/builds/beos/beos.mk b/builds/beos/beos.mk
index 1bc8e3ae3..b5c8bdabe 100644
--- a/builds/beos/beos.mk
+++ b/builds/beos/beos.mk
@@ -2,7 +2,7 @@
 # FreeType 2 configuration rules for a BeOS system
 #
 
-# Copyright 1996-2000, 2002 by
+# Copyright 1996-2000, 2002, 2005 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -11,8 +11,8 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
-include $(TOP_DIR)/builds/compiler/ansi-cc.mk
 include $(TOP_DIR)/builds/beos/beos-def.mk
+include $(TOP_DIR)/builds/compiler/ansi-cc.mk
 include $(TOP_DIR)/builds/link_std.mk
 
 
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 8950347cf..d095bcbb5 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -100,6 +100,7 @@ CCexe        := $(CCraw)   # used to compile "apinames" only
 #
 LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
                           -rpath $(libdir) -version-info $(version_info) \
-                          $(LDFLAGS) -export-symbols $(EXPORTS_LIST)
+                          $(LDFLAGS) -export-symbols $(EXPORTS_LIST) \
+                          -no-undefined
 
 # EOF
diff --git a/src/autofit/afangles.c b/src/autofit/afangles.c
index a59246dd6..94a84862b 100644
--- a/src/autofit/afangles.c
+++ b/src/autofit/afangles.c
@@ -322,8 +322,6 @@ for n in r:
     return v.y;
   }
 
-#endif /* 0 */
-
 
   FT_LOCAL_DEF( AF_Angle )
   af_angle_diff( AF_Angle  angle1,
@@ -342,6 +340,8 @@ for n in r:
     return delta;
   }
 
+#endif /* 0 */
+
 
   FT_LOCAL_DEF( void )
   af_sort_pos( FT_UInt  count,
diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
index 68fafdb53..db41bd917 100644
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -125,6 +125,7 @@ FT_BEGIN_HEADER
                  FT_Pos  dy );
 
 
+#if 0
   /*
    *  compute `angle2 - angle1'; the result is always within
    *  the range [-AF_ANGLE_PI .. AF_ANGLE_PI - 1]
@@ -132,22 +133,25 @@ FT_BEGIN_HEADER
   FT_LOCAL( AF_Angle )
   af_angle_diff( AF_Angle  angle1,
                  AF_Angle  angle2 );
+#endif /* 0 */
 
-#define  AF_ANGLE_DIFF(result,angle1,angle2)  \
-  FT_BEGIN_STMNT                              \
-    AF_Angle  _delta = (angle2) - (angle1);   \
-                                              \
-                                              \
-    _delta %= AF_ANGLE_2PI;                   \
-    if ( _delta < 0 )                         \
-      _delta += AF_ANGLE_2PI;                 \
-                                              \
-    if ( _delta > AF_ANGLE_PI )               \
-      _delta -= AF_ANGLE_2PI;                 \
-                                              \
-    result = _delta;                          \
+
+#define AF_ANGLE_DIFF( result, angle1, angle2 ) \
+  FT_BEGIN_STMNT                                \
+    AF_Angle  _delta = (angle2) - (angle1);     \
+                                                \
+                                                \
+    _delta %= AF_ANGLE_2PI;                     \
+    if ( _delta < 0 )                           \
+      _delta += AF_ANGLE_2PI;                   \
+                                                \
+    if ( _delta > AF_ANGLE_PI )                 \
+      _delta -= AF_ANGLE_2PI;                   \
+                                                \
+    result = _delta;                            \
   FT_END_STMNT
 
+
   /*************************************************************************/
   /*************************************************************************/
   /*****                                                               *****/