Generated TypeScript declarations incorrectly references types when there is more than 1 include

import "Other.thrift"

struct MyStruct {
     1:Other.OtherType field;
}

service MyService {
     Other.OtherResponse magic(1:Other.OtherRequest arg)
}

// foo_types.d.ts
import other_types = require("./other"); 

declare class MyStruct {
     public field: OtherType; // !!! Compile failure, unknown type OtherType
}

// foo_service.d.ts
import other_types = require("./other"); 

class MyService {
     public magic(request: OtherRequest) : Promise<OtherResponse> // !!! Compile failure, unknown type OtherRequest, OtherResponse
}

// foo_types.d.ts
import other_types = require("./other"); 

declare class MyStruct {
     public field: other_types.OtherType; 
}

// foo_service.d.ts
import other_types = require("./other"); 

class MyService {
     public magic(request: other_types.OtherRequest) : Promise<other_types.OtherResponse> 
}