diff --git a/reactos/dll/win32/syssetup/install.c b/reactos/dll/win32/syssetup/install.c
index a819be4621c..729a33f342b 100644
--- a/reactos/dll/win32/syssetup/install.c
+++ b/reactos/dll/win32/syssetup/install.c
@@ -40,8 +40,6 @@
 #include <samlib/samlib.h>
 #include <syssetup/syssetup.h>
 #include <userenv.h>
-#include "userenv-priv.h"
-
 #include <setupapi.h>
 
 #include <shlobj.h>
diff --git a/reactos/dll/win32/syssetup/syssetup.rbuild b/reactos/dll/win32/syssetup/syssetup.rbuild
index d8a62a1827f..9a3efaca02a 100644
--- a/reactos/dll/win32/syssetup/syssetup.rbuild
+++ b/reactos/dll/win32/syssetup/syssetup.rbuild
@@ -1,7 +1,6 @@
 <module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll">
 	<importlibrary definition="syssetup.def" />
 	<include base="syssetup">.</include>
-	<include base="userenv">.</include>
 	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
diff --git a/reactos/dll/win32/userenv/precomp.h b/reactos/dll/win32/userenv/precomp.h
index 9983e283f06..ae1fb5f04d5 100644
--- a/reactos/dll/win32/userenv/precomp.h
+++ b/reactos/dll/win32/userenv/precomp.h
@@ -9,4 +9,3 @@
 
 #include "internal.h"
 #include "resources.h"
-#include "userenv-priv.h"
diff --git a/reactos/dll/win32/userenv/userenv-priv.h b/reactos/dll/win32/userenv/userenv-priv.h
deleted file mode 100644
index 1f00de38cf2..00000000000
--- a/reactos/dll/win32/userenv/userenv-priv.h
+++ /dev/null
@@ -1,176 +0,0 @@
-#ifndef USERENV_PRIV_H__
-#define USERENV_PRIV_H__
-
-//
-// Private ReactOS only userenv functions
-//
-//
-
-BOOL
-USERENVAPI
-WINAPI
-InitializeProfiles(
-	VOID
-);
-
-BOOL
-USERENVAPI
-WINAPI
-CreateUserProfileA (
-	PSID, 
-	LPCSTR
-);
-
-BOOL
-USERENVAPI
-WINAPI
-CreateUserProfileW(
-	PSID, 
-	LPCWSTR
-);
-
-BOOL 
-USERENVAPI
-WINAPI
-AddDesktopItemA(
-	BOOL, 
-	LPCSTR, 
-	LPCSTR, 
-	LPCSTR, 
-	INT, 
-	LPCSTR, 
-	WORD, 
-	INT
-);
-
-BOOL
-USERENVAPI
-WINAPI
-AddDesktopItemW(
-	BOOL, 
-	LPCWSTR,
-	LPCWSTR,
-	LPCWSTR,
-	INT,
-	LPCWSTR,
-	WORD,
-	INT
-);
-
-BOOL
-USERENVAPI
-WINAPI
-DeleteDesktopItemA (
-	BOOL,
-	LPCSTR
-);
-
-BOOL
-USERENVAPI
-WINAPI
-DeleteDesktopItemW (
-	BOOL,
-	LPCWSTR
-);
-
-BOOL
-USERENVAPI
-WINAPI
-CreateGroupA (
-	LPCSTR,
-	BOOL
-);
-
-BOOL
-USERENVAPI
-WINAPI
-CreateGroupW (
-	LPCWSTR,
-	BOOL
-);
-
-BOOL
-USERENVAPI
-WINAPI
-DeleteGroupA (
-	LPCSTR,
-	BOOL
-);
-
-BOOL
-USERENVAPI
-WINAPI
-DeleteGroupW (
-	LPCWSTR,
-	BOOL
-);
-
-BOOL
-USERENVAPI
-WINAPI
-AddItemA(
-	LPCSTR,
-	BOOL,
-	LPCSTR,
-	LPCSTR,
-	LPCSTR,
-	INT,
-	LPCSTR,
-	WORD,
-	INT
-);
-
-BOOL
-USERENVAPI
-WINAPI
-AddItemW (
-	LPCWSTR,
-	BOOL,
-	LPCWSTR,
-	LPCWSTR,
-	LPCWSTR,
-	INT,
-	LPCWSTR,
-	WORD,
-	INT
-);
-
-BOOL
-USERENVAPI
-WINAPI
-DeleteItemA (
-	LPCSTR,
-	BOOL,
-	LPCSTR,
-	BOOL
-);
-
-BOOL
-USERENVAPI
-WINAPI
-DeleteItemW(
-	LPCWSTR,
-	BOOL,
-	LPCWSTR,
-	BOOL
-);
-
-BOOL
-USERENVAPI
-WINAPI
-CopyProfileDirectoryA(
-	LPCSTR,
-	LPCSTR,
-	DWORD
-);
-
-BOOL
-USERENVAPI
-WINAPI
-CopyProfileDirectoryW(
-	LPCWSTR,
-	LPCWSTR,
-	DWORD
-);
-
-#endif
diff --git a/reactos/dll/win32/userenv/userenv.rbuild b/reactos/dll/win32/userenv/userenv.rbuild
index 2e8602fc528..804c809286e 100644
--- a/reactos/dll/win32/userenv/userenv.rbuild
+++ b/reactos/dll/win32/userenv/userenv.rbuild
@@ -5,7 +5,6 @@
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>
-	<define name="_USERENV_" />
 	<library>uuid</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
