diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1f9f98..d040a35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,6 @@ ENDIF()
 
 IF(UNIX)
   LIST(APPEND MAIKO_DEFINITIONS
-    "-DFORKCOMM"
     "-DLOGINT"
     "-DOLD_CURSOR"
   )
diff --git a/bin/makefile-cygwin.x86_64-x b/bin/makefile-cygwin.x86_64-x
index 4914d72..72429db 100644
--- a/bin/makefile-cygwin.x86_64-x
+++ b/bin/makefile-cygwin.x86_64-x
@@ -23,7 +23,7 @@ OPTFLAGS =  -O2 -g3
 DISPOPTFLAGS = -O2 -g3
 FPFLAGS =
 DFLAGS = -DAIX -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lcrypt
diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x
index 915ca35..7700ff4 100644
--- a/bin/makefile-darwin.386-x
+++ b/bin/makefile-darwin.386-x
@@ -22,7 +22,7 @@ DISPOPTFLAGS = -O2 -g
 FPFLAGS =
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
 DFLAGS = $(DEBUGFLAGS) -DMACOSX -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351 -DSTACKCHECK -DFSBCHECK -DPCTRACE
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x
index c02418a..7fe4690 100644
--- a/bin/makefile-darwin.aarch64-x
+++ b/bin/makefile-darwin.aarch64-x
@@ -22,7 +22,7 @@ DISPOPTFLAGS = -O1 -g
 FPFLAGS =
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
 DFLAGS = $(DEBUGFLAGS) -DMACOSX -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351
 
 LDFLAGS = -L/opt/local/lib -lX11 -lm
diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x
index 99aa279..bc7cb9d 100644
--- a/bin/makefile-darwin.x86_64-x
+++ b/bin/makefile-darwin.x86_64-x
@@ -22,7 +22,7 @@ DISPOPTFLAGS = -O1 -g
 FPFLAGS =
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
 DFLAGS = $(DEBUGFLAGS) -DMACOSX -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x
index 596e175..4ea86a3 100644
--- a/bin/makefile-freebsd.386-x
+++ b/bin/makefile-freebsd.386-x
@@ -22,7 +22,7 @@ OPTFLAGS = -O1 -gdwarf-2
 DISPOPTFLAGS = -O1 -gdwarf-2 
 FPFLAGS =
 DFLAGS = -DFREEBSD -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351
 
 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm -lcrypt
diff --git a/bin/makefile-init.386 b/bin/makefile-init.386
index ac0b222..e60c55a 100644
--- a/bin/makefile-init.386
+++ b/bin/makefile-init.386
@@ -21,7 +21,7 @@ OPTFLAGS =  -O0 -g
 DISPOPTFLAGS = -O0 -g
 FPFLAGS =
 DFLAGS = -DMACOSX -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351 -DNOVERSION -DINIT -DTRACE -DOPTRACE
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lm
diff --git a/bin/makefile-init.sparc b/bin/makefile-init.sparc
index fda1910..84c4e7f 100644
--- a/bin/makefile-init.sparc
+++ b/bin/makefile-init.sparc
@@ -50,7 +50,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
 MACHINEFLAGS = -DOS5 -DAIX -DUSE_DLPI -DNOPIXRECT \
 		-I$(OPENWINHOME)/include \
-		-DOLD_CURSOR -DLOGINT -DFORKCOMM -DLOCK_X_UPDATES
+		-DOLD_CURSOR -DLOGINT -DLOCK_X_UPDATES
 
 INLINEFLAGS =
 
diff --git a/bin/makefile-init.sparc-multi b/bin/makefile-init.sparc-multi
index 26f4686..17df700 100644
--- a/bin/makefile-init.sparc-multi
+++ b/bin/makefile-init.sparc-multi
@@ -20,7 +20,7 @@ FPFLAGS =
 # If you load MAIKOCOLOR.LCOM etc., you can use color functions
 # for bigatom work, removed  -DSPARCDISP -DSUN4_OS4_IL
 DFLAGS = -DINIT -DKBINT -DOS4 -DOS4_TYPE4BUG -DCOLOR \
