diff --git a/2.x/trunk/ProcessHacker/include/uimodels.h b/2.x/trunk/ProcessHacker/include/uimodels.h
index 9d82534c1..87a08acda 100644
--- a/2.x/trunk/ProcessHacker/include/uimodels.h
+++ b/2.x/trunk/ProcessHacker/include/uimodels.h
@@ -25,7 +25,7 @@ FORCEINLINE VOID PhChangeShState(
     if (ShState->State == NormalItemState)
         ShState->StateListHandle = PhAddItemPointerList(*StateList, Node);
 
-    ShState->TickCount = NtGetTickCount();
+    ShState->TickCount = GetTickCount();
     ShState->State = NewState;
 
     Node->UseTempBackColor = TRUE;
@@ -47,7 +47,7 @@ FORCEINLINE VOID PhChangeShState(
         if (!StateList || StateList->Count == 0) \
             break; \
 \
-        tickCount = NtGetTickCount(); \
+        tickCount = GetTickCount(); \
 \
         while (PhEnumPointerList(StateList, &enumerationKey, &node)) \
         { \
diff --git a/2.x/trunk/ProcessHacker/mdump.c b/2.x/trunk/ProcessHacker/mdump.c
index 952876e1c..70e6489e3 100644
--- a/2.x/trunk/ProcessHacker/mdump.c
+++ b/2.x/trunk/ProcessHacker/mdump.c
@@ -43,7 +43,7 @@ typedef struct _PROCESS_MINIDUMP_CONTEXT
     BOOLEAN Stop;
     BOOLEAN Succeeded;
 
-    ULONG64 LastTickCount;
+    ULONG LastTickCount;
 } PROCESS_MINIDUMP_CONTEXT, *PPROCESS_MINIDUMP_CONTEXT;
 
 BOOLEAN PhpCreateProcessMiniDumpWithProgress(
@@ -312,9 +312,9 @@ INT_PTR CALLBACK PhpProcessMiniDumpDlgProc(
             {
                 PPROCESS_MINIDUMP_CONTEXT context =
                     (PPROCESS_MINIDUMP_CONTEXT)GetProp(hwndDlg, PhMakeContextAtom());
-                ULONG64 currentTickCount;
+                ULONG currentTickCount;
 
-                currentTickCount = NtGetTickCount64();
+                currentTickCount = GetTickCount();
 
                 if (currentTickCount - context->LastTickCount >= 2000)
                 {
@@ -340,7 +340,7 @@ INT_PTR CALLBACK PhpProcessMiniDumpDlgProc(
             case PH_MINIDUMP_STATUS_UPDATE:
                 SetDlgItemText(hwndDlg, IDC_PROGRESSTEXT, (PWSTR)lParam);
                 InvalidateRect(GetDlgItem(hwndDlg, IDC_PROGRESSTEXT), NULL, FALSE);
-                context->LastTickCount = NtGetTickCount64();
+                context->LastTickCount = GetTickCount();
                 break;
             case PH_MINIDUMP_ERROR:
                 PhShowStatus(hwndDlg, L"Unable to create the minidump", 0, (ULONG)lParam);
diff --git a/2.x/trunk/phlib/extlv.c b/2.x/trunk/phlib/extlv.c
index f0b3be055..2d4a74bb6 100644
--- a/2.x/trunk/phlib/extlv.c
+++ b/2.x/trunk/phlib/extlv.c
@@ -420,7 +420,7 @@ LRESULT CALLBACK PhpExtendedListViewWndProc(
                 PhpEnsureTickHashtableCreated(context);
 
                 entry.Id = ListView_MapIndexToID(hwnd, index);
-                entry.TickCount = NtGetTickCount();
+                entry.TickCount = GetTickCount();
 
                 PhAddEntryHashtable(context->TickHashtable, &entry);
             }
@@ -465,7 +465,7 @@ LRESULT CALLBACK PhpExtendedListViewWndProc(
                     localEntry.Id = ListView_MapIndexToID(hwnd, (INT)wParam);
                     entry = PhAddEntryHashtableEx(context->TickHashtable, &localEntry, NULL);
 
-                    entry->TickCount = NtGetTickCount();
+                    entry->TickCount = GetTickCount();
                 }
 
                 return TRUE;
@@ -978,7 +978,7 @@ static VOID PhListTick(
     if (!Context->TickHashtable)
         return;
 
-    tickCount = NtGetTickCount();
+    tickCount = GetTickCount();
 
     // First pass
 
diff --git a/2.x/trunk/phlib/hndlinfo.c b/2.x/trunk/phlib/hndlinfo.c
index 71493fd99..4b85c8e3a 100644
--- a/2.x/trunk/phlib/hndlinfo.c
+++ b/2.x/trunk/phlib/hndlinfo.c
@@ -413,16 +413,16 @@ __callback PPH_STRING PhStdGetClientIdName(
 {
     static PH_QUEUED_LOCK cachedProcessesLock = PH_QUEUED_LOCK_INIT;
     static PVOID processes = NULL;
-    static ULONG64 lastProcessesTickCount = 0;
+    static ULONG lastProcessesTickCount = 0;
 
     PPH_STRING name;
-    ULONG64 tickCount;
+    ULONG tickCount;
     PSYSTEM_PROCESS_INFORMATION processInfo;
 
     // Get a new process list only if 2 seconds have passed 
     // since the last update.
 
-    tickCount = NtGetTickCount64();
+    tickCount = GetTickCount();
 
     if (tickCount - lastProcessesTickCount >= 2000)
     {
diff --git a/2.x/trunk/phlib/include/ntexapi.h b/2.x/trunk/phlib/include/ntexapi.h
index 2b19faad7..95c7be095 100644
--- a/2.x/trunk/phlib/include/ntexapi.h
+++ b/2.x/trunk/phlib/include/ntexapi.h
@@ -1911,6 +1911,8 @@ C_ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, XState) == 0x3e0);
 #define USER_SHARED_DATA ((KUSER_SHARED_DATA * const)0x7ffe0000)
 #endif
 
+#if (PHNT_VERSION >= PHNT_WS03)
+
 FORCEINLINE ULONGLONG NtGetTickCount64()
 {
     ULARGE_INTEGER tickCount;
@@ -1965,6 +1967,8 @@ FORCEINLINE ULONG NtGetTickCount()
 #endif
 }
 
+#endif
+
 // Locale
 
 NTSYSCALLAPI
diff --git a/2.x/trunk/phlib/support.c b/2.x/trunk/phlib/support.c
index 304cdb26f..a828616b3 100644
--- a/2.x/trunk/phlib/support.c
+++ b/2.x/trunk/phlib/support.c
@@ -2152,11 +2152,11 @@ NTSTATUS PhWaitForMultipleObjectsAndPump(
     )
 {
     NTSTATUS status;
-    ULONG64 startTickCount;
-    ULONG64 currentTickCount;
-    LONG64 currentTimeout;
+    ULONG startTickCount;
+    ULONG currentTickCount;
+    LONG currentTimeout;
 
-    startTickCount = NtGetTickCount64();
+    startTickCount = GetTickCount();
     currentTimeout = Timeout;
 
     while (TRUE)
@@ -2194,8 +2194,8 @@ NTSTATUS PhWaitForMultipleObjectsAndPump(
 
         if (Timeout != INFINITE)
         {
-            currentTickCount = NtGetTickCount64();
-            currentTimeout = (LONG64)Timeout - (currentTickCount - startTickCount);
+            currentTickCount = GetTickCount();
+            currentTimeout = Timeout - (currentTickCount - startTickCount);
 
             if (currentTimeout < 0)
                 return STATUS_TIMEOUT;