diff --git a/bsps/sparc64/headers.am b/bsps/sparc64/headers.am
index 1a04025280..91f64a53c0 100644
--- a/bsps/sparc64/headers.am
+++ b/bsps/sparc64/headers.am
@@ -42,7 +42,6 @@ include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofw.h
 include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofw_tree.h
 include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/ofwarch.h
 include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/register.h
-include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/stack.h
 include_boot_HEADERS += ../../../../../bsps/sparc64/include/boot/types.h
 
 include_genarch_ofwdir = $(includedir)/genarch/ofw
diff --git a/bsps/sparc64/include/boot/stack.h b/bsps/sparc64/include/boot/stack.h
deleted file mode 100644
index 1486dd21b4..0000000000
--- a/bsps/sparc64/include/boot/stack.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2006 Jakub Jermar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef BOOT_sparc64_STACK_H_
-#define BOOT_sparc64_STACK_H_
-
-#define STACK_ALIGNMENT              16
-#define STACK_BIAS                   2047
-#define STACK_WINDOW_SAVE_AREA_SIZE  (16 * 8)
-
-#endif
diff --git a/c/src/lib/libbsp/sparc64/shared/helenos/boot/sparc64/loader/ofwasm.S b/c/src/lib/libbsp/sparc64/shared/helenos/boot/sparc64/loader/ofwasm.S
index e2ba6261e8..4956175131 100644
--- a/c/src/lib/libbsp/sparc64/shared/helenos/boot/sparc64/loader/ofwasm.S
+++ b/c/src/lib/libbsp/sparc64/shared/helenos/boot/sparc64/loader/ofwasm.S
@@ -33,7 +33,7 @@
  * located in the HelenOS code base.
  */
 
-#include <boot/stack.h>
+#include <arch/stack.h>
 #include <boot/register.h>
 
 .register %g2, #scratch