-	-DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM \
+	-DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER \
 	-DNOASM -DRELEASE=210 #  -DNOVERSION -DRELEASE=201
 
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x
index 6d2803f..faec22c 100644
--- a/bin/makefile-linux.386-x
+++ b/bin/makefile-linux.386-x
@@ -22,7 +22,7 @@ OPTFLAGS =  -O2 -g3
 DISPOPTFLAGS = -O2 -g3
 FPFLAGS =
 DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lcrypt
diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x
index 1d96302..352d973 100644
--- a/bin/makefile-linux.armv7l-x
+++ b/bin/makefile-linux.armv7l-x
@@ -22,7 +22,7 @@ OPTFLAGS =  -O2 -g3
 DISPOPTFLAGS = -O2 -g3
 FPFLAGS =
 DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lcrypt
diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x
index df9761f..683657e 100644
--- a/bin/makefile-linux.x86_64-x
+++ b/bin/makefile-linux.x86_64-x
@@ -23,7 +23,7 @@ OPTFLAGS =  -O2 -g3
 DISPOPTFLAGS = -O2 -g3
 FPFLAGS =
 DFLAGS = -DLINUX -DAIX -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lcrypt
diff --git a/bin/makefile-openbsd.x86_64-x b/bin/makefile-openbsd.x86_64-x
index e3c6a33..6125b1d 100644
--- a/bin/makefile-openbsd.x86_64-x
+++ b/bin/makefile-openbsd.x86_64-x
@@ -22,7 +22,7 @@ OPTFLAGS =  -O2 -g3
 DISPOPTFLAGS = -O2 -g3
 FPFLAGS =
 DFLAGS = -DOPENBSD -DAIX -DOLD_CURSOR \
-	-DBYTESWAP -DFORKCOMM -DLOGINT  $(XFLAGS) \
+	-DBYTESWAP -DLOGINT  $(XFLAGS) \
 	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm
diff --git a/bin/makefile-sunos3.mc68020 b/bin/makefile-sunos3.mc68020
index c60812e..826af95 100644
--- a/bin/makefile-sunos3.mc68020
+++ b/bin/makefile-sunos3.mc68020
@@ -6,7 +6,7 @@ OEXT = .o
 OPTFLAGS = -O2
 DISPOPTFLAGS = -O
 FPFLAGS = -f68881
-DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM
+DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT -DSUNDISPLAY
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 INLINE = $(SRCDIR)disp68K.il
 BITBLTFILE = $(OBJECTDIR)bitblt68K.o
diff --git a/bin/makefile-sunos3.mc68020-multi b/bin/makefile-sunos3.mc68020-multi
index 71ef2df..486dfd0 100644
--- a/bin/makefile-sunos3.mc68020-multi
+++ b/bin/makefile-sunos3.mc68020-multi
@@ -11,7 +11,7 @@ DISPOPTFLAGS = -O
 FPFLAGS = -f68881
 # DISPLAYBUFFER for Color Sparcstation code testing
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM
+DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos3.mc68020-x b/bin/makefile-sunos3.mc68020-x
index 6173eee..1c9a135 100644
--- a/bin/makefile-sunos3.mc68020-x
+++ b/bin/makefile-sunos3.mc68020-x
@@ -33,7 +33,7 @@ OEXT = .o
 OPTFLAGS = -O2
 DISPOPTFLAGS = -O
 FPFLAGS = -f68881
-DFLAGS = -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM
+DFLAGS = -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT $(XFLAGS)
 LDFLAGS = -lX11 -lpixrect -lc -lm
 INLINE = $(SRCDIR)disp68K.il
 BITBLTFILE = $(OBJECTDIR)bitblt68K.o
diff --git a/bin/makefile-sunos3.sparc b/bin/makefile-sunos3.sparc
index a8776ac..c272073 100644
--- a/bin/makefile-sunos3.sparc
+++ b/bin/makefile-sunos3.sparc
@@ -6,7 +6,7 @@ OEXT = .o
 OPTFLAGS = -O2
 FPFLAGS =
 # JRB - I'm not 100% sure about these flags; someone should check...
