diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
index c29a35c2ea3..0b6854b3770 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
@@ -66,9 +66,11 @@ public class JetCompiler implements TranslatingCompiler {
         ApplicationManager.getApplication().runReadAction(new Runnable() {
             @Override
             public void run() {
+                VirtualFile[] allFiles = compileContext.getCompileScope().getFiles(null, true);
+
                 GenerationState generationState = new GenerationState(compileContext.getProject(), false);
                 List<JetNamespace> namespaces = Lists.newArrayList();
-                for (VirtualFile virtualFile : virtualFiles) {
+                for (VirtualFile virtualFile : allFiles) {
                     PsiFile psiFile = PsiManager.getInstance(compileContext.getProject()).findFile(virtualFile);
                     if (psiFile instanceof JetFile) {
                         namespaces.add(((JetFile) psiFile).getRootNamespace());
diff --git a/stdlib/ktSrc/ModuleBuilder.kt b/stdlib/ktSrc/ModuleBuilder.kt
index f6e97a1cdf1..2f90dcb1158 100644
--- a/stdlib/ktSrc/ModuleBuilder.kt
+++ b/stdlib/ktSrc/ModuleBuilder.kt
@@ -1,4 +1,6 @@
-namespace kotlin.modules
+namespace kotlin
+
+namespace modules {
 
 import java.util.*
 import jet.modules.*
@@ -45,3 +47,5 @@ class ModuleBuilder(val name: String): IModuleBuilder {
     override fun getSourceFiles(): List<String?>? = sourceFiles
     override fun getClasspathRoots(): List<String?>? = classpathRoots
 }
+
+}
\ No newline at end of file