diff --git a/env.c b/env.c
index bfab0cb18..54c53de47 100644
--- a/env.c
+++ b/env.c
@@ -386,7 +386,7 @@ static void setup_path()
 	path = env_get( L"PATH" );
 	if( !path )
 	{
-		env_set( L"PATH", 0, ENV_EXPORT | ENV_GLOBAL | ENV_USER );
+		env_set( L"PATH", 0, ENV_EXPORT | ENV_GLOBAL );
 		path=0;
 	}	
 		
diff --git a/env_universal_common.c b/env_universal_common.c
index 1f8658bcc..2d5bb12a8 100644
--- a/env_universal_common.c
+++ b/env_universal_common.c
@@ -5,6 +5,8 @@
    client library and by the daemon.
 
 */
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>