-DFLAGS = -DKBINT -DFLTINT -DSPARCDISP -DOS4_TYPE4BUG -DOLD_CURSOR -DSUNDISPLAY -DFORKCOMM
+DFLAGS = -DKBINT -DFLTINT -DSPARCDISP -DOS4_TYPE4BUG -DOLD_CURSOR -DSUNDISPLAY
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 #-Dsparc?
 INLINE = $(SRCDIR)dispSPARC.il
diff --git a/bin/makefile-sunos4.1.i386 b/bin/makefile-sunos4.1.i386
index 1c9926c..11c8b9b 100644
--- a/bin/makefile-sunos4.1.i386
+++ b/bin/makefile-sunos4.1.i386
@@ -5,7 +5,7 @@ OEXT = .o
 #For debugging
 OPTFLAGS = -g
 FPFLAGS = 
-DFLAGS = -DKBINT -DFLTINT -DNOASM -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DSUNDISPLAY -DFORKCOMM
+DFLAGS = -DKBINT -DFLTINT -DNOASM -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DSUNDISPLAY
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 INLINE = $(SRCDIR)disp386i.il
 
diff --git a/bin/makefile-sunos4.1.i386-multi b/bin/makefile-sunos4.1.i386-multi
index df07b22..3b91157 100644
--- a/bin/makefile-sunos4.1.i386-multi
+++ b/bin/makefile-sunos4.1.i386-multi
@@ -6,7 +6,7 @@ OEXT = .o
 OPTFLAGS = -O
 DISPOPTFLAGS = -O
 FPFLAGS = 
-DFLAGS = -DKBINT -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP -DFORKCOMM
+DFLAGS = -DKBINT -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 INLINE = $(SRCDIR)disp386i.il
 BITBLTFILE=$(OBJECTDIR)bitblt386i.o
diff --git a/bin/makefile-sunos4.1.mc68020 b/bin/makefile-sunos4.1.mc68020
index 046f855..3809342 100644
--- a/bin/makefile-sunos4.1.mc68020
+++ b/bin/makefile-sunos4.1.mc68020
@@ -10,7 +10,7 @@ FPFLAGS = -f68881
 # [I remove DISPLAYBUFFER option .
 # You may run 'makeright multi'.  -osamu '90/02/07]
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM
+DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.1.mc68020-multi b/bin/makefile-sunos4.1.mc68020-multi
index 2eeb438..c6c5319 100644
--- a/bin/makefile-sunos4.1.mc68020-multi
+++ b/bin/makefile-sunos4.1.mc68020-multi
@@ -11,7 +11,7 @@ DISPOPTFLAGS = -O
 FPFLAGS = -f68881
 # DISPLAYBUFFER for Color Sparcstation code testing
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM
+DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.1.mc68020-x b/bin/makefile-sunos4.1.mc68020-x
index f4ca322..f33d5e0 100644
--- a/bin/makefile-sunos4.1.mc68020-x
+++ b/bin/makefile-sunos4.1.mc68020-x
@@ -37,7 +37,7 @@ FPFLAGS = -f68881
 # [I remove DISPLAYBUFFER option .
 # You may run 'makeright x'.  -osamu '90/02/27]
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM
+DFLAGS = -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS)
 LDFLAGS = -lX11 -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.1.sparc b/bin/makefile-sunos4.1.sparc
index 9625718..30736fc 100644
--- a/bin/makefile-sunos4.1.sparc
+++ b/bin/makefile-sunos4.1.sparc
@@ -9,7 +9,7 @@ DISPOPTFLAGS = -g
 FPFLAGS =
 # Now share the same ldesingle with COLOR(CG4)/MONO Suns
 # If you load MAIKOCOLOR.LCOM etc., you can use color functions
-DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DNOEUROKBD
+DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DNOEUROKBD
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -ldld -lc -lm
 # SPARC Assemble optimize check
 DFLAGS:sh += optck.sh ; true
diff --git a/bin/makefile-sunos4.1.sparc-color b/bin/makefile-sunos4.1.sparc-color
index b8ea287..a090022 100644
--- a/bin/makefile-sunos4.1.sparc-color
+++ b/bin/makefile-sunos4.1.sparc-color
@@ -6,7 +6,7 @@ OEXT = .o
 OPTFLAGS = -g
 FPFLAGS =
 # For COLOR, Add COLOR, remove OLD_CURSOR
-DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DFLTINT  -DCOLOR -DNEWBITBLT -DSUNDISPLAY -DLOGINT -DFORKCOMM
+DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DFLTINT  -DCOLOR -DNEWBITBLT -DSUNDISPLAY -DLOGINT
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 # SPARC Assemble optimize check
 DFLAGS:sh += optck.sh ; true
diff --git a/bin/makefile-sunos4.1.sparc-multi b/bin/makefile-sunos4.1.sparc-multi
index a85cd36..a22b2ac 100644
--- a/bin/makefile-sunos4.1.sparc-multi
+++ b/bin/makefile-sunos4.1.sparc-multi
@@ -14,7 +14,7 @@ FPFLAGS =
 # Now share the same ldemulti for Mono-Medley & Color-Medley
 # If you load MAIKOCOLOR.LCOM etc., you can use color functions
 
-DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DNOEUROKBD
+DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DNOEUROKBD
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -ldld -lc -lm
 # SPARC Assemble optimize check
 DFLAGS:sh += optck.sh ; true
diff --git a/bin/makefile-sunos4.1.sparc-x b/bin/makefile-sunos4.1.sparc-x
index 9f5757d..7f442f0 100644
--- a/bin/makefile-sunos4.1.sparc-x
+++ b/bin/makefile-sunos4.1.sparc-x
@@ -34,7 +34,7 @@ OPTFLAGS = -g
 DISPOPTFLAGS = -g
 
 FPFLAGS =
-DFLAGS = -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DOLD_CURSOR -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DNOEUROKBD
+DFLAGS = -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DOLD_CURSOR -DNEWBITBLT -DLOGINT $(XFLAGS) -DNOEUROKBD
 LDFLAGS = -lX11 -lpixrect -lc -lm -ldld
 LDELDFLAGS = -Bstatic -lX11 -lpixrect -Bdynamic -lc -lm
 # SPARC Assemble optimize check
diff --git a/bin/makefile-sunos4.i386 b/bin/makefile-sunos4.i386
index 1c9926c..11c8b9b 100644
--- a/bin/makefile-sunos4.i386
+++ b/bin/makefile-sunos4.i386
@@ -5,7 +5,7 @@ OEXT = .o
 #For debugging
 OPTFLAGS = -g
 FPFLAGS = 
-DFLAGS = -DKBINT -DFLTINT -DNOASM -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DSUNDISPLAY -DFORKCOMM
+DFLAGS = -DKBINT -DFLTINT -DNOASM -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DSUNDISPLAY
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 INLINE = $(SRCDIR)disp386i.il
 
diff --git a/bin/makefile-sunos4.i386-multi b/bin/makefile-sunos4.i386-multi
index e48fae9..f32488a 100644
--- a/bin/makefile-sunos4.i386-multi
+++ b/bin/makefile-sunos4.i386-multi
@@ -6,7 +6,7 @@ OEXT = .o
 OPTFLAGS = -O -traditional
 DISPOPTFLAGS = -O -traditional
 FPFLAGS = 
-DFLAGS = -DKBINT -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP -DFORKCOMM
+DFLAGS = -DKBINT -DOS4 -DI386 -DBYTESWAP -DCHECK -DLOGINT -DDISPLAYBUFFER -DSUNDISPLAY -DNEWBITBLT -DOPDISP
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 INLINE = $(SRCDIR)disp386i.il
 BITBLTFILE=$(OBJECTDIR)bitblt386i.o
