Index: uspace/app/mkexfat/mkexfat.c
===================================================================
--- uspace/app/mkexfat/mkexfat.c	(revision fd57745cd4811832fa23ba1cef7638038244f2b5)
+++ uspace/app/mkexfat/mkexfat.c	(revision 81b1db8cec0aa9dbafab33ef24b55b230180a3a7)
@@ -104,5 +104,5 @@
 } exfat_cfg_t;
 
-static unsigned log2(unsigned n);
+static unsigned log2i(unsigned n);
 
 static uint32_t
@@ -270,6 +270,6 @@
 	mbs->version.minor = 0;
 	mbs->volume_flags = host2uint16_t_le(0);
-	mbs->bytes_per_sector = log2(cfg->sector_size);
-	mbs->sec_per_cluster = log2(cfg->cluster_size / cfg->sector_size);
+	mbs->bytes_per_sector = log2i(cfg->sector_size);
+	mbs->sec_per_cluster = log2i(cfg->cluster_size / cfg->sector_size);
 
 	/* Maximum cluster size is 32 Mb */
@@ -676,5 +676,5 @@
  */
 static unsigned
-log2(unsigned n)
+log2i(unsigned n)
 {
 	unsigned r;
Index: uspace/drv/platform/amdm37x/amdm37x.c
===================================================================
--- uspace/drv/platform/amdm37x/amdm37x.c	(revision fd57745cd4811832fa23ba1cef7638038244f2b5)
+++ uspace/drv/platform/amdm37x/amdm37x.c	(revision 81b1db8cec0aa9dbafab33ef24b55b230180a3a7)
@@ -45,5 +45,5 @@
 
 static void
-log(const volatile void *place, uint64_t val, volatile void *base, size_t size,
+log_message(const volatile void *place, uint64_t val, volatile void *base, size_t size,
     void *data, bool write)
 {
@@ -104,13 +104,13 @@
 
 	if (trace) {
-		pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log, (void*)AMDM37x_USBTLL_BASE_ADDRESS);
-		pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log, (void*)CLOCK_CONTROL_CM_BASE_ADDRESS);
-		pio_trace_enable(device->cm.core, CORE_CM_SIZE, log, (void*)CORE_CM_BASE_ADDRESS);
-		pio_trace_enable(device->cm.mpu, MPU_CM_SIZE, log, (void*)MPU_CM_BASE_ADDRESS);
-		pio_trace_enable(device->cm.iva2, IVA2_CM_SIZE, log, (void*)IVA2_CM_BASE_ADDRESS);
-		pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log, (void*)USBHOST_CM_BASE_ADDRESS);
-		pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log, (void*)AMDM37x_UHH_BASE_ADDRESS);
-		pio_trace_enable(device->prm.clocks, CLOCK_CONTROL_PRM_SIZE, log, (void*)CLOCK_CONTROL_PRM_BASE_ADDRESS);
-		pio_trace_enable(device->prm.global, GLOBAL_REG_PRM_SIZE, log, (void*)GLOBAL_REG_PRM_BASE_ADDRESS);
+		pio_trace_enable(device->tll, AMDM37x_USBTLL_SIZE, log_message, (void*)AMDM37x_USBTLL_BASE_ADDRESS);
+		pio_trace_enable(device->cm.clocks, CLOCK_CONTROL_CM_SIZE, log_message, (void*)CLOCK_CONTROL_CM_BASE_ADDRESS);
+		pio_trace_enable(device->cm.core, CORE_CM_SIZE, log_message, (void*)CORE_CM_BASE_ADDRESS);
+		pio_trace_enable(device->cm.mpu, MPU_CM_SIZE, log_message, (void*)MPU_CM_BASE_ADDRESS);
+		pio_trace_enable(device->cm.iva2, IVA2_CM_SIZE, log_message, (void*)IVA2_CM_BASE_ADDRESS);
+		pio_trace_enable(device->cm.usbhost, USBHOST_CM_SIZE, log_message, (void*)USBHOST_CM_BASE_ADDRESS);
+		pio_trace_enable(device->uhh, AMDM37x_UHH_SIZE, log_message, (void*)AMDM37x_UHH_BASE_ADDRESS);
+		pio_trace_enable(device->prm.clocks, CLOCK_CONTROL_PRM_SIZE, log_message, (void*)CLOCK_CONTROL_PRM_BASE_ADDRESS);
+		pio_trace_enable(device->prm.global, GLOBAL_REG_PRM_SIZE, log_message, (void*)GLOBAL_REG_PRM_BASE_ADDRESS);
 	}
 	return EOK;
Index: uspace/lib/softrend/filter.c
===================================================================
--- uspace/lib/softrend/filter.c	(revision fd57745cd4811832fa23ba1cef7638038244f2b5)
+++ uspace/lib/softrend/filter.c	(revision 81b1db8cec0aa9dbafab33ef24b55b230180a3a7)
@@ -39,10 +39,10 @@
 
 
-static long round(double val)
+static long _round(double val)
 {
 	return val > 0 ? (long) (val + 0.5) : (long) (val - 0.5);
 }
 
-static long floor(double val)
+static long _floor(double val)
 {
 	long lval = (long) val;
@@ -52,5 +52,5 @@
 }
 
-static long ceil(double val)
+static long _ceil(double val)
 {
 	long lval = (long) val;
@@ -79,5 +79,5 @@
     pixelmap_extend_t extend)
 {
-	return pixelmap_get_extended_pixel(pixmap, round(x), round(y), extend);
+	return pixelmap_get_extended_pixel(pixmap, _round(x), _round(y), extend);
 }
 
@@ -85,8 +85,8 @@
     pixelmap_extend_t extend)
 {
-	long x1 = floor(x);
-	long x2 = ceil(x);
-	long y1 = floor(y);
-	long y2 = ceil(y);
+	long x1 = _floor(x);
+	long x2 = _ceil(x);
+	long y1 = _floor(y);
+	long y2 = _ceil(y);
 
 	if (y1 == y2 && x1 == x2) {