diff --git a/libraries/libapparmor/Makefile.am b/libraries/libapparmor/Makefile.am
index f82a36b84..b22a13e6d 100644
--- a/libraries/libapparmor/Makefile.am
+++ b/libraries/libapparmor/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
 NAME = libapparmor
 SRCDIR = src
 
-SUBDIRS = doc src swig testsuite
+SUBDIRS = doc src include swig testsuite
 
 REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \
 	/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
diff --git a/libraries/libapparmor/configure.ac b/libraries/libapparmor/configure.ac
index 07bedeb8f..16460d92f 100644
--- a/libraries/libapparmor/configure.ac
+++ b/libraries/libapparmor/configure.ac
@@ -82,4 +82,6 @@ testsuite/Makefile
 testsuite/config/Makefile
 testsuite/libaalogparse.test/Makefile
 testsuite/lib/Makefile
+include/Makefile
+include/sys/Makefile
 )
diff --git a/libraries/libapparmor/include/Makefile.am b/libraries/libapparmor/include/Makefile.am
new file mode 100644
index 000000000..6c355b721
--- /dev/null
+++ b/libraries/libapparmor/include/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = sys
+
+aalogparsedir = $(includedir)/aalogparse
+aalogparse_HEADERS = aalogparse.h
diff --git a/libraries/libapparmor/src/aalogparse.h b/libraries/libapparmor/include/aalogparse.h
similarity index 100%
rename from libraries/libapparmor/src/aalogparse.h
rename to libraries/libapparmor/include/aalogparse.h
diff --git a/libraries/libapparmor/include/sys/Makefile.am b/libraries/libapparmor/include/sys/Makefile.am
new file mode 100644
index 000000000..38efc3ed4
--- /dev/null
+++ b/libraries/libapparmor/include/sys/Makefile.am
@@ -0,0 +1,3 @@
+
+apparmor_hdrdir = $(includedir)/sys
+apparmor_hdr_HEADERS = apparmor.h
diff --git a/libraries/libapparmor/src/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h
similarity index 100%
rename from libraries/libapparmor/src/apparmor.h
rename to libraries/libapparmor/include/sys/apparmor.h
diff --git a/libraries/libapparmor/src/Makefile.am b/libraries/libapparmor/src/Makefile.am
index 48bf2f4c7..0c9a88a39 100644
--- a/libraries/libapparmor/src/Makefile.am
+++ b/libraries/libapparmor/src/Makefile.am
@@ -28,7 +28,7 @@ BUILT_SOURCES = grammar.h scanner.h af_protos.h
 AM_LFLAGS = -v
 AM_YFLAGS = -d -p aalogparse_
 AM_CFLAGS = -Wall
-AM_CPPFLAGS = -D_GNU_SOURCE
+AM_CPPFLAGS = -D_GNU_SOURCE -I$(top_srcdir)/include/
 scanner.h: scanner.l
 	$(LEX) -v $<
 
@@ -37,12 +37,6 @@ scanner.c: scanner.l
 af_protos.h: /usr/include/netinet/in.h
 	 LC_ALL=C  sed  -n -e "/IPPROTO_MAX/d"  -e "s/^\#define[ \\t]\\+IPPROTO_\\([A-Z0-9_]\\+\\)\\(.*\\)$$/AA_GEN_PROTO_ENT(\\UIPPROTO_\\1, \"\\L\\1\")/p" $< > $@
 
-changehatdir = $(includedir)/sys
-changehat_HEADERS = apparmor.h
-
-aalogparsedir = $(includedir)/aalogparse
-aalogparse_HEADERS = aalogparse.h
-
 lib_LTLIBRARIES = libapparmor.la
 noinst_HEADERS = grammar.h parser.h scanner.h af_protos.h
 
diff --git a/libraries/libapparmor/src/grammar.y b/libraries/libapparmor/src/grammar.y
index a9b11766b..e318da7a7 100644
--- a/libraries/libapparmor/src/grammar.y
+++ b/libraries/libapparmor/src/grammar.y
@@ -22,7 +22,7 @@
  * information about tokens given and rules matched. */
 #define YYDEBUG 0
 #include <string.h>
