7 files changed, 8 insertions, 6 deletions

diff --git a/ssh-xmss.c b/ssh-xmss.c
index e25dbbf65..4c734fd7d 100644
--- a/ssh-xmss.c
+++ b/ssh-xmss.c
@@ -16,6 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #define SSHKEY_INTERNAL
 #include <sys/types.h>
@@ -188,3 +189,4 @@ ssh_xmss_verify(const struct sshkey *key,
         free(ktype);
         return r;
 }
+#endif /* WITH_XMSS */
diff --git a/sshkey-xmss.c b/sshkey-xmss.c
index e2b7c49ce..5d66ee790 100644
--- a/sshkey-xmss.c
+++ b/sshkey-xmss.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /* $OpenBSD: sshkey-xmss.c,v 1.1 2018/02/23 15:58:38 markus Exp $ */
 /*
  * Copyright (c) 2017 Markus Friedl.  All rights reserved.
@@ -25,6 +24,7 @@
  */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/xmss_commons.c b/xmss_commons.c
index a25fc673c..18f648d64 100644
--- a/xmss_commons.c
+++ b/xmss_commons.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 xmss_commons.c 20160722
 Andreas Hülsing
@@ -7,6 +6,7 @@ Public domain.
 */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include "xmss_commons.h"
 #include <stdlib.h>
diff --git a/xmss_fast.c b/xmss_fast.c
index 5e3a54314..577a9c3e3 100644
--- a/xmss_fast.c
+++ b/xmss_fast.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 xmss_fast.c version 20160722
 Andreas Hülsing
@@ -7,6 +6,7 @@ Public domain.
 */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include "xmss_fast.h"
 #include <stdlib.h>
diff --git a/xmss_hash.c b/xmss_hash.c
index c8b271167..f90e0560c 100644
--- a/xmss_hash.c
+++ b/xmss_hash.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 hash.c version 20160722
 Andreas Hülsing
@@ -7,6 +6,7 @@ Public domain.
 */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include "xmss_hash_address.h"
 #include "xmss_commons.h"
diff --git a/xmss_hash_address.c b/xmss_hash_address.c
index b970619e5..21ae1033d 100644
--- a/xmss_hash_address.c
+++ b/xmss_hash_address.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 hash_address.c version 20160722
 Andreas Hülsing
@@ -6,6 +5,7 @@ Joost Rijneveld
 Public domain.
 */
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
diff --git a/xmss_wots.c b/xmss_wots.c
index 8e0c07be7..7767a6561 100644
--- a/xmss_wots.c
+++ b/xmss_wots.c
@@ -1,4 +1,3 @@
-#ifdef WITH_XMSS
 /*
 wots.c version 20160722
 Andreas Hülsing
@@ -7,6 +6,7 @@ Public domain.
 */
 
 #include "includes.h"
+#ifdef WITH_XMSS
 
 #include <stdlib.h>
 #ifdef HAVE_STDINT_H