diff --git a/libs/BorlandC/dosfattr.asm b/libs/BorlandC/dosfattr.asm
new file mode 100644
index 00000000..dc8df293
--- /dev/null
+++ b/libs/BorlandC/dosfattr.asm
@@ -0,0 +1,62 @@
+; unsigned int __cdecl _dos_getfileattr(const char *filename, unsigned int *attrib)
+__dos_getfileattr proc DIST
+@@filename	= DPTR_ 2 + dPtrSize
+@@attrib	= DPTR_ 2 + (dPtrSize * 2)
+
+		push	bp
+		mov	bp, sp
+		push	si
+		push	di
+		pushDS_
+		mov	ah, 43h
+		xor	al, al
+		LDS_	dx, [bp+@@filename]
+		int	21h
+		popDS_
+		jb	short @@_getFailed
+		LES_	bx, [bp+@@attrib]
+		mov	ES_[bx], cx
+		xor	ax, ax
+		jmp	short @@ret
+
+@@_getFailed:
+		push	ax
+		call	__DOSERROR
+
+@@ret:
+		pop	di
+		pop	si
+		pop	bp
+		ret
+__dos_getfileattr endp
+
+; unsigned int __cdecl _dos_setfileattr(const char *filename, unsigned int attrib)
+__dos_setfileattr proc DIST
+@@filename	= DPTR_ 2 + dPtrSize
+@@attrib	= DPTR_ 2 + (dPtrSize * 2)
+
+		push	bp
+		mov	bp, sp
+		push	si
+		push	di
+		pushDS_
+		mov	ah, 43h
+		mov	al, 1
+		LDS_	dx, [bp+@@filename]
+		mov	cx, word ptr [bp+@@attrib]
+		int	21h
+		popDS_
+		jb	short @@_setFailed
+		xor	ax, ax
+		jmp	short @@ret
+
+@@_setFailed:
+		push	ax
+		call	__DOSERROR
+
+@@ret:
+		pop	di
+		pop	si
+		pop	bp
+		ret
+__dos_setfileattr endp
diff --git a/th01_fuuin.asm b/th01_fuuin.asm
index c7bd7803..54d04272 100644
--- a/th01_fuuin.asm
+++ b/th01_fuuin.asm
@@ -3251,87 +3251,7 @@ include libs/BorlandC/atexit.asm
 include libs/BorlandC/del.asm
 include libs/BorlandC/delarray.asm
 include libs/BorlandC/dosenv.asm
-
-; =============== S U B	R O U T	I N E =======================================
-
-; Attributes: library function bp-based	frame
-
-; unsigned int __cdecl _dos_getfileattr(const char *filename, unsigned int *attrib)
-__dos_getfileattr proc far
-
-filename	= dword	ptr  6
-attrib		= dword	ptr  0Ah
-
-		push	bp
-		mov	bp, sp
-		push	si
-		push	di
-		push	ds
-		mov	ah, 43h	; 'C'
-		xor	al, al
-		lds	dx, [bp+filename]
-		int	21h		; DOS -	2+ - GET FILE ATTRIBUTES
-					; DS:DX	-> ASCIZ file name or directory
-					; name without trailing	slash
-		pop	ds
-		jb	short loc_1DD9
-		les	bx, [bp+attrib]
-		mov	es:[bx], cx
-		xor	ax, ax
-		jmp	short loc_1DDD
-; ---------------------------------------------------------------------------
-
-loc_1DD9:
-		push	ax
-		call	__DOSERROR
-
-loc_1DDD:
-		pop	di
-		pop	si
-		pop	bp
-		retf
-__dos_getfileattr endp
-
-
-; =============== S U B	R O U T	I N E =======================================
-
-; Attributes: library function bp-based	frame
-
-; unsigned int __cdecl _dos_setfileattr(const char *filename, unsigned int attrib)
-__dos_setfileattr proc far
-
-filename	= dword	ptr  6
-attrib		= word ptr  0Ah
-
-		push	bp
-		mov	bp, sp
-		push	si
-		push	di
-		push	ds
-		mov	ah, 43h	; 'C'
-		mov	al, 1
-		lds	dx, [bp+filename]
-		mov	cx, [bp+attrib]
-		int	21h		; DOS -	2+ - SET FILE ATTRIBUTES
-					; DS:DX	-> ASCIZ file name
-					; CX = file attribute bits
-		pop	ds
-		jb	short loc_1DFA
-		xor	ax, ax
-		jmp	short loc_1DFE
-; ---------------------------------------------------------------------------
-
-loc_1DFA:
-		push	ax
-		call	__DOSERROR
-
-loc_1DFE:
-		pop	di
-		pop	si
-		pop	bp
-		retf
-__dos_setfileattr endp
-
+include libs/BorlandC/dosfattr.asm
 include libs/BorlandC/dosgdriv.asm
 include libs/BorlandC/errormsg.asm
 include libs/BorlandC/exit.asm
