diff --git a/glob-expand/glob-expand.d.ts b/glob-expand/glob-expand.d.ts
index c27c90d7fd..b6bfedd7d1 100644
--- a/glob-expand/glob-expand.d.ts
+++ b/glob-expand/glob-expand.d.ts
@@ -3,10 +3,7 @@
 // Definitions by: vvakame <https://github.com/vvakame/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../glob/glob.d.ts" />
-
-
-import * as _glob from "glob";
+import * as glob from "../glob";
 
 interface Option {
     filter?: string | ((filePath: string) => boolean);
@@ -14,7 +11,7 @@ interface Option {
 }
 
 declare namespace expand {
-    var glob: typeof _glob;
+    var glob: typeof glob;
     var VERSION: string;
 }
 
diff --git a/glob-stream/glob-stream-tests.ts b/glob-stream/glob-stream-tests.ts
index 1f0cbd3581..84e34dfe3e 100644
--- a/glob-stream/glob-stream-tests.ts
+++ b/glob-stream/glob-stream-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="glob-stream.d.ts" />
-
-import gs = require('glob-stream');
+import gs = require('./');
 
 var read: NodeJS.ReadableStream;
 
diff --git a/glob-stream/glob-stream.d.ts b/glob-stream/index.d.ts
similarity index 89%
rename from glob-stream/glob-stream.d.ts
rename to glob-stream/index.d.ts
index 8f7415de23..e9ebd037cd 100644
--- a/glob-stream/glob-stream.d.ts
+++ b/glob-stream/index.d.ts
@@ -4,10 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../glob/glob.d.ts" />
 
-
-import glob = require('glob');
+import glob = require('../glob');
 
 export interface Options extends glob.IOptions {
     cwd?: string;
diff --git a/glob/glob-tests.ts b/glob/glob-tests.ts
index af5ecf6d05..c2c17bbbb5 100644
--- a/glob/glob-tests.ts
+++ b/glob/glob-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="./glob.d.ts" />
-
-import glob = require("glob");
+import glob = require("./");
 var Glob = glob.Glob;
 
 (()=> {
diff --git a/glob/glob.d.ts b/glob/index.d.ts
similarity index 97%
rename from glob/glob.d.ts
rename to glob/index.d.ts
index 430022e525..3febd1d91a 100644
--- a/glob/glob.d.ts
+++ b/glob/index.d.ts
@@ -4,13 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../minimatch/minimatch.d.ts" />
-
-
 
 import events = require("events");
 import fs = require('fs');
-import minimatch = require("minimatch");
+import minimatch = require("../minimatch");
 
 declare function G(pattern: string, cb: (err: Error, matches: string[]) => void): void;
 declare function G(pattern: string, options: G.IOptions, cb: (err: Error, matches: string[]) => void): void;