Index: kernel/arch/amd64/include/arch/istate.h
===================================================================
--- kernel/arch/amd64/include/arch/istate.h	(revision 17af882f644f6d312e05f3965cef1fececb99062)
+++ kernel/arch/amd64/include/arch/istate.h	(revision 2a37b9f1eb93bba78ec231d42ef29f30dff550a0)
@@ -38,31 +38,9 @@
 #include <trace.h>
 
-/** This is passed to interrupt handlers */
-typedef struct istate {
-	uint64_t rax;
-	uint64_t rbx;
-	uint64_t rcx;
-	uint64_t rdx;
-	uint64_t rsi;
-	uint64_t rdi;
-	uint64_t rbp;
-	uint64_t r8;
-	uint64_t r9;
-	uint64_t r10;
-	uint64_t r11;
-	uint64_t r12;
-	uint64_t r13;
-	uint64_t r14;
-	uint64_t r15;
-	uint64_t alignment;   /* align rbp_frame on multiple of 16 */
-	uint64_t rbp_frame;   /* imitation of frame pointer linkage */
-	uint64_t rip_frame;   /* imitation of return address linkage */
-	uint64_t error_word;  /* real or fake error word */
-	uint64_t rip;
-	uint64_t cs;
-	uint64_t rflags;
-	uint64_t rsp;         /* only if istate_t is from uspace */
-	uint64_t ss;          /* only if istate_t is from uspace */
-} istate_t;
+#ifdef KERNEL
+#include <arch/istate_struct.h>
+#else
+#include <libarch/istate_struct.h>
+#endif
 
 #define RPL_USER	3
Index: kernel/arch/amd64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/amd64/include/arch/istate_struct.ag	(revision 2a37b9f1eb93bba78ec231d42ef29f30dff550a0)
+++ kernel/arch/amd64/include/arch/istate_struct.ag	(revision 2a37b9f1eb93bba78ec231d42ef29f30dff550a0)
@@ -0,0 +1,146 @@
+# 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 : istate,
+
+        includes : [
+                {
+                        guard : KERNEL,
+                        include : <typedefs.h>
+                },
+                {
+                        negative-guard: KERNEL,
+                        include : <sys/types.h>
+                }
+        ],
+
+        members : [
+                {
+                        name : rax,
+                        type : uint64_t
+                },
+                {
+                        name : rbx,
+                        type : uint64_t
+                },
+                {
+                        name : rcx,
+                        type : uint64_t
+                },
+                {
+                        name : rdx,
+                        type : uint64_t
+                },
+                {
+                        name : rsi,
+                        type : uint64_t
+                },
+                {
+                        name : rdi,
+                        type : uint64_t
+                },
+                {
+                        name : rbp,
+                        type : uint64_t
+                },
+                {
+                        name : r8,
+                        type : uint64_t
+                },
+                {
+                        name : r9,
+                        type : uint64_t
+                },
+                {
+                        name : r10,
+                        type : uint64_t
+                },
+                {
+                        name : r11,
+                        type : uint64_t
+                },
+                {
+                        name : r12,
+                        type : uint64_t
+                },
+                {
+                        name : r13,
+                        type : uint64_t
+                },
+                {
+                        name : r14,
+                        type : uint64_t
+                },
+                {
+                        name : r15,
+                        type : uint64_t
+                },
+                {
+                        # align rbp_frame on multiple of 16
+                        name : alignment,
+                        type : uint64_t
+                },
+                {
+                        # imitation of frame pointer linkage
+                        name : rbp_frame,
+                        type : uint64_t
+                },
+                {
+                        # imitation of frame address linkage
+                        name : rip_frame,
+                        type : uint64_t
+                },
+                {
+                        # real or fake error word
+                        name : error_word,
+                        type : uint64_t
+                },
+                {
+                        name : rip,
+                        type : uint64_t
+                },
+                {
+                        name : cs,
+                        type : uint64_t
+                },
+                {
+                        name : rflags,
+                        type : uint64_t
+                },
+                {
+                        # only if istate_t is from uspace
+                        name : rsp,
+                        type : uint64_t
+                },
+                {
+                        # only if istate_t is from uspace
+                        name : ss,
+                        type : uint64_t
+                }
+        ]
+}