10 files changed, 14 insertions, 15 deletions
diff --git a/src/analysis/disass/area.c b/src/analysis/disass/area.c
index f010fa9..eaec25d 100644
--- a/src/analysis/disass/area.c
+++ b/src/analysis/disass/area.c
@@ -34,7 +34,7 @@
 
 #include "../routine.h"
 #include "../contents/restricted.h"
-#include "../../arch/raw.h"
+#include "../../arch/instructions/raw.h"
 #include "../../common/bits.h"
 #include "../../common/sort.h"
 #include "../../core/global.h"
diff --git a/src/analysis/disass/block.c b/src/analysis/disass/block.c
index e3f19d3..c80d464 100644
--- a/src/analysis/disass/block.c
+++ b/src/analysis/disass/block.c
@@ -32,7 +32,7 @@
 
 
 #include "../block-int.h"
-#include "../../arch/raw.h"
+#include "../../arch/instructions/raw.h"
 #include "../../common/extstr.h"
 #include "../../core/params.h"
 #include "../../glibext/gbinarycursor.h"
diff --git a/src/analysis/disass/links.c b/src/analysis/disass/links.c
index e22fb05..c4e7076 100644
--- a/src/analysis/disass/links.c
+++ b/src/analysis/disass/links.c
@@ -28,7 +28,7 @@
 
 
 #include "../../arch/instruction.h"
-#include "../../arch/raw.h"
+#include "../../arch/instructions/raw.h"
 #include "../../arch/target.h"
 #include "../../arch/operands/immediate.h"
 #include "../../arch/operands/targetable.h"
diff --git a/src/analysis/routine.c b/src/analysis/routine.c
index b9106d9..02bd167 100644
--- a/src/analysis/routine.c
+++ b/src/analysis/routine.c
@@ -35,7 +35,7 @@
 
 
 #include "routine-int.h"
-#include "../arch/raw.h"
+#include "../arch/instructions/raw.h"
 #include "../common/extstr.h"
 #include "../core/params.h"
 #include "../glibext/gbinarycursor.h"
diff --git a/src/arch/Makefile.am b/src/arch/Makefile.am
index 46f78e8..af0c79a 100644
--- a/src/arch/Makefile.am
+++ b/src/arch/Makefile.am
@@ -18,7 +18,6 @@ libarch_la_SOURCES =					\
 	processor-int.h						\
 	processor.h processor.c				\
 	proxy.h proxy.c						\
-	raw.h raw.c							\
 	register-int.h						\
 	register.h register.c				\
 	storage.h storage.c					\
diff --git a/src/arch/instructions/Makefile.am b/src/arch/instructions/Makefile.am
index c060c7e..584173f 100644
--- a/src/arch/instructions/Makefile.am
+++ b/src/arch/instructions/Makefile.am
@@ -2,6 +2,7 @@
 noinst_LTLIBRARIES = libarchinstructions.la
 
 libarchinstructions_la_SOURCES =		\
+	raw.h raw.c							\
 	undefined-int.h						\
 	undefined.h undefined.c
 
diff --git a/src/arch/raw.c b/src/arch/instructions/raw.c
index 285e168..7c2535c 100644
--- a/src/arch/raw.c
+++ b/src/arch/instructions/raw.c
@@ -32,9 +32,9 @@
 #include <i18n.h>
 
 
-#include "instruction-int.h"
-#include "target.h"
-#include "operands/immediate.h"
+#include "../instruction-int.h"
+#include "../target.h"
+#include "../operands/immediate.h"
 
 
 
diff --git a/src/arch/raw.h b/src/arch/instructions/raw.h
index c745f4a..4e92cd4 100644
--- a/src/arch/raw.h
+++ b/src/arch/instructions/raw.h
@@ -21,15 +21,15 @@
  */
 
 
-#ifndef _ARCH_RAW_H
-#define _ARCH_RAW_H
+#ifndef _ARCH_INSTRUCTIONS_RAW_H
+#define _ARCH_INSTRUCTIONS_RAW_H
 
 
 #include <glib-object.h>
 
 
-#include "instruction.h"
-#include "vmpa.h"
+#include "../instruction.h"
+#include "../vmpa.h"
 
 
 
@@ -88,4 +88,4 @@ bool g_raw_instruction_is_string(const GRawInstruction *);
 
 
 
-#endif  /* _ARCH_RAW_H */
+#endif  /* _ARCH_INSTRUCTIONS_RAW_H */
diff --git a/src/arch/processor.c b/src/arch/processor.c
index 96007fb..777b01e 100644
--- a/src/arch/processor.c
+++ b/src/arch/processor.c
@@ -35,7 +35,6 @@
 
 #include "instruction-int.h"
 #include "processor-int.h"
-#include "raw.h"
 #include "../common/sort.h"
 #include "../core/logs.h"
 #include "../glibext/chrysamarshal.h"
diff --git a/src/core/processors.c b/src/core/processors.c
index c03b98f..224e9f7 100644
--- a/src/core/processors.c
+++ b/src/core/processors.c
@@ -29,8 +29,8 @@
 #include <string.h>
 
 
-#include "../arch/raw.h"
 #include "../arch/target.h"
+#include "../arch/instructions/raw.h"
 #include "../arch/instructions/undefined.h"
 #include "../arch/operands/immediate.h"
 #include "../arch/operands/register.h"