Index: src/bga_melter.d
==================================================================
--- src/bga_melter.d
+++ src/bga_melter.d
@@ -1,13 +1,12 @@
-private import win32.windows;
-private import std.string;
-private import std.file;
-private import std.c.stdio;
-private import std.string;
-private import etc.c.zlib;
-private import libbz2.bzlib;
-private import util;
+import win32.windows;
+import std.c.stdio;
+import std.file;
+import std.string;
+import etc.c.zlib;
+import libbz2.bzlib;
+import util;
 
 //----------------------------------------------------------------
 // Bga書庫のファイルヘッダ形式
 //----------------------------------------------------------------
 
@@ -95,11 +94,11 @@
 	private FILE* fp;
 	private this( FILE* p ) { fp = p; }
 
 	static Filep open( string filename, bool read )
 	{
-		FILE* fp = fopen( toStringz(filename), read?"rb":"wb" );
+		FILE* fp = fopen(filename.toStringz(), read?"rb":"wb");
 		return (fp ? new Filep(fp) : null);
 	}
 
 	int dup_han()
 	{
@@ -155,11 +154,11 @@
 //----------------------------------------------------------------
 
 class BgaMelter
 {
 	alias BgaAnswer delegate(ref BgaHeader) FileHandler;
-	alias BgaAnswer delegate(int, int)        ProgressHandler;
+	alias BgaAnswer delegate(int, int)      ProgressHandler;
 
 	private Filep fp = null;
 
 	this( string arc_name )
 	{
@@ -215,11 +214,11 @@
 						bContinue = BzDec( hdr.original_size, outf, ph );
 
 					// 閉じて属性設定
 					outf.close();
 					dosSetFTime( hdr.fname, hdr.date, hdr.time );
-					SetFileAttributesA( toStringz(hdr.fname), hdr.attrib );
+					SetFileAttributesA( hdr.fname.toStringz(), hdr.attrib );
 					if( !bContinue )
 						return;
 				}
 				finally { fp.seek_to(nextpos); }
 			}
@@ -286,11 +285,11 @@
 		if( hdr.arc_type==0 && hdr.compressed_size==hdr.original_size )
 		{
 			int x = hdr.fname.lastIndexOf('.');
 			if( x == -1 )
 				return true;
-			string ext = toLower(hdr.fname[x+1 .. $]);
+			string ext = hdr.fname[x+1 .. $].toLower();
 			if( ext=="arc" || ext=="arj" || ext=="bz2" || ext=="bza"
 			 || ext=="cab" || ext=="gz"  || ext=="gza" || ext=="lzh"
 			 || ext=="lzs" || ext=="pak" || ext=="rar" || ext=="taz"
 			 || ext=="tbz" || ext=="tgz" || ext=="z"   || ext=="zip"
 			 || ext=="zoo" )
@@ -299,23 +298,22 @@
 		return true;
 	}
 
 	static string pathMake( string path )
 	{
-		char* ps = cast(char*)toStringz(path);
-		for(char* p=ps;;)
+		char* ps = cast(char*)path.toStringz();
+		for(char* p=ps;; ++p)
 		{
 			for(; *p!=0&&*p!='\\'&&*p!='/'; p=CharNextA(p)) {}
 			if( *p==0 )
 				break;
-			CreateDirectoryA( toStringz(ps[0..(p-ps)]), null );
-			++p;
+			CreateDirectoryA( ps[0..(p-ps)].toStringz(), null );
 		}
 		return path;
 	}
 
-	enum { BUFSIZ = 65536 }
+	enum BUFSIZ = 65536;
 
 	private bool NcDec( uint usiz, Filep outf, ProgressHandler ph )
 	{
 		uint init_usiz = usiz;
 

Index: src/hack.d
==================================================================
--- src/hack.d
+++ src/hack.d
@@ -1,6 +1,6 @@
-private import core.sys.windows.windows;
+import core.sys.windows.windows;
 
 // Hack!
 //
 // _acrtused_dllが勝手に終了時に標準入出力ハンドルを
 // 閉じちゃって困るので、その辺りだけは閉じないような

Index: src/qbga32.d
==================================================================
--- src/qbga32.d
+++ src/qbga32.d
@@ -1,14 +1,14 @@
-private import core.sys.windows.dll;
-private import win32.windows;
-private import win32.winuser;
-private import std.string;
-private import std.file;
-private import util;
-private import windll;
-private import bga_melter;
-private import qbga_gui;
+import core.sys.windows.dll;
+import win32.windows;
+import win32.winuser;
+import std.string;
+import std.file;
+import util;
+import windll;
+import bga_melter;
+import qbga_gui;
 
 //----------------------------------------------------------------
 // おきまりのDLL初期化ルーチン
 //----------------------------------------------------------------
 

Index: src/util.d
==================================================================
--- src/util.d
+++ src/util.d
@@ -1,8 +1,8 @@
-private import win32.windows;
-private import std.string;
-private import std.file;
+import win32.windows;
+import std.string;
+import std.file;
 
 char lastChar( string s )
   { return *CharPrevA(cast(char*)s.ptr, cast(char*)s.ptr+s.length); }
 
 //----------------------------------------------------------------

Index: src/windll.d
==================================================================
--- src/windll.d
+++ src/windll.d
@@ -1,7 +1,7 @@
-private import win32.windows;
-private import std.string;
+import win32.windows;
+import std.string;
 
 class WinDLLException : Exception
 {
 	private this( string msg ) { super(msg); }
 }