diff --git a/glide2x/cvg/glide/src/makefile.linux b/glide2x/cvg/glide/src/makefile.linux
index 66ec18c..8f388c9 100644
--- a/glide2x/cvg/glide/src/makefile.linux
+++ b/glide2x/cvg/glide/src/makefile.linux
@@ -152,7 +152,6 @@ ifeq ($(USE_X86),1)
 CFLAGS += -DGL_X86
 OPTFLAGS ?= -O2 -ffast-math
 else
-CFLAGS += -DGLIDE_USE_C_TRISETUP
 OPTFLAGS ?= -O2 -ffast-math
 endif
 
diff --git a/glide2x/h3/glide/src/makefile.linux b/glide2x/h3/glide/src/makefile.linux
index a334ca0..f3034ea 100644
--- a/glide2x/h3/glide/src/makefile.linux
+++ b/glide2x/h3/glide/src/makefile.linux
@@ -143,7 +143,6 @@ ifeq ($(USE_X86),1)
 CFLAGS += -DGL_X86
 OPTFLAGS ?= -O2 -ffast-math
 else
-CFLAGS += -DGLIDE_USE_C_TRISETUP
 OPTFLAGS ?= -O2 -ffast-math
 endif
 
diff --git a/glide2x/sst1/glide/src/makefile.linux b/glide2x/sst1/glide/src/makefile.linux
index 1c6f8a0..442e29e 100644
--- a/glide2x/sst1/glide/src/makefile.linux
+++ b/glide2x/sst1/glide/src/makefile.linux
@@ -89,6 +89,8 @@ CDEFS += -DSST96_FIFO
 #CDEFS += -DINIT96VGASWAP
 #CDEFS += -DINIT_ACCESS_DIRECT
 CDEFS += -DGLIDE_USE_ALT_REGMAP
+else
+$(error Invalid FX_GLIDE_HW setting)
 endif
 endif
 
@@ -121,7 +123,7 @@ ifeq ($(USE_X86),1)
 CFLAGS += -DGL_X86
 OPTFLAGS ?= -O1 -ffast-math
 else
-CFLAGS += -DGLIDE_USE_C_TRISETUP
+CFLAGS += -DGLIDE_USE_C_TRISETUP=1
 OPTFLAGS ?= -O1 -ffast-math
 endif
 
@@ -322,6 +324,7 @@ clean:
 	-$(RM) ../../init/initvg/*.o ../../init/initvg/*.lo
 	-$(RM) ../../init/init96/*.o ../../init/init96/*.lo
 	-$(RM) $(FX_GLIDE_SW)/newpci/pcilib/*.o $(FX_GLIDE_SW)/newpci/pcilib/*.lo
+	-$(RM) $(FX_GLIDE_SW)/fxmisc/*.o $(FX_GLIDE_SW)/fxmisc/*.lo
 	-$(RM) fxinline.h
 	-$(RM) fxgasm.h