--- a/SmalltalkChunkFileSourceWriter.st	Tue Feb 04 21:02:56 2014 +0100
+++ b/SmalltalkChunkFileSourceWriter.st	Tue Feb 04 21:09:59 2014 +0100
@@ -307,12 +307,20 @@
 !
 
 fileOutAllDefinitionsOf:aNonMetaClass on:aStream
+    self fileOutAllDefinitionsOf:aNonMetaClass on:aStream withNameSpace: true.
+
+    "Created: / 15-10-1996 / 11:15:19 / cg"
+    "Modified: / 22-03-1997 / 16:11:56 / cg"
+    "Modified: / 04-02-2014 / 20:00:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+fileOutAllDefinitionsOf:aNonMetaClass on:aStream withNameSpace: withNameSpacePragma
     "append expressions on aStream, which defines myself and all of my private classes."
 
     |s|
 
     s := CharacterWriteStream on:(String new:50).
-    self fileOutDefinitionOf:aNonMetaClass on:s.
+    self fileOutDefinitionOf:aNonMetaClass on:s withNameSpace: withNameSpacePragma.
     aStream nextChunkPut:(s contents).
 
     "/ self fileOutDefinitionOf:aNonMetaClass on:aStream.
@@ -335,13 +343,12 @@
     Class fileOutNameSpaceQuerySignal answer:false do:[
         Class forceNoNameSpaceQuerySignal answer:true do:[
             aNonMetaClass privateClassesSorted do:[:aClass |
-                 self fileOutAllDefinitionsOf:aClass on:aStream
+                 self fileOutAllDefinitionsOf:aClass on:aStream withNameSpace: false
             ]
         ]
     ].
 
-    "Created: 15.10.1996 / 11:15:19 / cg"
-    "Modified: 22.3.1997 / 16:11:56 / cg"
+    "Created: / 04-02-2014 / 20:00:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fileOutAllMethodsOf:aClass on:aStream methodFilter:methodFilter
@@ -501,8 +508,10 @@
     "/ intentionally left blank - make each line an EOL-comment instead
 !
 
-fileOutDefinitionOf:aNonMetaClass on:aStream
-    aNonMetaClass fileOutDefinitionOn:aStream.
+fileOutDefinitionOf:aNonMetaClass on:aStream withNameSpace: withNameSpacePragma
+    aNonMetaClass basicFileOutDefinitionOn:aStream withNameSpace: withNameSpacePragma
+
+    "Created: / 04-02-2014 / 20:00:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fileOutMethod:aMethod on:aStream