diff --git a/src/dumpmaster.pike b/src/dumpmaster.pike
index 31dae9022d45d2777b2e025f9938c2bb9c319375..30f6085d25da12f3075cf61879bee9bcb6c4565f 100644
--- a/src/dumpmaster.pike
+++ b/src/dumpmaster.pike
@@ -8,7 +8,7 @@ string fr;
 
 array encoded=({});
 
-private function werror = _static_modules.files()->_stderr->write;
+private function werror = _static_modules._Stdio()->_stderr->write;
 
 mapping get_default_module()
 {
@@ -41,7 +41,7 @@ string fakeroot(string s)
 
 string read_file(string s)
 {
-  return _static_modules.files()->Fd(fakeroot(s),"r")->read();
+  return _static_modules._Stdio()->Fd(fakeroot(s),"r")->read();
 }
 
 program compile_file(string file)
@@ -64,7 +64,7 @@ class Codec
     switch(x)
     {
 #define CONST(X) case X: return #X
-      CONST(_static_modules.files.Stat);
+      CONST(_static_modules._Stdio.Stat);
       CONST(_static_modules.Builtin.__backend);
     }
     encoded+=({x});
@@ -79,7 +79,7 @@ void _main(array(string) argv, array(string) env)
     
   program p=compile_file(argv[-1]);
   string s=encode_value(p, Codec());
-  _static_modules.files()->Fd(fakeroot(argv[-1]) + ".o","wct")->write(s);
+  _static_modules._Stdio()->Fd(fakeroot(argv[-1]) + ".o","wct")->write(s);
   exit(0);
 }
 
diff --git a/src/modules/Inotify/inotify.cmod b/src/modules/Inotify/inotify.cmod
index 3cc55accaf56b8c2b715ad843698cdecded985f1..26fc0e65c3e0c8fc6c858d052a0ef1ebcc108403 100644
--- a/src/modules/Inotify/inotify.cmod
+++ b/src/modules/Inotify/inotify.cmod
@@ -28,7 +28,7 @@
 #include "fdlib.h"
 #include "pike_threadlib.h"
 
-#include "modules/files/file.h"
+#include "modules/_Stdio/file.h"
 
 #ifdef HAVE_SYS_INOTIFY_H