diff --git a/examples/djoystick/djoy_main.c b/examples/djoystick/djoy_main.c
index 40249b98d..39f809782 100644
--- a/examples/djoystick/djoy_main.c
+++ b/examples/djoystick/djoy_main.c
@@ -54,10 +54,10 @@
 /* Helpers ******************************************************************/
 
 #ifndef MIN
-#  define MIN(a,b) (a < b ? a : b)
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 #ifndef MAX
-#  define MAX(a,b) (a > b ? a : b)
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
 /****************************************************************************
diff --git a/examples/nxdemo/nxdemo_bkgd.c b/examples/nxdemo/nxdemo_bkgd.c
index 6eef6eeb8..7d93e2f8f 100644
--- a/examples/nxdemo/nxdemo_bkgd.c
+++ b/examples/nxdemo/nxdemo_bkgd.c
@@ -67,11 +67,10 @@
 #endif
 
 #ifndef MIN
-#  define MIN(a, b) (a < b ? a : b)
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
-
 #ifndef MAX
-#  define MAX(a, b) (a > b ? a : b)
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
 /****************************************************************************
diff --git a/examples/nxlines/nxlines_bkgd.c b/examples/nxlines/nxlines_bkgd.c
index 21a02458b..be21106a4 100644
--- a/examples/nxlines/nxlines_bkgd.c
+++ b/examples/nxlines/nxlines_bkgd.c
@@ -53,7 +53,7 @@
 #endif
 
 #ifndef MIN
-#  define MIN(a,b) (a < b ? a : b)
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
 /****************************************************************************
diff --git a/examples/pwlines/pwlines_internal.h b/examples/pwlines/pwlines_internal.h
index 2d6fefaf5..6db7face1 100644
--- a/examples/pwlines/pwlines_internal.h
+++ b/examples/pwlines/pwlines_internal.h
@@ -154,11 +154,10 @@
 /* Helpers */
 
 #ifndef MIN
-#  define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
-
 #ifndef MAX
-#  define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
 /****************************************************************************
diff --git a/examples/pwlines/pwlines_update.c b/examples/pwlines/pwlines_update.c
index 527a963cd..c89fae823 100644
--- a/examples/pwlines/pwlines_update.c
+++ b/examples/pwlines/pwlines_update.c
@@ -53,7 +53,7 @@
 #endif
 
 #ifndef MIN
-#  define MIN(a,b) (a < b ? a : b)
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
 /****************************************************************************
diff --git a/examples/udpblaster/udpblaster.h b/examples/udpblaster/udpblaster.h
index 1c4fb0f16..08ce3d7a3 100644
--- a/examples/udpblaster/udpblaster.h
+++ b/examples/udpblaster/udpblaster.h
@@ -103,7 +103,7 @@
 #endif
 
 #ifndef MIN
-#  define MIN(a,b) ((a)<(b)?(a):(b))
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
 #define UDPBLASTER_SENDSIZE MIN(UDPBLASTER_MSS, g_udpblaster_strlen)
diff --git a/examples/zerocross/zerocross_main.c b/examples/zerocross/zerocross_main.c
index 63da486a8..a7dc72b56 100644
--- a/examples/zerocross/zerocross_main.c
+++ b/examples/zerocross/zerocross_main.c
@@ -54,10 +54,10 @@
 /* Helpers ******************************************************************/
 
 #ifndef MIN
-#  define MIN(a,b) (a < b ? a : b)
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 #ifndef MAX
-#  define MAX(a,b) (a > b ? a : b)
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
 /****************************************************************************
diff --git a/graphics/twm4nx/src/cresize.cxx b/graphics/twm4nx/src/cresize.cxx
index fd65f80c6..16d6981df 100644
--- a/graphics/twm4nx/src/cresize.cxx
+++ b/graphics/twm4nx/src/cresize.cxx
@@ -62,10 +62,10 @@
 #define MINHEIGHT     0             // had been 32
 #define MINWIDTH      0             // had been 60
 
-#define makemult(a,b) ((b==1) ? (a) : (((int)((a) / (b))) * (b)))
+#define makemult(a,b) ((b == 1) ? (a) : (((int)((a) / (b))) * (b)))
 
 #ifndef MIN
-#  define MIN(a,b)    (((a) < (b)) ? (a) : (b))
+#  define MIN(a,b)    ((a) < (b) ? (a) : (b))
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 862800874..f9b8e6eea 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -121,7 +121,7 @@
 /* Get the larger value */
 
 #ifndef MAX
-#  define MAX(a,b) (a > b ? a : b)
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
 /****************************************************************************
diff --git a/system/input/input.c b/system/input/input.c
index 8ed504275..af99e7ace 100644
--- a/system/input/input.c
+++ b/system/input/input.c
@@ -36,8 +36,11 @@
 #define DEFATLT_DISTANCE 10
 
 #define DELAY_MS(ms) usleep((ms) * 1000)
-#define ABS(a)       (((a) > 0) ? (a) : -(a))
-#define MAX(a, b)    (((a) > (b)) ? (a) : (b))
+#define ABS(a)       ((a) > 0 ? (a) : -(a))
+
+#ifndef MAX
+#  define MAX(a,b)   ((a) > (b) ? (a) : (b))
+#endif
 
 /****************************************************************************
  * Private Types
diff --git a/testing/ostest/sporadic.c b/testing/ostest/sporadic.c
index 192e3ab35..dcb2c677f 100644
--- a/testing/ostest/sporadic.c
+++ b/testing/ostest/sporadic.c
@@ -49,7 +49,7 @@
 #define sched_unlock()
 
 #ifndef MIN
-# define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
 /****************************************************************************
diff --git a/testing/ostest/sporadic2.c b/testing/ostest/sporadic2.c
index d295ae619..cbbf3569a 100644
--- a/testing/ostest/sporadic2.c
+++ b/testing/ostest/sporadic2.c
@@ -50,11 +50,10 @@
 #define PRIO_LO_NDX   1
 
 #ifndef MIN
-# define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
-
 #ifndef MAX
-# define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
 
 /****************************************************************************
diff --git a/wireless/gs2200m/gs2200m_main.c b/wireless/gs2200m/gs2200m_main.c
index 2b4e66d7d..f287e5b0a 100644
--- a/wireless/gs2200m/gs2200m_main.c
+++ b/wireless/gs2200m/gs2200m_main.c
@@ -59,7 +59,7 @@
 #endif
 
 #ifndef MIN
-#  define MIN(a,b)  (((a) < (b)) ? (a) : (b))
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
 #define SOCKET_BASE  10000