diff --git a/libraries/libapparmor/swig/SWIG/libapparmor.i b/libraries/libapparmor/swig/SWIG/libapparmor.i
index 014839a64..f6d1001d5 100644
--- a/libraries/libapparmor/swig/SWIG/libapparmor.i
+++ b/libraries/libapparmor/swig/SWIG/libapparmor.i
@@ -2,13 +2,20 @@
 
 %{
 #include "aalogparse.h"
-extern int aa_change_hat(const char *subprofile, unsigned long magic_token);
-extern int aa_change_profile(const char *profile, unsigned long magic_token);
+#include "apparmor.h"
 
 %}
 
 %include "typemaps.i"
 %include "aalogparse.h"
-extern int aa_change_hat(const char *subprofile, unsigned long magic_token);
-extern int aa_change_profile(const char *profile, unsigned long magic_token);
+
+/* swig doesn't like the macro magic we do in apparmor.h so the fn prototypes
+ * are manually inserted here
+ */
+
+extern int aa_change_hat(const char *subprofile, unsigned long magic_token);
+extern int aa_change_profile(const char *profile);
+extern int aa_change_onexec(const char *profile);
+extern int aa_change_hatv(const char *subprofiles[], unsigned int token);
+extern int aa_change_hat_vargs(unsigned int token, int count, ...);