diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 5f5ae4c..b6e4460 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -567,7 +567,11 @@
 #ifndef RISCOS
 	if (!stat(filename, &s)) {
 		if (S_ISDIR(s.st_mode))
+#if defined(PYOS_OS2) && defined(PYCC_VACPP)
+			errno = EOS2ERR;
+#else
 			errno = EISDIR;
+#endif
 		else
 			exists = 1;
 	}
diff --git a/Python/importdl.h b/Python/importdl.h
index 4193620..76fd05d 100644
--- a/Python/importdl.h
+++ b/Python/importdl.h
@@ -38,6 +38,7 @@
 typedef FARPROC dl_funcptr;
 #else
 #ifdef PYOS_OS2
+#include <os2def.h>
 typedef int (* APIENTRY dl_funcptr)();
 #else
 typedef void (*dl_funcptr)(void);