diff --git a/reactos/win32ss/gdi/ntgdi/misc.h b/reactos/win32ss/gdi/ntgdi/misc.h
index 35aa99c59bd..addc55d2935 100644
--- a/reactos/win32ss/gdi/ntgdi/misc.h
+++ b/reactos/win32ss/gdi/ntgdi/misc.h
@@ -156,8 +156,3 @@ HBITMAP NTAPI UserLoadImage(PCWSTR);
 
 BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING);
 
-#define ROUND_DOWN(n, align) \
-    (((ULONG)n) & ~((align) - 1l))
-
-#define ROUND_UP(n, align) \
-    ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
diff --git a/reactos/win32ss/user/ntuser/timer.c b/reactos/win32ss/user/ntuser/timer.c
index 38df2b27149..6ddb115973a 100644
--- a/reactos/win32ss/user/ntuser/timer.c
+++ b/reactos/win32ss/user/ntuser/timer.c
@@ -347,7 +347,7 @@ SystemTimerProc(HWND hwnd,
 
      case ID_EVENT_SYSTIMER_FLASHWIN:
        {
-          FLASHWINFO fwi = 
+          FLASHWINFO fwi =
             {sizeof(FLASHWINFO),
              UserHMGetHandle(pWnd),
              FLASHW_SYSTIMER,0,0};
@@ -602,7 +602,7 @@ InitTimerImpl(VOID)
 
    ExInitializeFastMutex(Mutex);
 
-   BitmapBytes = ROUND_UP(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8;
+   BitmapBytes = ALIGN_UP_BY(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8;
    WindowLessTimersBitMapBuffer = ExAllocatePoolWithTag(NonPagedPool, BitmapBytes, TAG_TIMERBMP);
    if (WindowLessTimersBitMapBuffer == NULL)
    {