Index: uspace/lib/c/arch/ppc32/include/libarch/fibril_context.ag
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/fibril_context.ag	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ 	(revision )
@@ -1,137 +1,0 @@
-# Copyright (c) 2014 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.
-#
-
-{
-        name : context,
-
-        includes : [
-                {
-                        include : <stddef.h>
-                },
-                {
-                        include : <stdint.h>
-                }
-        ],
-
-        members : [
-                {
-                        name : sp,
-                        type : uint32_t
-                },
-                {
-                        name : pc,
-                        type : uint32_t
-                },
-
-                {
-                        name : tls,
-                        type : uint32_t
-                },
-                {
-                        name : r13,
-                        type : uint32_t
-                },
-                {
-                        name : r14,
-                        type : uint32_t
-                },
-                {
-                        name : r15,
-                        type : uint32_t
-                },
-                {
-                        name : r16,
-                        type : uint32_t
-                },
-                {
-                        name : r17,
-                        type : uint32_t
-                },
-                {
-                        name : r18,
-                        type : uint32_t
-                },
-                {
-                        name : r19,
-                        type : uint32_t
-                },
-                {
-                        name : r20,
-                        type : uint32_t
-                },
-                {
-                        name : r21,
-                        type : uint32_t
-                },
-                {
-                        name : r22,
-                        type : uint32_t
-                },
-                {
-                        name : r23,
-                        type : uint32_t
-                },
-                {
-                        name : r24,
-                        type : uint32_t
-                },
-                {
-                        name : r25,
-                        type : uint32_t
-                },
-                {
-                        name : r26,
-                        type : uint32_t
-                },
-                {
-                        name : r27,
-                        type : uint32_t
-                },
-                {
-                        name : r28,
-                        type : uint32_t
-                },
-                {
-                        name : r29,
-                        type : uint32_t
-                },
-                {
-                        name : r30,
-                        type : uint32_t
-                },
-                {
-                        name : r31,
-                        type : uint32_t
-                },
-
-                {
-                        name : cr,
-                        type : uint32_t
-                }
-        ]
-}
-
Index: uspace/lib/c/arch/ppc32/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/fibril_context.h	(revision 8d58fcaa7e5744b458fcb7645e5a20ddd6eb8092)
+++ uspace/lib/c/arch/ppc32/include/libarch/fibril_context.h	(revision 8d58fcaa7e5744b458fcb7645e5a20ddd6eb8092)
@@ -0,0 +1,89 @@
+/* Copyright (c) 2014 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 LIBC_ARCH_FIBRIL_CONTEXT_H_
+#define LIBC_ARCH_FIBRIL_CONTEXT_H_
+
+#define CONTEXT_OFFSET_SP   0x00
+#define CONTEXT_OFFSET_PC   0x04
+#define CONTEXT_OFFSET_TLS  0x08
+#define CONTEXT_OFFSET_R13  0x0c
+#define CONTEXT_OFFSET_R14  0x10
+#define CONTEXT_OFFSET_R15  0x14
+#define CONTEXT_OFFSET_R16  0x18
+#define CONTEXT_OFFSET_R17  0x1c
+#define CONTEXT_OFFSET_R18  0x20
+#define CONTEXT_OFFSET_R19  0x24
+#define CONTEXT_OFFSET_R20  0x28
+#define CONTEXT_OFFSET_R21  0x2c
+#define CONTEXT_OFFSET_R22  0x30
+#define CONTEXT_OFFSET_R23  0x34
+#define CONTEXT_OFFSET_R24  0x38
+#define CONTEXT_OFFSET_R25  0x3c
+#define CONTEXT_OFFSET_R26  0x40
+#define CONTEXT_OFFSET_R27  0x44
+#define CONTEXT_OFFSET_R28  0x48
+#define CONTEXT_OFFSET_R29  0x4c
+#define CONTEXT_OFFSET_R30  0x50
+#define CONTEXT_OFFSET_R31  0x54
+#define CONTEXT_OFFSET_CR   0x58
+#define CONTEXT_SIZE        0x5c
+
+#ifndef __ASSEMBLER__
+
+#include <stddef.h>
+#include <stdint.h>
+
+typedef struct context {
+	uint32_t sp;
+	uint32_t pc;
+	uint32_t tls;
+	uint32_t r13;
+	uint32_t r14;
+	uint32_t r15;
+	uint32_t r16;
+	uint32_t r17;
+	uint32_t r18;
+	uint32_t r19;
+	uint32_t r20;
+	uint32_t r21;
+	uint32_t r22;
+	uint32_t r23;
+	uint32_t r24;
+	uint32_t r25;
+	uint32_t r26;
+	uint32_t r27;
+	uint32_t r28;
+	uint32_t r29;
+	uint32_t r30;
+	uint32_t r31;
+	uint32_t cr;
+} context_t;
+
+#endif
+#endif
+
Index: uspace/lib/c/arch/ppc32/include/libarch/istate_struct.ag
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/istate_struct.ag	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ 	(revision )
@@ -1,1 +1,0 @@
-../../../../../../../kernel/arch/ppc32/include/arch/istate_struct.ag
Index: uspace/lib/c/arch/ppc32/include/libarch/istate_struct.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/istate_struct.h	(revision 8d58fcaa7e5744b458fcb7645e5a20ddd6eb8092)
+++ uspace/lib/c/arch/ppc32/include/libarch/istate_struct.h	(revision 8d58fcaa7e5744b458fcb7645e5a20ddd6eb8092)
@@ -0,0 +1,1 @@
+../../../../../../../kernel/arch/ppc32/include/arch/istate_struct.h
