--- gforth/prims2x.fs	1998/12/11 22:54:27	1.36
+++ gforth/prims2x.fs	1999/03/02 15:45:32	1.39
@@ -42,14 +42,16 @@
 
 warnings off
 
-require search.fs
-require extend.fs
+[IFUNDEF] vocabulary	\ we are executed just with kernel image
+			\ load the rest that is needed
+			\ (require fails because this file is needed from a
+			\ different directory with the wordlibraries)
+include ./search.fs			
+include ./extend.fs
+include ./environ.fs
+[THEN]
 
-\ require interpretation.fs
-\ require debugs.fs
-[IFUNDEF] vocabulary    include search.fs [THEN]
-[IFUNDEF] environment?  include environ.fs      [THEN]
-include gray.fs
+include ./gray.fs
 
 100 constant max-effect \ number of things on one side of a stack effect
 255 constant maxchar
@@ -661,13 +663,12 @@ set-current
 
 : output-label ( -- )  1 flush-comment !
     ?flush-comment
-    ." [" -2 primitive-number @ - 0 .r ." ] "
     ." (Label)&&I_" c-name 2@ type ." ," cr
     -1 primitive-number +! ;
 
 : output-alias ( -- )  flush-comment on
     ?flush-comment
-    primitive-number @ . ." alias " forth-name 2@ type cr
+    ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr
     -1 primitive-number +! ;
 
 : output-forth ( -- )  flush-comment on