diff --git a/reactos/drivers/input/i8042prt/mouse.c b/reactos/drivers/input/i8042prt/mouse.c
index 5a8afb5ebf3..e4f14770397 100644
--- a/reactos/drivers/input/i8042prt/mouse.c
+++ b/reactos/drivers/input/i8042prt/mouse.c
@@ -903,6 +903,9 @@ BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt)
 	UCHAR Value;
 	UCHAR ExpectedReply[] = { 0xFA, 0xAA, 0x00 };
 	unsigned ReplyByte;
+	ULONG Counter;
+
+	I8042Flush();
 
 	if (! I8042Write(DevExt, I8042_CTRL_PORT, 0xD4) ||
 	    ! I8042Write(DevExt, I8042_DATA_PORT, 0xFF))
@@ -915,7 +918,12 @@ BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt)
 	     ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]) && Ok;
 	     ReplyByte++)
 	{
-		Status = I8042ReadDataWait(DevExt, &Value);
+		Counter = 200;
+
+		do {
+			Status = I8042ReadDataWait(DevExt, &Value);
+		} while (Status == STATUS_IO_TIMEOUT && Counter--);
+
 		if (! NT_SUCCESS(Status))
 		{
 			DPRINT1("No ACK after mouse reset, status 0x%08x\n",
diff --git a/reactos/include/psdk/userenv.h b/reactos/include/psdk/userenv.h
index 7b6004c7df2..e1991b1fac1 100644
--- a/reactos/include/psdk/userenv.h
+++ b/reactos/include/psdk/userenv.h
@@ -16,13 +16,6 @@ extern "C" {
 #define RP_FORCE (1)
 #endif
 
-#if defined(_USERENV_)
-#define USERENVAPI
-#else
-#define USERENVAPI DECLSPEC_IMPORT
-#endif
-
-
 typedef struct _PROFILEINFOA
 {
   DWORD dwSize;
@@ -47,34 +40,53 @@ typedef struct _PROFILEINFOW
   HANDLE hProfile;
 } PROFILEINFOW, *LPPROFILEINFOW;
 
-BOOL USERENVAPI WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA);
-BOOL USERENVAPI WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW);
-BOOL USERENVAPI WINAPI UnloadUserProfile (HANDLE, HANDLE);
+/* begin private */
+BOOL WINAPI InitializeProfiles (VOID);
+BOOL WINAPI CreateUserProfileA (PSID, LPCSTR);
+BOOL WINAPI CreateUserProfileW (PSID, LPCWSTR);
+BOOL WINAPI AddDesktopItemA (BOOL, LPCSTR, LPCSTR, LPCSTR, INT, LPCSTR, WORD, INT);
+BOOL WINAPI AddDesktopItemW (BOOL, LPCWSTR, LPCWSTR, LPCWSTR, INT, LPCWSTR, WORD, INT);
+BOOL WINAPI DeleteDesktopItemA (BOOL, LPCSTR);
+BOOL WINAPI DeleteDesktopItemW (BOOL, LPCWSTR);
+BOOL WINAPI CreateGroupA (LPCSTR, BOOL);
+BOOL WINAPI CreateGroupW (LPCWSTR, BOOL);
+BOOL WINAPI DeleteGroupA (LPCSTR, BOOL);
+BOOL WINAPI DeleteGroupW (LPCWSTR, BOOL);
+BOOL WINAPI AddItemA (LPCSTR, BOOL, LPCSTR, LPCSTR, LPCSTR, INT, LPCSTR, WORD, INT);
+BOOL WINAPI AddItemW (LPCWSTR, BOOL, LPCWSTR, LPCWSTR, LPCWSTR, INT, LPCWSTR, WORD, INT);
+BOOL WINAPI DeleteItemA (LPCSTR, BOOL, LPCSTR, BOOL);
+BOOL WINAPI DeleteItemW (LPCWSTR, BOOL, LPCWSTR, BOOL);
+BOOL WINAPI CopyProfileDirectoryA(LPCSTR, LPCSTR, DWORD);
+BOOL WINAPI CopyProfileDirectoryW(LPCWSTR, LPCWSTR, DWORD);
+/* end private */
+BOOL WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA);
+BOOL WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW);
+BOOL WINAPI UnloadUserProfile (HANDLE, HANDLE);
 
