diff --git a/src/libs/freetype2/Jamfile b/src/libs/freetype2/Jamfile
index f8676950e7..51cfb29737 100644
--- a/src/libs/freetype2/Jamfile
+++ b/src/libs/freetype2/Jamfile
@@ -1,36 +1,40 @@
 # FreeType 2 src Jamfile (c) 2001, 2002 David Turner
 #
 
-SubDir  FT2_TOP src ;
+SubDir  OBOS_TOP src libs freetype2 ;
 
 # We need to add "freetype/src" to the current include path in order to
 # compile any part of FreeType 2.
 #
-SubDirHdrs  [ FT2_SubDir  src ] ;
+# SubDirHdrs  [ FT2_SubDir  src ] ;
 
 # The file <freetype/internal/internal.h> is used to define macros that are
 # later used in #include statements.  It needs to be parsed in order to
 # record these definitions.
 #
-HDRMACRO  [ FT2_SubDir  include internal internal.h ] ;
+# HDRMACRO  [ FT2_SubDir  include internal internal.h ] ;
 
-SubInclude  FT2_TOP src autohint ;
-SubInclude  FT2_TOP src base ;
-SubInclude  FT2_TOP src bdf ;
-SubInclude  FT2_TOP src cache ;
-SubInclude  FT2_TOP src cff ;
-SubInclude  FT2_TOP src cid ;
-SubInclude  FT2_TOP src pcf ;
-SubInclude  FT2_TOP src pfr ;
-SubInclude  FT2_TOP src psaux ;
-SubInclude  FT2_TOP src pshinter ;
-SubInclude  FT2_TOP src psnames ;
-SubInclude  FT2_TOP src raster ;
-SubInclude  FT2_TOP src sfnt ;
-SubInclude  FT2_TOP src smooth ;
-SubInclude  FT2_TOP src truetype ;
-SubInclude  FT2_TOP src type1 ;
-SubInclude  FT2_TOP src type42 ;
-SubInclude  FT2_TOP src winfonts ;
+SubInclude  OBOS_TOP src libs freetype2 autohint ;
+SubInclude  OBOS_TOP src libs freetype2 base ;
+SubInclude  OBOS_TOP src libs freetype2 bdf ;
+SubInclude  OBOS_TOP src libs freetype2 cache ;
+SubInclude  OBOS_TOP src libs freetype2 cff ;
+SubInclude  OBOS_TOP src libs freetype2 cid ;
+SubInclude  OBOS_TOP src libs freetype2 pcf ;
+SubInclude  OBOS_TOP src libs freetype2 pfr ;
+SubInclude  OBOS_TOP src libs freetype2 psaux ;
+SubInclude  OBOS_TOP src libs freetype2 pshinter ;
+SubInclude  OBOS_TOP src libs freetype2 psnames ;
+SubInclude  OBOS_TOP src libs freetype2 raster ;
+SubInclude  OBOS_TOP src libs freetype2 sfnt ;
+SubInclude  OBOS_TOP src libs freetype2 smooth ;
+SubInclude  OBOS_TOP src libs freetype2 truetype ;
+SubInclude  OBOS_TOP src libs freetype2 type1 ;
+SubInclude  OBOS_TOP src libs freetype2 type42 ;
+SubInclude  OBOS_TOP src libs freetype2 winfonts ;
+
+SubDir  OBOS_TOP src libs freetype2 ;
+
+FT2_LinkLibrary  $(FT2_LIB) ;
 
 # end of src Jamfile
diff --git a/src/libs/freetype2/autohint/Jamfile b/src/libs/freetype2/autohint/Jamfile
index ed2da3acca..b23f7eb7fa 100644
--- a/src/libs/freetype2/autohint/Jamfile
+++ b/src/libs/freetype2/autohint/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/autohint Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src autohint ;
+SubDir  OBOS_TOP src libs freetype2 autohint ;
 
