diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index f94f3bfb5f2..73be5e1a8cb 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -52,6 +52,8 @@
 
 #ifdef VMS
 #define _POSIX_EXIT 1
+#define HOST_EXECUTABLE_SUFFIX ".exe"
+#define HOST_OBJECT_SUFFIX ".obj"
 #endif
 
 #ifdef IN_RTS
@@ -96,13 +98,13 @@
 
 /* Header files and definitions for __gnat_set_file_time_name.  */
 
-#include <rms.h>
-#include <atrdef.h>
-#include <fibdef.h>
-#include <stsdef.h>
-#include <iodef.h>
+#include <vms/rms.h>
+#include <vms/atrdef.h>
+#include <vms/fibdef.h>
+#include <vms/stsdef.h>
+#include <vms/iodef.h>
 #include <errno.h>
-#include <descrip.h>
+#include <vms/descrip.h>
 #include <string.h>
 #include <unixlib.h>
 
@@ -2491,6 +2493,7 @@ _flush_cache()
       && ! (defined (linux) && defined (i386)) \
       && ! defined (__FreeBSD__) \
       && ! defined (__hpux__) \
+      && ! defined (__APPLE__) \
       && ! defined (_AIX) \
       && ! (defined (__alpha__)  && defined (__osf__)) \
       && ! defined (__MINGW32__) \
diff --git a/gcc/ada/expect.c b/gcc/ada/expect.c
index 3566358a3dd..f0b4bfb9db7 100644
--- a/gcc/ada/expect.c
+++ b/gcc/ada/expect.c
@@ -6,7 +6,7 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *           Copyright (C) 2001-2004 Ada Core Technologies, Inc.            *
+ *           Copyright (C) 2001-2005 Ada Core Technologies, Inc.            *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -152,10 +152,10 @@ __gnat_expect_poll (int *fd, int num_fd, int timeout, int *is_set)
 #include <unixio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <descrip.h>
+#include <vms/descrip.h>
 #include <stdio.h>
-#include <stsdef.h>
-#include <iodef.h>
+#include <vms/stsdef.h>
+#include <vms/iodef.h>
 
 int
 __gnat_pipe (int *fd)
diff --git a/gcc/ada/tb-alvms.c b/gcc/ada/tb-alvms.c
index 60effcc0504..83a470c9f89 100644
--- a/gcc/ada/tb-alvms.c
+++ b/gcc/ada/tb-alvms.c
@@ -6,7 +6,7 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *              Copyright (C) 2003 Ada Core Technologies, Inc               *
+ *            Copyright (C) 2003,2005 Ada Core Technologies, Inc            *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -39,10 +39,10 @@
    Most of the contents is directed by the OpenVMS/Alpha Conventions (ABI)
    document, sections of which we will refer to as ABI-<section_number>.  */
 
-#include <pdscdef.h>
-#include <libicb.h>
-#include <chfctxdef.h>
-#include <chfdef.h>
+#include <vms/pdscdef.h>
+#include <vms/libicb.h>
+#include <vms/chfctxdef.h>
+#include <vms/chfdef.h>
 
 /* A couple of items missing from the header file included above.  */
 extern void * SYS$GL_CALL_HANDL;