diff --git a/bin/makefile-sunos4.mc68020 b/bin/makefile-sunos4.mc68020
index 046f855..3809342 100644
--- a/bin/makefile-sunos4.mc68020
+++ b/bin/makefile-sunos4.mc68020
@@ -10,7 +10,7 @@ FPFLAGS = -f68881
 # [I remove DISPLAYBUFFER option .
 # You may run 'makeright multi'.  -osamu '90/02/07]
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM
+DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.mc68020-multi b/bin/makefile-sunos4.mc68020-multi
index 2eeb438..c6c5319 100644
--- a/bin/makefile-sunos4.mc68020-multi
+++ b/bin/makefile-sunos4.mc68020-multi
@@ -11,7 +11,7 @@ DISPOPTFLAGS = -O
 FPFLAGS = -f68881
 # DISPLAYBUFFER for Color Sparcstation code testing
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM
+DFLAGS = -DKBINT -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.mc68020-x b/bin/makefile-sunos4.mc68020-x
index 298bb8d..1c80ee8 100644
--- a/bin/makefile-sunos4.mc68020-x
+++ b/bin/makefile-sunos4.mc68020-x
@@ -37,7 +37,7 @@ FPFLAGS = -f68881
 # [I remove DISPLAYBUFFER option .
 # You may run 'makeright x'.  -osamu '90/02/27]
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM
+DFLAGS = -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS)
 LDFLAGS = -lX11 -lpixrect -lc -lm
 LDELDFLAGS = -Bstatic -lX11 -lpixrect -Bdynamic -lc -lm
 
diff --git a/bin/makefile-sunos4.sparc b/bin/makefile-sunos4.sparc
index 818dd55..aaa3dd6 100644
--- a/bin/makefile-sunos4.sparc
+++ b/bin/makefile-sunos4.sparc
@@ -35,7 +35,7 @@ FPFLAGS =
 #
 DEBUGFLAGS = # -DNOASM -DSTACKCHECK -DFNSTKCHECK
 MACHINEFLAGS = -DOS4 -DOS4_TYPE4BUG -DCOLOR -DSUNDISPLAY  \
-	       -DNEWBITBLT -DLOGINT -DFORKCOMM
+	       -DNEWBITBLT -DLOGINT
 FEATUREFLAGS = # -DLPSOLVE -DXMAS
 
 INLINEFLAGS =  # -DSPARCDISP -DSUN4_OS4_IL
diff --git a/bin/makefile-sunos4.sparc-3 b/bin/makefile-sunos4.sparc-3
index af3e676..809f3f3 100644
--- a/bin/makefile-sunos4.sparc-3
+++ b/bin/makefile-sunos4.sparc-3
@@ -17,7 +17,7 @@ OPTFLAGS = -O2
 FPFLAGS =
 # Now share the same ldesingle with COLOR(CG4)/MONO Suns
 # If you load MAIKOCOLOR.LCOM etc., you can use color functions
-DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM
+DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DCOLOR -DNEWBITBLT -DLOGINT -DSUNDISPLAY
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 #-Dsparc?
 INLINE = $(SRCDIR)dispSPARC.il
diff --git a/bin/makefile-sunos4.sparc-color b/bin/makefile-sunos4.sparc-color
index c595d9c..95a8c1f 100644
--- a/bin/makefile-sunos4.sparc-color
+++ b/bin/makefile-sunos4.sparc-color
@@ -6,7 +6,7 @@ OEXT = .o
 OPTFLAGS = -g
 FPFLAGS =
 # For COLOR, Add COLOR, remove OLD_CURSOR
-DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DFLTINT  -DCOLOR -DNEWBITBLT -DSUNDISPLAY -DLOGINT -DFORKCOMM
+DFLAGS = -DKBINT -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DFLTINT  -DCOLOR -DNEWBITBLT -DSUNDISPLAY -DLOGINT
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 #-Dsparc?
diff --git a/bin/makefile-sunos4.sparc-multi b/bin/makefile-sunos4.sparc-multi
index c1af276..514cb43 100644
--- a/bin/makefile-sunos4.sparc-multi
+++ b/bin/makefile-sunos4.sparc-multi
@@ -41,7 +41,7 @@ FPFLAGS =
 #
 #DEBUGFLAGS = -DNOASM -DSTACKCHECK -DFNSTKCHECK
 MACHINEFLAGS = -DOS4 -DOS4_TYPE4BUG -DCOLOR -DDISPLAYBUFFER -DSUNDISPLAY  \
