diff --git a/Makefile.dos b/Makefile.dos
index dfa1479..a096430 100644
--- a/Makefile.dos
+++ b/Makefile.dos
@@ -3,6 +3,7 @@
 # wmake -f Makefile.dos
 # - builds using the static library xmp_static.lib
 #
+target = static
 # change libxmp_path as needed (or specify on the wmake cmdline)
 !ifndef libxmp_path
 libxmp_path = ../libxmp
@@ -12,40 +13,12 @@ CC=wcc386
 # SYSTEM can be dos32a, causeway or dos4g:
 SYSTEM=dos32a
 
-CPPFLAGS=-DHAVE_SIGNAL_H -DHAVE_STRINGS_H
-
-INCLUDES=-I"src/watcom" -Isrc -I"$(%WATCOM)/h"
-
-CPPFLAGS+= -DBUILDING_STATIC
-LIBXMP=$(libxmp_path)/xmp_static.lib
-INCLUDES+= -I"$(libxmp_path)/include"
-LIBS=$(LIBXMP)
-
 CFLAGS = -bt=dos -fp5 -fpi87 -mf -oeatxh -w4 -zp8 -ei -q
 # newer OpenWatcom versions enable W303 by default.
 CFLAGS += -wcd=303
 # -5s  :  Pentium stack calling conventions.
 # -5r  :  Pentium register calling conventions.
-CFLAGS+= -5s
-
-.SUFFIXES:
-.SUFFIXES: .obj .c
-
-AOUT=xmp.exe
-COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
-
-OBJ = commands.obj delay.obj getopt_long.obj info.obj main.obj options.obj read_config.obj sound.obj sound_aiff.obj sound_file.obj sound_null.obj sound_wav.obj terminal.obj
-
-all: $(AOUT)
-
-$(AOUT): $(OBJ) $(LIBXMP)
-	wlink N $(AOUT) SYS $(SYSTEM) OP QUIET LIBR {$(LIBS)} F {$(OBJ)}
-
-.c: src;src/dos
-.c.obj:
-	$(COMPILE) -fo=$^@ $<
+CFLAGS += -5s
+INCLUDES = -I"src/watcom" -I"$(%WATCOM)/h"
 
-distclean: clean .symbolic
-	rm -f $(AOUT) *.err
-clean: .symbolic
-	rm -f *.obj
+!include watcom.mif
diff --git a/Makefile.os2 b/Makefile.os2
index 13a2cdb..e7dcf38 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -17,46 +17,17 @@ libxmp_path = ../libxmp
 CC=wcc386
 SYSTEM=os2v2
 
-CPPFLAGS=-DHAVE_SIGNAL_H -DHAVE_STRINGS_H
-CPPFLAGS+= -DSOUND_OS2DART
-INCLUDES=-I"src/watcom" -Isrc -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h"
-
-!ifeq target static
-CPPFLAGS+= -DBUILDING_STATIC
-LIBXMP=$(libxmp_path)/xmp_static.lib
-!else
-LIBXMP=$(libxmp_path)/libxmp.lib
-!endif
-INCLUDES+= -I"$(libxmp_path)/include"
-LIBS=$(LIBXMP)
-# for sound_dart:
-LIBS+= mmpm2.lib
-
 CFLAGS = -bt=os2 -bm -fp5 -fpi87 -mf -oeatxh -w4 -zp8 -ei -q
 # newer OpenWatcom versions enable W303 by default.
 CFLAGS += -wcd=303
 # -5s  :  Pentium stack calling conventions.
 # -5r  :  Pentium register calling conventions.
-CFLAGS+= -5s
-
-.SUFFIXES:
-.SUFFIXES: .obj .c
+CFLAGS += -5s
+INCLUDES = -I"src/watcom" -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h"
 
-AOUT=xmp.exe
-COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
-
-OBJ = commands.obj delay.obj getopt_long.obj info.obj main.obj options.obj read_config.obj sound.obj sound_aiff.obj sound_file.obj sound_null.obj sound_wav.obj sound_dart.obj terminal.obj
-
-all: $(AOUT)
-
-$(AOUT): $(OBJ) $(LIBXMP)
-	wlink N $(AOUT) SYS $(SYSTEM) OP QUIET LIBR {$(LIBS)} F {$(OBJ)}
-
-.c: src
-.c.obj:
-	$(COMPILE) -fo=$^@ $<
+# for sound_dart:
+CPPFLAGS = -DSOUND_OS2DART
+OS_OBJS = sound_dart.obj
+LIBS = mmpm2.lib
 
