diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h
index 090a7973690..a72571dc26f 100644
--- a/win32ss/user/ntuser/ntuser.h
+++ b/win32ss/user/ntuser/ntuser.h
@@ -9,6 +9,15 @@
 #define UserEnterCo UserEnterExclusive
 #define UserLeaveCo UserLeave
 
+typedef VOID (*TL_FN_FREE)(PVOID);
+
+typedef struct _TL
+{
+    struct _TL* next;
+    PVOID pobj;
+    TL_FN_FREE pfnFree;
+} TL, *PTL;
+
 extern PSERVERINFO gpsi;
 extern PTHREADINFO gptiCurrent;
 extern PPROCESSINFO gppiList;
diff --git a/win32ss/user/ntuser/win32.h b/win32ss/user/ntuser/win32.h
index dd30cf23fc8..9514b48c3ca 100644
--- a/win32ss/user/ntuser/win32.h
+++ b/win32ss/user/ntuser/win32.h
@@ -53,13 +53,8 @@ extern HANDLE hModuleWin;    // This Win32k Instance.
 extern struct _CLS *SystemClassList;
 extern BOOL RegisteredSysClasses;
 
-// FIXME: Move to ntuser.h
-typedef struct _TL
-{
-    struct _TL* next;
-    PVOID pobj;
-    PVOID pfnFree;
-} TL, *PTL;
+struct _TL;
+typedef struct _TL *PTL;
 
 typedef struct _W32THREAD
 {