diff --git a/Mac/Compat/nfullpath.c b/Mac/Compat/nfullpath.c
index 6e7e1b64cd2..94ccc4c4019 100644
--- a/Mac/Compat/nfullpath.c
+++ b/Mac/Compat/nfullpath.c
@@ -3,12 +3,9 @@
 ** (and only tested under MetroWerks, so far)
 */
 
-#if defined(MPW) || defined(__MWERKS__)
+#include <string.h>
+
 #include <Files.h>
-#endif
-#ifdef THINK_C_PRE_5_0
-#include <HFS.h>
-#endif
 
 #include "nfullpath.h"
 
diff --git a/Mac/Compat/nfullpath.h b/Mac/Compat/nfullpath.h
index 770777d6dcf..65ae5f37409 100644
--- a/Mac/Compat/nfullpath.h
+++ b/Mac/Compat/nfullpath.h
@@ -1 +1 @@
-int nfullpath(FSSpec *, char *);	/* Generate full path from fsspec */
\ No newline at end of file
+int nfullpath(FSSpec *, char *);	/* Generate full path from fsspec */
diff --git a/Mac/Modules/macfsmodule.c b/Mac/Modules/macfsmodule.c
index b0a37974a1a..014ff6bfca5 100644
--- a/Mac/Modules/macfsmodule.c
+++ b/Mac/Modules/macfsmodule.c
@@ -32,6 +32,10 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "nfullpath.h"
 
+#ifdef THINK_C
+#define FileFilterUPP FileFilterProcPtr
+#endif
+
 static object *ErrorObject;
 
 /* ----------------------------------------------------- */