diff --git a/yubico-piv-tool.c b/yubico-piv-tool.c
index 7334aa7..86a67c7 100644
--- a/yubico-piv-tool.c
+++ b/yubico-piv-tool.c
@@ -32,11 +32,6 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <openssl/des.h>
-#include <openssl/pem.h>
-#include <openssl/pkcs12.h>
-#include <openssl/rand.h>
-
 #if BACKEND_PCSC
 #if defined HAVE_PCSC_WINSCARD_H
 # include <PCSC/wintypes.h>
@@ -46,6 +41,11 @@
 #endif
 #endif
 
+#include <openssl/des.h>
+#include <openssl/pem.h>
+#include <openssl/pkcs12.h>
+#include <openssl/rand.h>
+
 #include "cmdline.h"
 
 unsigned const char aid[] = {
@@ -89,7 +89,7 @@ typedef union u_APDU APDU;
 static void dump_hex(unsigned const char*, unsigned int);
 static int send_data(SCARDHANDLE*, APDU*, unsigned char*, unsigned long*, int);
 static int set_length(unsigned char*, int);
-static int get_length(unsigned char*, int *);
+static int get_length(unsigned char*, int*);
 static X509_NAME *parse_name(char*);
 static unsigned char get_algorithm(EVP_PKEY*);