diff -Nudr -U3 libmodplug-0.8.8.1.pre//src/fastmix.cpp libmodplug-0.8.8.1/src/fastmix.cpp
--- libmodplug-0.8.8.1.pre//src/fastmix.cpp	2010-06-27 21:35:39.369214419 +0100
+++ libmodplug-0.8.8.1/src/fastmix.cpp	2010-06-27 21:44:03.545964479 +0100
@@ -94,7 +94,6 @@
 #define SPLINE_CLAMPFORUNITY
 // log2(number) of precalculated splines (range is [4..14])
 #define SPLINE_FRACBITS 10
-#define SPLINE_LUTLEN (1L<<SPLINE_FRACBITS)
 
 class CzCUBICSPLINE
 {	public:
@@ -168,7 +167,6 @@
 // number of samples in window
 #define WFIR_LOG2WIDTH		3
 #define WFIR_WIDTH			(1L<<WFIR_LOG2WIDTH)
-#define WFIR_SMPSPERWING	((WFIR_WIDTH-1)>>1)
 // cutoff (1.0 == pi/2)
 #define WFIR_CUTOFF		0.90f
 // wfir type
@@ -186,7 +184,6 @@
 #define M_zPI		3.1415926535897932384626433832795
 #endif
 #define M_zEPS		1e-8
-#define M_zBESSELEPS	1e-21
 
 class CzWINDOWEDFIR
 {	
@@ -309,9 +306,6 @@
 	pChn->nPos += nPos >> 16;\
 	pChn->nPosLo = nPos & 0xFFFF;
 
-#define SNDMIX_ENDSAMPLELOOP8	SNDMIX_ENDSAMPLELOOP
-#define SNDMIX_ENDSAMPLELOOP16	SNDMIX_ENDSAMPLELOOP
-
 //////////////////////////////////////////////////////////////////////////////
 // Mono
 
@@ -2118,9 +2112,6 @@
 }
 #endif
 
-#define OFSDECAYSHIFT	8
-#define OFSDECAYMASK	0xFF
-
 
 #ifdef MSC_VER
 void MPPASMCALL X86_StereoFill(int *pBuffer, UINT nSamples, LPLONG lpROfs, LPLONG lpLOfs)
diff -Nudr -U3 libmodplug-0.8.8.1.pre//src/load_med.cpp libmodplug-0.8.8.1/src/load_med.cpp
--- libmodplug-0.8.8.1.pre//src/load_med.cpp	2010-04-04 13:15:24.000000000 +0100
+++ libmodplug-0.8.8.1/src/load_med.cpp	2010-06-27 21:44:03.558214044 +0100
@@ -18,44 +18,22 @@
 // OctaMed MED file support (import only)
 
 // flags
-#define	MMD_FLAG_FILTERON	0x1
-#define	MMD_FLAG_JUMPINGON	0x2
-#define	MMD_FLAG_JUMP8TH	0x4
-#define	MMD_FLAG_INSTRSATT	0x8 // instruments are attached (this is a module)
 #define	MMD_FLAG_VOLHEX		0x10
-#define MMD_FLAG_STSLIDE	0x20 // SoundTracker mode for slides
 #define MMD_FLAG_8CHANNEL	0x40 // OctaMED 8 channel song
-#define	MMD_FLAG_SLOWHQ		0x80 // HQ slows playing speed (V2-V4 compatibility)
 // flags2
 #define MMD_FLAG2_BMASK		0x1F
 #define MMD_FLAG2_BPM		0x20
-#define	MMD_FLAG2_MIX		0x80 // uses Mixing (V7+)
-// flags3:
-#define	MMD_FLAG3_STEREO	0x1	// mixing in Stereo mode
-#define	MMD_FLAG3_FREEPAN	0x2	// free panning
-#define MMD_FLAG3_GM		0x4 // module designed for GM/XG compatibility
 
 
 // generic MMD tags
 #define	MMDTAG_END		0
 #define	MMDTAG_PTR		0x80000000	// data needs relocation
-#define	MMDTAG_MUSTKNOW	0x40000000	// loader must fail if this isn't recognized
-#define	MMDTAG_MUSTWARN	0x20000000	// loader must warn if this isn't recognized
 
 // ExpData tags
 // # of effect groups, including the global group (will
 // override settings in MMDSong struct), default = 1
-#define	MMDTAG_EXP_NUMFXGROUPS	1
 #define	MMDTAG_TRK_NAME		(MMDTAG_PTR|1)	// trackinfo tags
 #define	MMDTAG_TRK_NAMELEN	2				// namelen includes zero term.
-#define	MMDTAG_TRK_FXGROUP	3
-// effectinfo tags
-#define	MMDTAG_FX_ECHOTYPE	1
-#define MMDTAG_FX_ECHOLEN	2
-#define	MMDTAG_FX_ECHODEPTH	3
-#define	MMDTAG_FX_STEREOSEP	4
-#define	MMDTAG_FX_GROUPNAME	(MMDTAG_PTR|5)	// the Global Effects group shouldn't have name saved!
-#define	MMDTAG_FX_GRPNAMELEN 6	// namelen includes zero term.
 
 #pragma pack(1)
 
diff -Nudr -U3 libmodplug-0.8.8.1.pre//src/mmcmp.cpp libmodplug-0.8.8.1/src/mmcmp.cpp
--- libmodplug-0.8.8.1.pre//src/mmcmp.cpp	2010-06-27 21:35:39.553964080 +0100
+++ libmodplug-0.8.8.1/src/mmcmp.cpp	2010-06-27 21:44:03.636028886 +0100
@@ -46,9 +46,7 @@
 #define MMCMP_COMP		0x0001
 #define MMCMP_DELTA		0x0002
 #define MMCMP_16BIT		0x0004
-#define MMCMP_STEREO	0x0100
 #define MMCMP_ABS16		0x0200
-#define MMCMP_ENDIAN	0x0400
 
 typedef struct MMCMPBITBUFFER
 {
diff -Nudr -U3 libmodplug-0.8.8.1.pre//src/sndmix.cpp libmodplug-0.8.8.1/src/sndmix.cpp
--- libmodplug-0.8.8.1.pre//src/sndmix.cpp	2010-06-27 21:33:37.657964087 +0100
+++ libmodplug-0.8.8.1/src/sndmix.cpp	2010-06-27 21:47:32.420569554 +0100
@@ -15,8 +15,10 @@
 // Volume ramp length, in 1/10 ms
 #define VOLUMERAMPLEN	146	// 1.46ms = 64 samples at 44.1kHz
 
+#if defined(MODPLUG_PLAYER) || defined(ENABLE_STEREOVU)
 // VU-Meter
 #define VUMETER_DECAY		4
+#endif
 
 // SNDMIX: These are global flags for playback control (first two configurable via SetMixConfig)
 UINT CSoundFile::m_nStereoSeparation = 128;
