diff --git a/windows/input.c b/windows/input.c
index 1e5851d59aa..10e5623e0af 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -718,12 +718,22 @@ UINT32 WINAPI GetKBCodePage32(void)
     return GetKBCodePage16();
 }
 
+/****************************************************************************
+ *      GetKeyboardLayoutName16   (USER.477)
+ */
+INT16 WINAPI GetKeyboardLayoutName16(LPSTR pwszKLID)
+{
+	return GetKeyboardLayoutName32A(pwszKLID);
+}
+
 /****************************************************************************
  *	GetKeyboardLayoutName32A   (USER32.252)
  */
 INT32 WINAPI GetKeyboardLayoutName32A(LPSTR pwszKLID)
 {
-	return GetKeyboardLayoutName16(pwszKLID);
+        FIXME(keyboard,"always returns primary U.S. English layout\n");
+        strcpy(pwszKLID,"00000409");
+        return 1;
 }
 
 /****************************************************************************
diff --git a/windows/keyboard.c b/windows/keyboard.c
index 3594d8ccd7a..62d5cbb28ed 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -714,16 +714,6 @@ INT16 WINAPI GetKBCodePage16(void)
     return 850;
 }
 
-/****************************************************************************
- *	GetKeyboardLayoutName16   (USER.477)
- */
-INT16 WINAPI GetKeyboardLayoutName16(LPSTR pwszKLID)
-{
-	FIXME(keyboard,"always returns primary U.S. English layout\n");
-	strcpy(pwszKLID,"00000409");
-	return 1;
-}
-
 /****************************************************************************
  *	GetKeyNameText16   (KEYBOARD.133)
  */