-distclean: clean .symbolic
-	rm -f $(AOUT) *.err
-clean: .symbolic
-	rm -f *.obj
+!include watcom.mif
diff --git a/Makefile.w32 b/Makefile.w32
index 00854f2..9e86821 100644
--- a/Makefile.w32
+++ b/Makefile.w32
@@ -17,46 +17,17 @@ libxmp_path = ../libxmp
 CC=wcc386
 SYSTEM=nt
 
-CPPFLAGS=-DHAVE_SIGNAL_H -DHAVE_STRINGS_H
-CPPFLAGS+= -DSOUND_WIN32
-INCLUDES=-I"src/win32" -Isrc -I"$(%WATCOM)/h/nt" -I"$(%WATCOM)/h"
-
-!ifeq target static
-CPPFLAGS+= -DBUILDING_STATIC
-LIBXMP=$(libxmp_path)/xmp_static.lib
-!else
-LIBXMP=$(libxmp_path)/libxmp.lib
-!endif
-INCLUDES+= -I"$(libxmp_path)/include"
-LIBS=$(LIBXMP)
-# for sound_win32:
-LIBS+= winmm.lib
-
 CFLAGS = -bt=nt -bm -fp5 -fpi87 -mf -oeatxh -w4 -zp8 -ei -q
 # newer OpenWatcom versions enable W303 by default.
 CFLAGS += -wcd=303
 # -5s  :  Pentium stack calling conventions.
 # -5r  :  Pentium register calling conventions.
-CFLAGS+= -5s
-
-.SUFFIXES:
-.SUFFIXES: .obj .c
+CFLAGS += -5s
+INCLUDES = -I"src/win32" -I"$(%WATCOM)/h/nt" -I"$(%WATCOM)/h"
 
-AOUT=xmp.exe
-COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
-
-OBJ = commands.obj delay.obj getopt_long.obj info.obj main.obj options.obj read_config.obj sound.obj sound_aiff.obj sound_file.obj sound_null.obj sound_wav.obj sound_win32.obj terminal.obj
-
-all: $(AOUT)
-
-$(AOUT): $(OBJ) $(LIBXMP)
-	wlink N $(AOUT) SYS $(SYSTEM) OP QUIET LIBR {$(LIBS)} F {$(OBJ)}
-
-.c: src
-.c.obj:
-	$(COMPILE) -fo=$^@ $<
+# for sound_win32:
+CPPFLAGS = -DSOUND_WIN32
+OS_OBJS = sound_win32.obj
+LIBS = winmm.lib
 
-distclean: clean .symbolic
-	rm -f $(AOUT) *.err
-clean: .symbolic
-	rm -f *.obj
+!include watcom.mif
diff --git a/watcom.mif b/watcom.mif
new file mode 100644
index 0000000..e024625
--- /dev/null
+++ b/watcom.mif
@@ -0,0 +1,33 @@
+CPPFLAGS+= -DHAVE_SIGNAL_H -DHAVE_STRINGS_H
+INCLUDES+= -Isrc
+
+!ifeq target static
+CPPFLAGS+= -DBUILDING_STATIC
+LIBXMP=$(libxmp_path)/xmp_static.lib
+!else
+LIBXMP=$(libxmp_path)/libxmp.lib
+!endif
+INCLUDES+= -I"$(libxmp_path)/include"
+LIBS+= $(LIBXMP)
+
+.SUFFIXES:
+.SUFFIXES: .obj .c
+
+AOUT=xmp.exe
+COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
+
+OBJ = commands.obj delay.obj getopt_long.obj info.obj main.obj options.obj read_config.obj sound.obj sound_aiff.obj sound_file.obj sound_null.obj sound_wav.obj terminal.obj
+
+all: $(AOUT)
+
+$(AOUT): $(OBJ) $(OS_OBJS) $(LIBXMP)
+	wlink N $(AOUT) SYS $(SYSTEM) OP QUIET LIBR {$(LIBS)} F {$(OBJ) $(OS_OBJS)}
+
+.c: src
+.c.obj:
+	$(COMPILE) -fo=$^@ $<
+
+distclean: clean .symbolic
+	rm -f $(AOUT) *.err
+clean: .symbolic
+	rm -f *.obj