-BOOL USERENVAPI WINAPI GetAllUsersProfileDirectoryA (LPSTR, LPDWORD);
-BOOL USERENVAPI WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD);
-BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD);
-BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD);
-BOOL USERENVAPI WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD);
-BOOL USERENVAPI WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD);
-BOOL USERENVAPI WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD);
-BOOL USERENVAPI WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD);
+BOOL WINAPI GetAllUsersProfileDirectoryA (LPSTR, LPDWORD);
+BOOL WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD);
+BOOL WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD);
+BOOL WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD);
+BOOL WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD);
+BOOL WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD);
+BOOL WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD);
+BOOL WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD);
 
-BOOL USERENVAPI WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL);
-BOOL USERENVAPI WINAPI DestroyEnvironmentBlock(LPVOID);
+BOOL WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL);
+BOOL WINAPI DestroyEnvironmentBlock(LPVOID);
 #if (WINVER >= 0x0500)
-BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD);
-BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD);
+BOOL WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD);
+BOOL WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD);
 #endif
 
-HANDLE USERENVAPI WINAPI EnterCriticalPolicySection (BOOL);
-BOOL USERENVAPI WINAPI LeaveCriticalPolicySection (HANDLE);
-BOOL USERENVAPI WINAPI RefreshPolicy (BOOL);
+HANDLE WINAPI EnterCriticalPolicySection (BOOL);
+BOOL WINAPI LeaveCriticalPolicySection (HANDLE);
+BOOL WINAPI RefreshPolicy (BOOL);
 #if (WINVER >= 0x0500)
-BOOL USERENVAPI WINAPI RefreshPolicyEx (BOOL, DWORD);
+BOOL WINAPI RefreshPolicyEx (BOOL, DWORD);
 #endif
-BOOL USERENVAPI WINAPI RegisterGPNotification (HANDLE, BOOL);
-BOOL USERENVAPI WINAPI UnregisterGPNotification (HANDLE);
+BOOL WINAPI RegisterGPNotification (HANDLE, BOOL);
+BOOL WINAPI UnregisterGPNotification (HANDLE);
 
 #ifdef UNICODE
 typedef PROFILEINFOW PROFILEINFO;