-SubDirHdrs  [ FT2_SubDir  src autohint ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src autohint ] ;
     _sources = autohint ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/autohint Jamfile
diff --git a/src/libs/freetype2/base/Jamfile b/src/libs/freetype2/base/Jamfile
index c579b3b980..0059e880a0 100644
--- a/src/libs/freetype2/base/Jamfile
+++ b/src/libs/freetype2/base/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/base Jamfile (c) 2001, 2002 David Turner
 #
 
-SubDir  FT2_TOP src base ;
+SubDir  OBOS_TOP src libs freetype2 base ;
 
-SubDirHdrs  [ FT2_SubDir  src base ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -18,19 +18,19 @@ SubDirHdrs  [ FT2_SubDir  src base ] ;
     _sources = ftbase ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # Add the optional/replaceable files.
 #
-Library  $(FT2_LIB) : ftsystem.c ftinit.c   ftglyph.c  ftmm.c     ftbdf.c
+FT2_Library  $(FT2_LIB) : ftsystem.c ftinit.c   ftglyph.c  ftmm.c     ftbdf.c
                       ftbbox.c   ftdebug.c  ftxf86.c   fttype1.c  ;
 
 # Add Macintosh-specific file to the library when necessary.
 #
 if $(MAC)
 {
-  Library  $(FT2_LIB) : ftmac.c ;
+  FT2_Library  $(FT2_LIB) : ftmac.c ;
 }
 
 # end of src/base Jamfile
diff --git a/src/libs/freetype2/bdf/Jamfile b/src/libs/freetype2/bdf/Jamfile
index 6fe3a7e1f0..06a31904ec 100644
--- a/src/libs/freetype2/bdf/Jamfile
+++ b/src/libs/freetype2/bdf/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/bdf Jamfile (c) 2002 David Turner
 #
 
-SubDir  FT2_TOP src bdf ;
+SubDir  OBOS_TOP src libs freetype2 bdf ;
 
-SubDirHdrs  [ FT2_SubDir  src bdf ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src bdf ] ;
     _sources = bdf ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/bdf Jamfile
diff --git a/src/libs/freetype2/cache/Jamfile b/src/libs/freetype2/cache/Jamfile
index 3148f558ec..cc2ebca43a 100644
--- a/src/libs/freetype2/cache/Jamfile
+++ b/src/libs/freetype2/cache/Jamfile
@@ -1,15 +1,15 @@
 # FreeType 2 src/cache Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src cache ;
+SubDir  OBOS_TOP src libs freetype2 cache ;
 
-SubDirHdrs  [ FT2_SubDir  src cache ] ;
+UseFreeTypeHeaders ;
 
 # The file <freetype/ftcache.h> contains some macro definitions that are
 # later used in #include statements related to the cache sub-system.  It
 # needs to be parsed through a HDRMACRO rule for macro definitions.
 #
-HDRMACRO  [ FT2_SubDir  include ftcache.h ] ;
+# HDRMACRO  [ FT2_SubDir  include ftcache.h ] ;
 
 {
   local  _sources ;
@@ -23,7 +23,7 @@ HDRMACRO  [ FT2_SubDir  include ftcache.h ] ;
     _sources = ftcache ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/cache Jamfile
diff --git a/src/libs/freetype2/cff/Jamfile b/src/libs/freetype2/cff/Jamfile
index 9ff721d8eb..5622fbcb3e 100644
--- a/src/libs/freetype2/cff/Jamfile
+++ b/src/libs/freetype2/cff/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/cff Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src cff ;
+SubDir  OBOS_TOP src libs freetype2 cff ;
 
-SubDirHdrs  [ FT2_SubDir  src cff ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src cff ] ;
     _sources = cff ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/cff Jamfile
diff --git a/src/libs/freetype2/cid/Jamfile b/src/libs/freetype2/cid/Jamfile
index 87c580dc02..2180607b2b 100644
--- a/src/libs/freetype2/cid/Jamfile
+++ b/src/libs/freetype2/cid/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/cid Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src cid ;
+SubDir  OBOS_TOP src libs freetype2 cid ;
 
-SubDirHdrs  [ FT2_SubDir  src cid ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src cid ] ;
     _sources = type1cid ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/cid Jamfile
diff --git a/src/libs/freetype2/pcf/Jamfile b/src/libs/freetype2/pcf/Jamfile
index 8625fa1461..d45389c814 100644
--- a/src/libs/freetype2/pcf/Jamfile
+++ b/src/libs/freetype2/pcf/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/pcf Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src pcf ;
+SubDir  OBOS_TOP src libs freetype2 pcf ;
 
-SubDirHdrs  [ FT2_SubDir  src pcf ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src pcf ] ;
     _sources = pcf ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/pcf Jamfile
diff --git a/src/libs/freetype2/pfr/Jamfile b/src/libs/freetype2/pfr/Jamfile
index e29c674700..3ed7b01371 100644
--- a/src/libs/freetype2/pfr/Jamfile
+++ b/src/libs/freetype2/pfr/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/pfr Jamfile (c) 2002 David Turner
 #
 
-SubDir  FT2_TOP src pfr ;
+SubDir  OBOS_TOP src libs freetype2 pfr ;
 
-SubDirHdrs  [ FT2_SubDir  src pfr ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src pfr ] ;
     _sources = pfr ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/pfr Jamfile
diff --git a/src/libs/freetype2/psaux/Jamfile b/src/libs/freetype2/psaux/Jamfile
index e3160696d9..29876a32e9 100644
--- a/src/libs/freetype2/psaux/Jamfile
+++ b/src/libs/freetype2/psaux/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/psaux Jamfile (c) 2001, 2002 David Turner
 #
 
-SubDir  FT2_TOP src psaux ;
+SubDir  OBOS_TOP src libs freetype2 psaux ;
 
-SubDirHdrs  [ FT2_SubDir  src psaux ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src psaux ] ;
     _sources = psaux ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/psaux Jamfile
diff --git a/src/libs/freetype2/pshinter/Jamfile b/src/libs/freetype2/pshinter/Jamfile
index 6eea3be0f3..bac0d85c6c 100644
--- a/src/libs/freetype2/pshinter/Jamfile
+++ b/src/libs/freetype2/pshinter/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/pshinter Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src pshinter ;
+SubDir  OBOS_TOP src libs freetype2 pshinter ;
 
-SubDirHdrs  [ FT2_SubDir  src pshinter ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src pshinter ] ;
     _sources = pshinter ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/pshinter Jamfile
diff --git a/src/libs/freetype2/psnames/Jamfile b/src/libs/freetype2/psnames/Jamfile
index e9e22ea3ff..19c4fddf69 100644
--- a/src/libs/freetype2/psnames/Jamfile
+++ b/src/libs/freetype2/psnames/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/psnames Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src psnames ;
+SubDir  OBOS_TOP src libs freetype2 psnames ;
 
-SubDirHdrs  [ FT2_SubDir  src psnames ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src psnames ] ;
     _sources = psnames ;
   }
   
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/psnames Jamfile
diff --git a/src/libs/freetype2/raster/Jamfile b/src/libs/freetype2/raster/Jamfile
index 6c75e0de58..51e34feb5a 100644
--- a/src/libs/freetype2/raster/Jamfile
+++ b/src/libs/freetype2/raster/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/raster Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src raster ;
+SubDir  OBOS_TOP src libs freetype2 raster ;
 
-SubDirHdrs  [ FT2_SubDir  src raster ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src raster ] ;
     _sources = raster ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/raster Jamfile
diff --git a/src/libs/freetype2/sfnt/Jamfile b/src/libs/freetype2/sfnt/Jamfile
index d7722e3963..0cfff8d569 100644
--- a/src/libs/freetype2/sfnt/Jamfile
+++ b/src/libs/freetype2/sfnt/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/sfnt Jamfile (c) 2001, 2002 David Turner
 #
 
-SubDir  FT2_TOP src sfnt ;
+SubDir  OBOS_TOP src libs freetype2 sfnt ;
 
-SubDirHdrs  [ FT2_SubDir  src sfnt ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src sfnt ] ;
     _sources = sfnt ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/sfnt Jamfile
diff --git a/src/libs/freetype2/smooth/Jamfile b/src/libs/freetype2/smooth/Jamfile
index 709c856131..947f8a3dea 100644
--- a/src/libs/freetype2/smooth/Jamfile
+++ b/src/libs/freetype2/smooth/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/smooth Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src smooth ;
+SubDir  OBOS_TOP src libs freetype2 smooth ;
 
-SubDirHdrs  [ FT2_SubDir  src smooth ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src smooth ] ;
     _sources = smooth ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/smooth Jamfile
diff --git a/src/libs/freetype2/truetype/Jamfile b/src/libs/freetype2/truetype/Jamfile
index 4d7a31245b..31acb47784 100644
--- a/src/libs/freetype2/truetype/Jamfile
+++ b/src/libs/freetype2/truetype/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/truetype Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src truetype ;
+SubDir  OBOS_TOP src libs freetype2 truetype ;
 
-SubDirHdrs  [ FT2_SubDir  src truetype ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src truetype ] ;
     _sources = truetype ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/truetype Jamfile
diff --git a/src/libs/freetype2/type1/Jamfile b/src/libs/freetype2/type1/Jamfile
index 1cbb78d4d6..8ac983bfc4 100644
--- a/src/libs/freetype2/type1/Jamfile
+++ b/src/libs/freetype2/type1/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/type1 Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src type1 ;
+SubDir  OBOS_TOP src libs freetype2 type1 ;
 
-SubDirHdrs  [ FT2_SubDir  src type1 ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src type1 ] ;
     _sources = type1 ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/type1 Jamfile
diff --git a/src/libs/freetype2/type42/Jamfile b/src/libs/freetype2/type42/Jamfile
index e133e6d865..45f762f219 100644
--- a/src/libs/freetype2/type42/Jamfile
+++ b/src/libs/freetype2/type42/Jamfile
@@ -1,9 +1,9 @@
 # FreeType 2 src/type42 Jamfile (c) 2002 David Turner
 #
 
-SubDir  FT2_TOP src type42 ;
+SubDir  OBOS_TOP src libs freetype2 type42 ;
 
-SubDirHdrs  [ FT2_SubDir  src type42 ] ;
+UseFreeTypeHeaders ;
 
 {
   local  _sources ;
@@ -17,7 +17,7 @@ SubDirHdrs  [ FT2_SubDir  src type42 ] ;
     _sources = type42 ;
   }
 
-  Library  $(FT2_LIB) : $(_sources).c ;
+  FT2_Library  $(FT2_LIB) : $(_sources).c ;
 }
 
 # end of src/type42 Jamfile
diff --git a/src/libs/freetype2/winfonts/Jamfile b/src/libs/freetype2/winfonts/Jamfile
index c45e107827..9c7a2e8341 100644
--- a/src/libs/freetype2/winfonts/Jamfile
+++ b/src/libs/freetype2/winfonts/Jamfile
@@ -1,10 +1,10 @@
 # FreeType 2 src/winfonts Jamfile (c) 2001 David Turner
 #
 
-SubDir  FT2_TOP src winfonts ;
+SubDir  OBOS_TOP src libs freetype2 winfonts ;
 
-SubDirHdrs  [ FT2_SubDir  src winfonts ] ;
+UseFreeTypeHeaders ;
 
-Library  $(FT2_LIB) : winfnt.c ;
+FT2_Library  $(FT2_LIB) : winfnt.c ;
 
 # end of src/winfonts Jamfile