Index: TODO
===================================================================
diff -u -r6976a6a231789f39a2c9567ed31ad98cde821e8c -r5577ecfb071377c5e04f81074e25e2707d2c1400
--- TODO	(.../TODO)	(revision 6976a6a231789f39a2c9567ed31ad98cde821e8c)
+++ TODO	(.../TODO)	(revision 5577ecfb071377c5e04f81074e25e2707d2c1400)
@@ -997,6 +997,8 @@
 - predefined.tcl is now pretty minimal.
 
 - updated to TEA 3.8
+- moved all exports of nsf to predefined.tcl
+- made imports in xotcl2 and nx explicit
 
 TODO: 
 - nameing
Index: generic/predefined.h
===================================================================
diff -u -rf3cb5afe6aa1b6761b4a9909058f64ff7d64ab92 -r5577ecfb071377c5e04f81074e25e2707d2c1400
--- generic/predefined.h	(.../predefined.h)	(revision f3cb5afe6aa1b6761b4a9909058f64ff7d64ab92)
+++ generic/predefined.h	(.../predefined.h)	(revision 5577ecfb071377c5e04f81074e25e2707d2c1400)
@@ -1,6 +1,7 @@
 static char cmd[] = 
 "namespace eval ::nsf {\n"
-"namespace export next current my is relation interp\n"
+"namespace export next current\n"
+"namespace export alias configure finalize interp is my relation\n"
 "proc ::nsf::infoError msg {\n"
 "regsub -all \" <object>\" $msg \"\" msg\n"
 "regsub -all \" <class>\" $msg \"\" msg\n"
Index: generic/predefined.tcl
===================================================================
diff -u -rf3cb5afe6aa1b6761b4a9909058f64ff7d64ab92 -r5577ecfb071377c5e04f81074e25e2707d2c1400
--- generic/predefined.tcl	(.../predefined.tcl)	(revision f3cb5afe6aa1b6761b4a9909058f64ff7d64ab92)
+++ generic/predefined.tcl	(.../predefined.tcl)	(revision 5577ecfb071377c5e04f81074e25e2707d2c1400)
@@ -3,7 +3,10 @@
   #
   # get frequenly used primitiva into the ::nsf namespace
   #
-  namespace export next current my is relation interp
+  # Symbols reused in the next scripting language
+  namespace export next current 
+  # Symbols reused in XOTcl
+  namespace export alias configure finalize interp is my relation
 
   #
   # error handler for info
Index: generic/xotcl.c
===================================================================
diff -u -rf3cb5afe6aa1b6761b4a9909058f64ff7d64ab92 -r5577ecfb071377c5e04f81074e25e2707d2c1400
--- generic/xotcl.c	(.../xotcl.c)	(revision f3cb5afe6aa1b6761b4a9909058f64ff7d64ab92)
+++ generic/xotcl.c	(.../xotcl.c)	(revision 5577ecfb071377c5e04f81074e25e2707d2c1400)
@@ -14687,10 +14687,6 @@
   /*Tcl_CreateObjCommand(interp, "::nsf::K", XOTclKObjCmd, 0, 0);*/
 
   Tcl_CreateObjCommand(interp, "::nsf::unsetUnknownArgs", XOTclUnsetUnknownArgsCmd, 0, 0);
-  Tcl_Export(interp, RUNTIME_STATE(interp)->XOTclNS, "current", 0);
-  Tcl_Export(interp, RUNTIME_STATE(interp)->XOTclNS, "next", 0);
-  Tcl_Export(interp, RUNTIME_STATE(interp)->XOTclNS, "my", 0);
-  Tcl_Export(interp, RUNTIME_STATE(interp)->XOTclNS, "importvar", 0);
 
 #ifdef XOTCL_BYTECODE
   XOTclBytecodeInit();
Index: library/xotcl/library/xotcl2.tcl
===================================================================
diff -u -rf3cb5afe6aa1b6761b4a9909058f64ff7d64ab92 -r5577ecfb071377c5e04f81074e25e2707d2c1400
--- library/xotcl/library/xotcl2.tcl	(.../xotcl2.tcl)	(revision f3cb5afe6aa1b6761b4a9909058f64ff7d64ab92)
+++ library/xotcl/library/xotcl2.tcl	(.../xotcl2.tcl)	(revision 5577ecfb071377c5e04f81074e25e2707d2c1400)
@@ -43,7 +43,9 @@
   #
   # get frequenly used primitiva into the ::xotcl namespace
   #
-  namespace import ::nsf::*
+  namespace import ::nsf::configure ::nsf::my ::nsf::next ::nsf::finalize ::nsf::interp
+  namespace import ::nsf::alias ::nsf::is ::nsf::relation
+
   namespace import ::nx::Attribute
 
   proc ::xotcl::self {{arg "object"}} {
@@ -700,6 +702,7 @@
       puts stderr "*** using ${package}::* in [::xotcl::self]"
     }
   }
+
   ::nx::Class create ::xotcl::package -superclass ::xotcl::Class -parameter {
     provide
     {version 1.0}
@@ -808,9 +811,6 @@
   
   if {[info exists cmd]} {unset cmd}
 
-  proc ::xotcl::configure args {::nsf::configure {*}$args}
-  proc ::xotcl::finalize {} {::nsf::finalize}
-
   # Documentation stub object -> just ignore per default.
   # if xoDoc is loaded, documentation will be activated
   ::xotcl::Object create ::xotcl::@