diff --git a/boost-context-features.jam b/boost-context-features.jam
index ff3265e..13f02f5 100644
--- a/boost-context-features.jam
+++ b/boost-context-features.jam
@@ -58,3 +58,14 @@ feature.feature abi
    : propagated
    ;
 feature.set-default abi : [ default_abi ] ;
+
+feature.feature context-impl
+    : fcontext
+      ucontext
+      winfib
+    : propagated
+      composite
+    ;
+feature.set-default context-impl : fcontext ;
+feature.compose <context-impl>ucontext : <define>BOOST_USE_UCONTEXT ;
+feature.compose <context-impl>winfib : <define>BOOST_USE_WINFIB ;
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index d0b6d20..7ff048b 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -14,7 +14,6 @@ import modules ;
 import os ;
 import toolset ;
 import config : requires ;
-import feature ;
 
 project
     : common-requirements <library>$(boost_dependencies)
@@ -49,18 +48,6 @@ project
     ;
 
 
-feature.feature context-impl
-    : fcontext
-      ucontext
-      winfib
-    : propagated
-      composite
-    ;
-feature.set-default context-impl : fcontext ;
-feature.compose <context-impl>ucontext : <define>BOOST_USE_UCONTEXT ;
-feature.compose <context-impl>winfib : <define>BOOST_USE_WINFIB ;
-
-
 # ARM
 # ARM/AAPCS/ELF
 alias asm_sources