diff --git a/opal/mca/backtrace/none/backtrace_none.c b/opal/mca/backtrace/none/backtrace_none.c
index 2f62519570..4a05c26d82 100644
--- a/opal/mca/backtrace/none/backtrace_none.c
+++ b/opal/mca/backtrace/none/backtrace_none.c
@@ -9,13 +9,19 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2006      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
  * 
  * $HEADER$
  */
+#include "opal_config.h"
 
+#include <stdio.h>
+
+#include "opal/constants.h"
+#include "opal/mca/backtrace/backtrace.h"
 
 void
 opal_backtrace_print(FILE *file)
@@ -24,10 +30,10 @@ opal_backtrace_print(FILE *file)
 
 
 int
-opal_backtrace_buffer(char ***message_out, int *len_out);
+opal_backtrace_buffer(char ***message_out, int *len_out)
 {
-    *messages_out = NULL;
+    *message_out = NULL;
     *len_out = 0;
 
-    return OMPI_ERR_NOT_IMPLEMENTED
+    return OPAL_ERR_NOT_IMPLEMENTED;
 }
diff --git a/opal/mca/backtrace/printstack/backtrace_printstack.c b/opal/mca/backtrace/printstack/backtrace_printstack.c
index af31ff6e27..f406146b12 100644
--- a/opal/mca/backtrace/printstack/backtrace_printstack.c
+++ b/opal/mca/backtrace/printstack/backtrace_printstack.c
@@ -9,13 +9,20 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2006      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
  * 
  * $HEADER$
  */
+#include "opal_config.h"
 
+#include <stdio.h>
+#include <ucontext.h>
+
+#include "opal/constants.h"
+#include "opal/mca/backtrace/backtrace.h"
 
 void
 opal_backtrace_print(FILE *file)
@@ -25,14 +32,14 @@ opal_backtrace_print(FILE *file)
 
 
 int
-opal_backtrace_buffer(char ***message_out, int *len_out);
+opal_backtrace_buffer(char ***message_out, int *len_out)
 {
-    *messages_out = NULL;
+    *message_out = NULL;
     *len_out = 0;
 
     /* BWB - I think we can implement this in a similar way that
        printstack is implemented.  I just don't have time right
        now. */
 
-    return OMPI_ERR_NOT_IMPLEMENTED
+    return OPAL_ERR_NOT_IMPLEMENTED;
 }