diff --git a/src/debug/debug_win32.cpp b/src/debug/debug_win32.cpp
index 01a229cc..b33c9004 100644
--- a/src/debug/debug_win32.cpp
+++ b/src/debug/debug_win32.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,6 +22,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#ifndef min
+#define min(a,b) ((a)<(b)?(a):(b))
+#endif
+
 /* 
 	Have to remember where i ripped this code sometime ago.
 
diff --git a/src/libs/gui_tk/gui_tk.h b/src/libs/gui_tk/gui_tk.h
index 3d5f0e2d..ebc90c53 100644
--- a/src/libs/gui_tk/gui_tk.h
+++ b/src/libs/gui_tk/gui_tk.h
@@ -102,13 +102,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-/* $Id: gui_tk.h,v 1.5 2008-09-07 10:55:15 c2woody Exp $ */
+/* $Id: gui_tk.h,v 1.6 2009-05-17 15:28:05 c2woody Exp $ */
 
 #ifndef GUI__TOOLKIT_H
 #define GUI__TOOLKIT_H
 
-#define imin(x,y) (x<y?x:y)
-#define imax(x,y) (x>y?x:y)
+#define imin(x,y) ((x)<(y)?(x):(y))
+#define imax(x,y) ((x)>(y)?(x):(y))
 #define isign(x) (((x)<0?-1:1))
 
 /** \file
@@ -1263,7 +1263,7 @@ public:
 		const SpecialChar *special = NULL);
 
 	virtual ~BitmapFont();
-	
+
 	/// Retrieve total height of font in pixels.
 	virtual int getHeight() const { return height; };