@@ -3658,9 +3578,7 @@ loc_228F:
 		push	ax		; attrib
 		push	word ptr [bp+dest+2]
 		push	word ptr [bp+dest] ; filename
-		nop
-		push	cs
-		call	near ptr __dos_getfileattr
+		nopcall	__dos_getfileattr
 		add	sp, 8
 		or	ax, ax
 		jz	short loc_2274
diff --git a/th01_op.asm b/th01_op.asm
index 10aec1c2..61b93154 100644
--- a/th01_op.asm
+++ b/th01_op.asm
@@ -3038,87 +3038,7 @@ include libs/BorlandC/atexit.asm
 include libs/BorlandC/del.asm
 include libs/BorlandC/delarray.asm
 include libs/BorlandC/dosenv.asm
-
-; =============== S U B	R O U T	I N E =======================================
-
-; Attributes: library function bp-based	frame
-
-; unsigned int __cdecl _dos_getfileattr(const char *filename, unsigned int *attrib)
-__dos_getfileattr proc far
-
-filename	= dword	ptr  6
-attrib		= dword	ptr  0Ah
-
-		push	bp
-		mov	bp, sp
-		push	si
-		push	di
-		push	ds
-		mov	ah, 43h	; 'C'
-		xor	al, al
-		lds	dx, [bp+filename]
-		int	21h		; DOS -	2+ - GET FILE ATTRIBUTES
-					; DS:DX	-> ASCIZ file name or directory
-					; name without trailing	slash
-		pop	ds
-		jb	short loc_1E99
-		les	bx, [bp+attrib]
-		mov	es:[bx], cx
-		xor	ax, ax
-		jmp	short loc_1E9D
-; ---------------------------------------------------------------------------
-
-loc_1E99:
-		push	ax
-		call	__DOSERROR
-
-loc_1E9D:
-		pop	di
-		pop	si
-		pop	bp
-		retf
-__dos_getfileattr endp
-
-
-; =============== S U B	R O U T	I N E =======================================
-
-; Attributes: library function bp-based	frame
-
-; unsigned int __cdecl _dos_setfileattr(const char *filename, unsigned int attrib)
-__dos_setfileattr proc far
-
-filename	= dword	ptr  6
-attrib		= word ptr  0Ah
-
-		push	bp
-		mov	bp, sp
-		push	si
-		push	di
-		push	ds
-		mov	ah, 43h	; 'C'
-		mov	al, 1
-		lds	dx, [bp+filename]
-		mov	cx, [bp+attrib]
-		int	21h		; DOS -	2+ - SET FILE ATTRIBUTES
-					; DS:DX	-> ASCIZ file name
-					; CX = file attribute bits
-		pop	ds
-		jb	short loc_1EBA
-		xor	ax, ax
-		jmp	short loc_1EBE
-; ---------------------------------------------------------------------------
-
-loc_1EBA:
-		push	ax
-		call	__DOSERROR
-
-loc_1EBE:
-		pop	di
-		pop	si
-		pop	bp
-		retf
-__dos_setfileattr endp
-
+include libs/BorlandC/dosfattr.asm
 include libs/BorlandC/dosgdriv.asm
 include libs/BorlandC/errormsg.asm
 include libs/BorlandC/exit.asm
