Index: uvm.h
===================================================================
RCS file: /cvs/src/sys/uvm/uvm.h,v
retrieving revision 1.57
diff -u -p -r1.57 uvm.h
--- uvm.h	3 Oct 2014 17:41:00 -0000	1.57
+++ uvm.h	4 May 2015 07:30:06 -0000
@@ -38,9 +38,6 @@
 #include <uvm/uvm_glue.h>
 #include <uvm/uvm_km.h>
 #include <uvm/uvm_swap.h>
-#ifdef UVM_SWAP_ENCRYPT
-#include <uvm/uvm_swap_encrypt.h>
-#endif
 
 #include <uvm/uvm_pmemrange.h>
 
Index: uvm_swap.c
===================================================================
RCS file: /cvs/src/sys/uvm/uvm_swap.c,v
retrieving revision 1.134
diff -u -p -r1.134 uvm_swap.c
--- uvm_swap.c	27 Jan 2015 03:17:37 -0000	1.134
+++ uvm_swap.c	4 May 2015 07:30:06 -0000
@@ -61,7 +61,7 @@
 
 #include <uvm/uvm.h>
 #ifdef UVM_SWAP_ENCRYPT
-#include <sys/syslog.h>
+#include <uvm/uvm_swap_encrypt.h>
 #endif
 
 #include <sys/specdev.h>
Index: uvm_swap_encrypt.c
===================================================================
RCS file: /cvs/src/sys/uvm/uvm_swap_encrypt.c,v
retrieving revision 1.20
diff -u -p -r1.20 uvm_swap_encrypt.c
--- uvm_swap_encrypt.c	14 Mar 2015 03:38:53 -0000	1.20
+++ uvm_swap_encrypt.c	4 May 2015 07:30:06 -0000
@@ -39,6 +39,7 @@
 #include <crypto/rijndael.h>
 
 #include <uvm/uvm.h>
+#include <uvm/uvm_swap_encrypt.h>
 
 struct swap_key *kcur = NULL;
 rijndael_ctx swap_ctxt;