diff --git a/ChangeLog b/ChangeLog
index f6b1394cf8..fe1867c537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Apr 25 21:25:23 1999  ape@lrdpf.spacetec.no  (Asbjorn Pettersen)
+
+	* plug-ins/script-fu/script-fu-scripts.c:  Add <sys/types.h>.
+	 Use G_SEARCHPATH_SEPARATOR_S instead of ":".
+
+	* plug-ins/script-fu/script-fu-console.c: Add <sys/types.h>
+
 Sun Apr 25 16:59:09 BST 1999 Adam D. Moss <adam@gimp.org>
 
 	* plug-ins/gif/gif.c: Save the comment back onto the image
diff --git a/plug-ins/script-fu/script-fu-console.c b/plug-ins/script-fu/script-fu-console.c
index c7ba284efe..b50e0e4760 100644
--- a/plug-ins/script-fu/script-fu-console.c
+++ b/plug-ins/script-fu/script-fu-console.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c
index ade59d7cc3..1f48331da2 100644
--- a/plug-ins/script-fu/script-fu-interface.c
+++ b/plug-ins/script-fu/script-fu-interface.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <ctype.h>		/* For toupper() */
@@ -303,7 +304,7 @@ script_fu_find_scripts ()
 
       next_token = local_path;
 
-      token = strtok (next_token, ":");
+      token = strtok (next_token, G_SEARCHPATH_SEPARATOR_S);
 
       while (token)
 	{
@@ -346,6 +347,9 @@ script_fu_find_scripts ()
 
 			  if (!my_err && S_ISREG (filestat.st_mode))
 			    {
+#ifdef __EMX__
+			      _fnslashify(filename);
+#endif
 			      command = g_new (char, strlen ("(load \"\")") + strlen (filename) + 1);
 			      sprintf (command, "(load \"%s\")", filename);
 
@@ -364,7 +368,7 @@ script_fu_find_scripts ()
 
 	  g_free (path);
 
-	  token = strtok (NULL, ":");
+	  token = strtok (NULL, G_SEARCHPATH_SEPARATOR_S);
 	} /* while */
 
       g_free(local_path);
diff --git a/plug-ins/script-fu/script-fu-scripts.c b/plug-ins/script-fu/script-fu-scripts.c
index ade59d7cc3..1f48331da2 100644
--- a/plug-ins/script-fu/script-fu-scripts.c
+++ b/plug-ins/script-fu/script-fu-scripts.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <ctype.h>		/* For toupper() */
@@ -303,7 +304,7 @@ script_fu_find_scripts ()
 
       next_token = local_path;
 
-      token = strtok (next_token, ":");
+      token = strtok (next_token, G_SEARCHPATH_SEPARATOR_S);
 
       while (token)
 	{
@@ -346,6 +347,9 @@ script_fu_find_scripts ()
 
 			  if (!my_err && S_ISREG (filestat.st_mode))
 			    {
+#ifdef __EMX__
+			      _fnslashify(filename);
+#endif
 			      command = g_new (char, strlen ("(load \"\")") + strlen (filename) + 1);
 			      sprintf (command, "(load \"%s\")", filename);
 
@@ -364,7 +368,7 @@ script_fu_find_scripts ()
 
 	  g_free (path);
 
-	  token = strtok (NULL, ":");
+	  token = strtok (NULL, G_SEARCHPATH_SEPARATOR_S);
 	} /* while */
 
       g_free(local_path);