-			   -DNEWBITBLT -DLOGINT -DFORKCOMM
+			   -DNEWBITBLT -DLOGINT
 
 INLINEFLAGS = # -DSPARCDISP -DSUN4_OS4_IL
 
diff --git a/bin/makefile-sunos4.sparc-multi-3 b/bin/makefile-sunos4.sparc-multi-3
index 14de540..69e4e7c 100644
--- a/bin/makefile-sunos4.sparc-multi-3
+++ b/bin/makefile-sunos4.sparc-multi-3
@@ -17,7 +17,7 @@ FPFLAGS =
 # Removed for debug:  -DSPARCDISP -DSUN4_OS4_IL 
 # Added for debug: -DFNSTKCHECK -DMYOPTRACE -DOPTRACE -DNOASM
 #
-DFLAGS = -DKBINT -DOS4 -DOS4_TYPE4BUG -DCOLOR -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DSPARCDISP -DSUN4_OS4_IL -DFORKCOMM
+DFLAGS = -DKBINT -DOS4 -DOS4_TYPE4BUG -DCOLOR -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DSPARCDISP -DSUN4_OS4_IL
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 #-Dsparc?
 INLINE = $(SRCDIR)dispSPARC.il
diff --git a/bin/makefile-sunos4.sparc-x b/bin/makefile-sunos4.sparc-x
index 4ac4c0b..a9713aa 100644
--- a/bin/makefile-sunos4.sparc-x
+++ b/bin/makefile-sunos4.sparc-x
@@ -29,7 +29,7 @@ FPFLAGS =
 #DEBUGFLAGS = -DNOASM -DSTACKCHECK -DFNSTKCHECK
 MACHINEFLAGS = -DOS4 -DOS4_TYPE4BUG -DOLD_CURSOR -DNOPIXRECT \
 	       -I$(OPENWINHOME)/include \
-			   -DNEWBITBLT -DLOGINT -DFORKCOMM -DLOCK_X_UPDATES
+			   -DNEWBITBLT -DLOGINT -DLOCK_X_UPDATES
 
 INLINEFLAGS = # -DSPARCDISP -DSUN4_OS4_IL
 
diff --git a/bin/makefile-sunos4.sparc-x-3 b/bin/makefile-sunos4.sparc-x-3
index 8050857..cb3c4e5 100644
--- a/bin/makefile-sunos4.sparc-x-3
+++ b/bin/makefile-sunos4.sparc-x-3
@@ -33,7 +33,7 @@ OEXT = .o
 OPTFLAGS = -O2
 FPFLAGS =
 DFLAGS = -DOS4 -DSPARCDISP -DSUN4_OS4_IL -DOS4_TYPE4BUG -DOLD_CURSOR \
-	-DFORKCOMM -DNEWBITBLT -DLOGINT $(XFLAGS)
+	-DNEWBITBLT -DLOGINT $(XFLAGS)
 LDFLAGS = -lX11 -lpixrect -lc -lm
 # -Dsparc?
 INLINE = $(SRCDIR)dispSPARC.il
diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x
index 673bd4e..6fde220 100644
--- a/bin/makefile-sunos5.386-x
+++ b/bin/makefile-sunos5.386-x
@@ -43,7 +43,7 @@ FPFLAGS =
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	-DOS5 -DBYTESWAP -DOLD_CURSOR -DLOGINT \
-	-DNOPIXRECT -DFORKCOMM -DLOCK_X_UPDATES   \
+	-DNOPIXRECT -DLOCK_X_UPDATES   \
 	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl
diff --git a/bin/makefile-sunos5.i386-x b/bin/makefile-sunos5.i386-x
index 8ff3217..0934ad3 100644
--- a/bin/makefile-sunos5.i386-x
+++ b/bin/makefile-sunos5.i386-x
@@ -45,7 +45,7 @@ DFLAGS = $(XFLAGS) \
 	-DOS5 -DAIX -DUSE_DLPI \
 	-DBYTESWAP \
 	 -DOLD_CURSOR -DLOGINT \
-	  -DNOPIXRECT -DFORKCOMM -DLOCK_X_UPDATES   \
+	  -DNOPIXRECT -DLOCK_X_UPDATES   \
 	 -I$(OPENWINHOME)/include \
 	 -DRELEASE=210
 
