diff --git a/lib/hx509/ChangeLog b/lib/hx509/ChangeLog
index 1bae71497..fd0d3b38f 100644
--- a/lib/hx509/ChangeLog
+++ b/lib/hx509/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-13  Love Hörnquist Åstrand  <lha@it.su.se>
 
+	* delete crypto_headers.h, use global file instead.
+
 	* crypto.c (PBE_string2key): libdes now supports PKCS12_key_gen
 	
 2006-01-12  Love Hörnquist Åstrand  <lha@it.su.se>
diff --git a/lib/hx509/cert.c b/lib/hx509/cert.c
index 88b6bcdaf..6cde16701 100644
--- a/lib/hx509/cert.c
+++ b/lib/hx509/cert.c
@@ -33,7 +33,7 @@
 
 #include "hx_locl.h"
 RCSID("$Id$");
-#include "crypto_headers.h"
+#include "crypto-headers.h"
 
 
 struct hx509_verify_ctx_data {
diff --git a/lib/hx509/collector.c b/lib/hx509/collector.c
index 6e07331cd..c0d1104f3 100644
--- a/lib/hx509/collector.c
+++ b/lib/hx509/collector.c
@@ -33,7 +33,6 @@
 
 #include "hx_locl.h"
 RCSID("$Id$");
-#include "crypto_headers.h"
 
 struct private_key {
     AlgorithmIdentifier alg;
diff --git a/lib/hx509/crypto.c b/lib/hx509/crypto.c
index a624450e7..11ce16a8c 100644
--- a/lib/hx509/crypto.c
+++ b/lib/hx509/crypto.c
@@ -34,9 +34,6 @@
 #include "hx_locl.h"
 RCSID("$Id$");
 
-#include "crypto_headers.h"
-
-
 #define pkcs1(name, number) \
 static unsigned name##_oid_data[] = { 1, 2, 840, 113549, 1, 1, number }; \
 static heim_oid name##_oid = { 7, name##_oid_data }
diff --git a/lib/hx509/crypto_headers.h b/lib/hx509/crypto_headers.h
deleted file mode 100644
index d902472f7..000000000
--- a/lib/hx509/crypto_headers.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * $Id$
- */
-
-#ifdef HAVE_OPENSSL
-
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/err.h>
-#include <openssl/sha.h>
-#include <openssl/md5.h>
-#include <openssl/md2.h>
-#include <openssl/pem.h>
-#include <openssl/evp.h>
-#include <openssl/rand.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-#include <openssl/ui.h>
-#include <openssl/pkcs12.h>
-#include <openssl/engine.h>
-
-#ifndef BN_is_negative
-#define BN_set_negative(bn, flag) ((bn)->neg = (flag) ? 1 : 0)
-#define BN_is_negative(bn) ((bn)->neg != 0)
-#endif
-
-#else
-
-#include <rsa.h>
-#include <dsa.h>
-#include <sha.h>
-#include <md5.h>
-#include <md2.h>
-#include <evp.h>
-#include <rand.h>
-#include <ui.h>
-#include <engine.h>
-
-#endif
diff --git a/lib/hx509/hx_locl.h b/lib/hx509/hx_locl.h
index cd5d4c1c4..a188335cb 100644
--- a/lib/hx509/hx_locl.h
+++ b/lib/hx509/hx_locl.h
@@ -58,6 +58,8 @@
 
 #include <der.h>
 
+#include "crypto-headers.h"
+
 struct hx509_query_data;
 typedef struct hx509_query_data hx509_query;
 
diff --git a/lib/hx509/ks_p11.c b/lib/hx509/ks_p11.c
index ee82580ee..3bbd86aa2 100644
--- a/lib/hx509/ks_p11.c
+++ b/lib/hx509/ks_p11.c
@@ -35,8 +35,6 @@
 RCSID("$Id$");
 #include <dlfcn.h>
 
-#include "crypto_headers.h"
-
 #include "pkcs11u.h"
 #include "pkcs11.h"
 
diff --git a/lib/hx509/ks_p12.c b/lib/hx509/ks_p12.c
index 3a83606ae..3b0792306 100644
--- a/lib/hx509/ks_p12.c
+++ b/lib/hx509/ks_p12.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 - 2005 Kungliga Tekniska Högskolan
+ * Copyright (c) 2004 - 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
diff --git a/lib/hx509/lock.c b/lib/hx509/lock.c
index 2a271ca5a..ee291bf18 100644
--- a/lib/hx509/lock.c
+++ b/lib/hx509/lock.c
@@ -33,7 +33,6 @@
 
 #include "hx_locl.h"
 RCSID("$Id$");
-#include "crypto_headers.h"
 
 struct hx509_lock_data {
     struct _hx509_password password;