@@ -3377,9 +3297,7 @@ loc_22F7:
 		push	ax		; attrib
 		push	word ptr [bp+dest+2]
 		push	word ptr [bp+dest] ; filename
-		nop
-		push	cs
-		call	near ptr __dos_getfileattr
+		nopcall	__dos_getfileattr
 		add	sp, 8
 		or	ax, ax
 		jz	short loc_22DC
diff --git a/th01_reiiden.asm b/th01_reiiden.asm
index 0be15084..746c21e3 100644
--- a/th01_reiiden.asm
+++ b/th01_reiiden.asm
@@ -4402,87 +4402,7 @@ include libs/BorlandC/atexit.asm
 include libs/BorlandC/del.asm
 include libs/BorlandC/delarray.asm
 include libs/BorlandC/dosenv.asm
-
-; =============== S U B	R O U T	I N E =======================================
-
-; Attributes: library function bp-based	frame
-
-; unsigned int __cdecl _dos_getfileattr(const char *filename, unsigned int *attrib)
-__dos_getfileattr proc far
-
-filename	= dword	ptr  6
-attrib		= dword	ptr  0Ah
-
-		push	bp
-		mov	bp, sp
-		push	si
-		push	di
-		push	ds
-		mov	ah, 43h	; 'C'
-		xor	al, al
-		lds	dx, [bp+filename]
-		int	21h		; DOS -	2+ - GET FILE ATTRIBUTES
-					; DS:DX	-> ASCIZ file name or directory
-					; name without trailing	slash
-		pop	ds
-		jb	short loc_2613
-		les	bx, [bp+attrib]
-		mov	es:[bx], cx
-		xor	ax, ax
-		jmp	short loc_2617
-; ---------------------------------------------------------------------------
-
-loc_2613:
-		push	ax
-		call	__DOSERROR
-
-loc_2617:
-		pop	di
-		pop	si
-		pop	bp
-		retf
-__dos_getfileattr endp
-
-
-; =============== S U B	R O U T	I N E =======================================
-
-; Attributes: library function bp-based	frame
-
-; unsigned int __cdecl _dos_setfileattr(const char *filename, unsigned int attrib)
-__dos_setfileattr proc far
-
-filename	= dword	ptr  6
-attrib		= word ptr  0Ah
-
-		push	bp
-		mov	bp, sp
-		push	si
-		push	di
-		push	ds
-		mov	ah, 43h	; 'C'
-		mov	al, 1
-		lds	dx, [bp+filename]
-		mov	cx, [bp+attrib]
-		int	21h		; DOS -	2+ - SET FILE ATTRIBUTES
-					; DS:DX	-> ASCIZ file name
-					; CX = file attribute bits
-		pop	ds
-		jb	short loc_2634
-		xor	ax, ax
-		jmp	short loc_2638
-; ---------------------------------------------------------------------------
-
-loc_2634:
-		push	ax
-		call	__DOSERROR
-
-loc_2638:
-		pop	di
-		pop	si
-		pop	bp
-		retf
-__dos_setfileattr endp
-
+include libs/BorlandC/dosfattr.asm
 include libs/BorlandC/dosgdriv.asm
 include libs/BorlandC/errormsg.asm
 include libs/BorlandC/exit.asm
@@ -4899,9 +4819,7 @@ loc_2B79:
 		push	ax		; attrib
 		push	word ptr [bp+dest+2]
 		push	word ptr [bp+dest] ; filename
-		nop
-		push	cs
-		call	near ptr __dos_getfileattr
+		nopcall	__dos_getfileattr
 		add	sp, 8
 		or	ax, ax
 		jz	short loc_2B5E