-#include "aalogparse.h"
+#include <aalogparse.h>
 #include "parser.h"
 #include "grammar.h"
 #include "scanner.h"
diff --git a/libraries/libapparmor/src/kernel_interface.c b/libraries/libapparmor/src/kernel_interface.c
index ab064a0a2..4a16c3860 100644
--- a/libraries/libapparmor/src/kernel_interface.c
+++ b/libraries/libapparmor/src/kernel_interface.c
@@ -31,7 +31,7 @@
 #include <inttypes.h>
 #include <pthread.h>
 
-#include "apparmor.h"
+#include <sys/apparmor.h>
 
 /* some non-Linux systems do not define a static value */
 #ifndef PATH_MAX
diff --git a/libraries/libapparmor/src/libaalogparse.c b/libraries/libapparmor/src/libaalogparse.c
index f0b13bbc4..730e386a6 100644
--- a/libraries/libapparmor/src/libaalogparse.c
+++ b/libraries/libapparmor/src/libaalogparse.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <netinet/in.h>
-#include "aalogparse.h"
+#include <aalogparse.h>
 #include "parser.h"
 
 /* This is mostly just a wrapper around the code in grammar.y */
diff --git a/libraries/libapparmor/src/scanner.l b/libraries/libapparmor/src/scanner.l
index 2f25b0456..04f92e1b0 100644
--- a/libraries/libapparmor/src/scanner.l
+++ b/libraries/libapparmor/src/scanner.l
@@ -27,7 +27,7 @@
 %{
 
 #include "grammar.h"
-#include "aalogparse.h"
+#include <aalogparse.h>
 #include "parser.h"
 
 #include <assert.h>
diff --git a/libraries/libapparmor/src/tst_aalogmisc.c b/libraries/libapparmor/src/tst_aalogmisc.c
index af8b000dc..73aceebee 100644
--- a/libraries/libapparmor/src/tst_aalogmisc.c
+++ b/libraries/libapparmor/src/tst_aalogmisc.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "aalogparse.h"
+#include <aalogparse.h>
 #include "parser.h"
 
 
diff --git a/libraries/libapparmor/swig/SWIG/libapparmor.i b/libraries/libapparmor/swig/SWIG/libapparmor.i
index a94cb232c..3e078456c 100644
--- a/libraries/libapparmor/swig/SWIG/libapparmor.i
+++ b/libraries/libapparmor/swig/SWIG/libapparmor.i
@@ -1,13 +1,13 @@
 %module LibAppArmor
 
 %{
-#include "aalogparse.h"
-#include "apparmor.h"
+#include <aalogparse.h>
+#include <sys/apparmor.h>
 
 %}
 
 %include "typemaps.i"
-%include "aalogparse.h"
+%include <aalogparse.h>
 
 /* swig doesn't like the macro magic we do in apparmor.h so the fn prototypes
  * are manually inserted here
diff --git a/libraries/libapparmor/swig/perl/Makefile.PL.in b/libraries/libapparmor/swig/perl/Makefile.PL.in
index f93325e74..d3cc8295f 100644
--- a/libraries/libapparmor/swig/perl/Makefile.PL.in
+++ b/libraries/libapparmor/swig/perl/Makefile.PL.in
@@ -10,7 +10,7 @@ WriteMakefile(
 	'FIRST_MAKEFILE' => 'Makefile.perl',
 	'ABSTRACT' => q[Perl interface to AppArmor] ,
 	'VERSION' => q[@VERSION@],
-	'INC' => q[@CPPFLAGS@ -I@top_srcdir@/src @CFLAGS@],
+	'INC' => q[@CPPFLAGS@ -I@top_srcdir@/include @CFLAGS@],
 	'LIBS' => q[-L@top_builddir@/src/.libs/ -lapparmor @LIBS@],
 	'OBJECT' => 'libapparmor_wrap.o', # $(OBJ_EXT)
 ) ;
diff --git a/libraries/libapparmor/swig/perl/Makefile.am b/libraries/libapparmor/swig/perl/Makefile.am
index df42f5d0b..901fc62cf 100644
--- a/libraries/libapparmor/swig/perl/Makefile.am
+++ b/libraries/libapparmor/swig/perl/Makefile.am
@@ -4,7 +4,7 @@ if HAVE_PERL
 noinst_DATA =LibAppArmor.so
 
 libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i
-	$(SWIG) -perl -I$(srcdir)/../../src -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i
+	$(SWIG) -perl -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i
 
 MOSTLYCLEANFILES=libapparmor_wrap.c LibAppArmor.pm
 
diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am
index 729fd78a5..86c8e9136 100644
--- a/libraries/libapparmor/swig/python/Makefile.am
+++ b/libraries/libapparmor/swig/python/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST      = libapparmor_wrap.c
 SUBDIRS = test
 
 libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i
-	$(SWIG) -python -I$(srcdir)/../../src -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i
+	$(SWIG) -python -I$(srcdir)/../../include -module LibAppArmor -o $@ $(srcdir)/../SWIG/libapparmor.i
 	mv LibAppArmor.py __init__.py
 
 MOSTLYCLEANFILES=libapparmor_wrap.c __init__.py
diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in
index cf49a311f..18358fc1b 100644
--- a/libraries/libapparmor/swig/python/setup.py.in
+++ b/libraries/libapparmor/swig/python/setup.py.in
@@ -12,7 +12,7 @@ setup(name          = 'LibAppArmor',
       packages      = [ 'LibAppArmor' ],
       ext_package   = 'LibAppArmor',
       ext_modules   = [Extension('_LibAppArmor', ['libapparmor_wrap.c'],
-                                 include_dirs=['@top_srcdir@/src'],
+                                 include_dirs=['@top_srcdir@/include'],
                                  extra_link_args = '-L@top_builddir@/src/.libs -lapparmor'.split(),
                     )],
       scripts       = [],
diff --git a/libraries/libapparmor/swig/ruby/Makefile.am b/libraries/libapparmor/swig/ruby/Makefile.am
index 58284da3e..03ef02fd6 100644
--- a/libraries/libapparmor/swig/ruby/Makefile.am
+++ b/libraries/libapparmor/swig/ruby/Makefile.am
@@ -4,12 +4,12 @@ EXTRA_DIST =            extconf.rb LibAppArmor_wrap.c examples/*.rb
 noinst_DATA =           LibAppArmor.so
 
 LibAppArmor_wrap.c : $(srcdir)/../SWIG/libapparmor.i
-	$(SWIG) -ruby -module LibAppArmor -I$(top_srcdir)/src -o $@ $(srcdir)/../SWIG/libapparmor.i
+	$(SWIG) -ruby -module LibAppArmor -I$(top_srcdir)/include -o $@ $(srcdir)/../SWIG/libapparmor.i
 
 MOSTLYCLEANFILES=LibAppArmor_wrap.c
 
 Makefile.ruby: extconf.rb
-	PREFIX=$(prefix) $(RUBY) $< --with-LibAppArmor-include=$(top_srcdir)/src
+	PREFIX=$(prefix) $(RUBY) $< --with-LibAppArmor-include=$(top_srcdir)/include
 
 LibAppArmor.so: LibAppArmor_wrap.c Makefile.ruby
 	$(MAKE) -fMakefile.ruby
diff --git a/libraries/libapparmor/testsuite/Makefile.am b/libraries/libapparmor/testsuite/Makefile.am
index 6a1d5d74b..3459bc6c6 100644
--- a/libraries/libapparmor/testsuite/Makefile.am
+++ b/libraries/libapparmor/testsuite/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = lib config libaalogparse.test
 PACKAGE = libaalogparse
 AUTOMAKE_OPTIONS = dejagnu
 
-INCLUDES = -I. -I$(top_srcdir)/src
+INCLUDES = -I. -I$(top_srcdir)/include
 
 AM_CPPFLAGS = $(DEBUG_FLAGS) -DLOCALEDIR=\"${localedir}\"
 AM_CFLAGS = -Wall
diff --git a/libraries/libapparmor/testsuite/test_multi.c b/libraries/libapparmor/testsuite/test_multi.c
index a80acb949..7e5fba035 100644
--- a/libraries/libapparmor/testsuite/test_multi.c
+++ b/libraries/libapparmor/testsuite/test_multi.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "aalogparse.h"
+#include <aalogparse.h>
 
 int print_results(aa_log_record *record);