diff --git a/BasiliskII/src/SDL/prefs_sdl.cpp b/BasiliskII/src/SDL/prefs_sdl.cpp
index 8150d709..5151f760 100644
--- a/BasiliskII/src/SDL/prefs_sdl.cpp
+++ b/BasiliskII/src/SDL/prefs_sdl.cpp
@@ -59,7 +59,7 @@ void LoadPrefs(const char * vmdir)	// TODO: load prefs from 'vmdir'
 	SDL_snprintf(prefs_path, sizeof(prefs_path), "%s/%s", vmdir, PREFS_FILE_NAME);
 	
 	// Read preferences from settings file
-	FILE *f = fopen(prefs_path, "r");
+	FILE *f = fopen(UserPrefsPath.empty() ? prefs_path : UserPrefsPath.c_str(), "r");
 	if (f != NULL) {
 
 		// Prefs file found, load settings
@@ -89,7 +89,7 @@ void SavePrefs(void)
 	SDL_snprintf(prefs_path, sizeof(prefs_path), "%s/%s", dir, PREFS_FILE_NAME);
 
 	FILE *f;
-	if ((f = fopen(prefs_path, "w")) != NULL) {
+	if ((f = fopen(UserPrefsPath.empty() ? prefs_path : UserPrefsPath.c_str(), "w")) != NULL) {
 		SavePrefsToStream(f);
 		fclose(f);
 	}
diff --git a/SheepShaver/src/Windows/kernel_windows.cpp b/SheepShaver/src/Windows/kernel_windows.cpp
deleted file mode 120000
index d9c12cdc..00000000
--- a/SheepShaver/src/Windows/kernel_windows.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../BasiliskII/src/Windows/kernel_windows.cpp
\ No newline at end of file
diff --git a/SheepShaver/src/Windows/kernel_windows.h b/SheepShaver/src/Windows/kernel_windows.h
deleted file mode 120000
index 10e68ceb..00000000
--- a/SheepShaver/src/Windows/kernel_windows.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../BasiliskII/src/Windows/kernel_windows.h
\ No newline at end of file