diff --git a/bin/makefile-sunos5.sparc-x b/bin/makefile-sunos5.sparc-x
index 8a3198e..55f3781 100644
--- a/bin/makefile-sunos5.sparc-x
+++ b/bin/makefile-sunos5.sparc-x
@@ -46,7 +46,7 @@ MAIN = main
 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
 MACHINEFLAGS = -DOS5 -DUSE_DLPI -DNOPIXRECT \
-		-DOLD_CURSOR -DLOGINT -DFORKCOMM -DLOCK_X_UPDATES
+		-DOLD_CURSOR -DLOGINT -DLOCK_X_UPDATES
 
 INLINEFLAGS =
 
diff --git a/bin/makefile-sunos5.x86_64-x b/bin/makefile-sunos5.x86_64-x
index 7075e95..1e0beaf 100644
--- a/bin/makefile-sunos5.x86_64-x
+++ b/bin/makefile-sunos5.x86_64-x
@@ -43,7 +43,7 @@ FPFLAGS =
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	-DOS5 -DBYTESWAP -DOLD_CURSOR -DLOGINT \
-	-DNOPIXRECT -DFORKCOMM -DLOCK_X_UPDATES   \
+	-DNOPIXRECT -DLOCK_X_UPDATES   \
 	-DUSE_DLPI \
 	-DRELEASE=351
 
diff --git a/src/ldeboot.c b/src/ldeboot.c
index 7eb58fa..4b54056 100644
--- a/src/ldeboot.c
+++ b/src/ldeboot.c
@@ -103,14 +103,12 @@ int main(int argc, char *argv[])
       XCloseDisplay(Xdisplay);
       strcpy(filetorun, LDEX);
 
-#ifdef FORKCOMM
       /* JRB - call fork_Unix here, while we're REALLY small, unless -NF is
               specified, of course... */
       for (i = 0; i < argc; i++)
         if (!strcmp(argv[i], "-NF")) break;
       if (i == argc) /* -NF not in arguments */
         fork_Unix();
-#endif /* FORKCOMM */
 
       argv[0] = filetorun;
       execvp(filetorun, argv);
@@ -181,14 +179,12 @@ int main(int argc, char *argv[])
 
 #endif /* USESUNSCREEN */
 
-#ifdef FORKCOMM
   /* JRB - call fork_Unix here, while we're REALLY small, unless -NF is
           specified, of course... */
   for (i = 0; i < argc; i++)
     if (!strcmp(argv[i], "-NF")) break;
   if (i == argc) /* -NF not in arguments */
     fork_Unix();
-#endif
 
   /* start ldemono or ldecolor */
 
diff --git a/src/main.c b/src/main.c
index 3da49f1..ebef22d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -496,7 +496,9 @@ int main(int argc, char *argv[])
   init_ether(); /* modified by kiuchi Nov. 4 */
 #endif          /* MAIKO_ENABLE_ETHERNET */
 
-#ifdef FORKCOMM
+#ifdef DOS
+  init_host_filesystem();
+#else
   /* Fork Unix was called in kickstarter; if we forked, look up the */
   /* pipe handles to the subprocess and set them up.		      */
 
@@ -504,20 +506,8 @@ int main(int argc, char *argv[])
   {                    /* in case we're re-starting a savevm w/open ptys */
     if (please_fork) fprintf(stderr, "Failed to find UNIXCOMM file handles; no processes\n");
   }
-#else
-/* Fork Unix Interface subprocess before we create anything big;   */
-/* interrupts need to be blocked here so subprocess won't see them */
-/* This should actually live in the kickstarter... */
-
-#ifdef DOS
-  init_host_filesystem();
-#else
-  if (please_fork) {
-    int_block();
-    fork_Unix();
-  }
 #endif /* DOS */
-#endif /* FORKCOMM */
+
 #if defined(DOS) || defined(XWINDOW)
   make_dsp_instance(currentdsp, 0, 0, 0, 1); /* All defaults the first time */
 #endif                                       /* DOS || XWINDOW */