diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.c b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
index 8fdaa6d2070..7d18b6138ea 100644
--- a/src/gallium/winsys/sw/dri/dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
@@ -29,12 +29,6 @@
 #ifdef HAVE_SYS_SHM_H
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#ifdef __FreeBSD__
-/* sys/ipc.h -> sys/_types.h -> machine/param.h
- * - defines ALIGN which clashes with our ALIGN
- */
-#undef ALIGN
-#endif
 #endif
 
 #include "util/compiler.h"
diff --git a/src/util/u_math.h b/src/util/u_math.h
index 721c5b99c1d..1c96ac69e10 100644
--- a/src/util/u_math.h
+++ b/src/util/u_math.h
@@ -53,7 +53,6 @@
 
 #ifdef __HAIKU__
 #include <sys/param.h>
-#undef ALIGN
 #endif
 
 #ifdef __cplusplus
@@ -648,29 +647,7 @@ util_memcpy_cpu_to_le32(void * restrict dest, const void * restrict src, size_t
 }
 
 /**
- * Align a value up to an alignment value
- *
- * If \c value is not already aligned to the requested alignment value, it
- * will be rounded up.
- *
- * \param value  Value to be rounded
- * \param alignment  Alignment value to be used.  This must be a power of two.
- *
- * \sa ROUND_DOWN_TO()
- */
-
-#if defined(ALIGN)
-#undef ALIGN
-#endif
-static inline uint32_t
-ALIGN(uint32_t value, uint32_t alignment)
-{
-   assert(util_is_power_of_two_nonzero(alignment));
-   return ALIGN_POT(value, alignment);
-}
-
-/**
- * Like ALIGN(), but works with a non-power-of-two alignment.
+ * Like align(), but works with a non-power-of-two alignment.
  */
 static inline uintptr_t
 ALIGN_NPOT(uintptr_t value, int32_t alignment)
@@ -688,7 +665,7 @@ ALIGN_NPOT(uintptr_t value, int32_t alignment)
  * \param value  Value to be rounded
  * \param alignment  Alignment value to be used.  This must be a power of two.
  *
- * \sa ALIGN()
+ * \sa align()
  */
 static inline uint64_t
 ROUND_DOWN_TO(uint64_t value, uint32_t alignment)
diff --git a/src/util/u_thread.c b/src/util/u_thread.c
index 255c5f66a4b..3a8785cec92 100644
--- a/src/util/u_thread.c
+++ b/src/util/u_thread.c
@@ -27,10 +27,6 @@
 #endif
 
 #ifdef __FreeBSD__
-/* pthread_np.h -> sys/param.h -> machine/param.h
- * - defines ALIGN which clashes with our ALIGN
- */
-#undef ALIGN
 #define cpu_set_t cpuset_t
 #endif