Add XKMS guards to source files so they can be included in MSVC project config.

git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-cpp/trunk@1820685 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/xsec/utils/XSECSOAPRequestor.hpp b/xsec/utils/XSECSOAPRequestor.hpp
index 87905b8..587efa6 100644
--- a/xsec/utils/XSECSOAPRequestor.hpp
+++ b/xsec/utils/XSECSOAPRequestor.hpp
@@ -100,5 +100,4 @@
 };
 
 #endif /* XSEC_XKMS_ENABLED */
-
 #endif /* XSECSOAPREQUESTOR_INCLUDE */
diff --git a/xsec/utils/XSECSOAPRequestorSimple.cpp b/xsec/utils/XSECSOAPRequestorSimple.cpp
index 8aa9dc6..621bcb6 100644
--- a/xsec/utils/XSECSOAPRequestorSimple.cpp
+++ b/xsec/utils/XSECSOAPRequestorSimple.cpp
@@ -34,6 +34,8 @@
 #include <xsec/utils/XSECSOAPRequestorSimple.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "../utils/XSECAutoPtr.hpp"
 
 #include <stdio.h>
@@ -312,3 +314,5 @@
 	m_envelopeType = et;
 
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/utils/XSECSOAPRequestorSimple.hpp b/xsec/utils/XSECSOAPRequestorSimple.hpp
index fa6bc3e..62e4364 100644
--- a/xsec/utils/XSECSOAPRequestorSimple.hpp
+++ b/xsec/utils/XSECSOAPRequestorSimple.hpp
@@ -143,5 +143,4 @@
 };
 
 #endif /* XSEC_XKMS_ENABLED */
-
 #endif /* XSECSOAPREQUESTORSIMPLE_INCLUDE */
diff --git a/xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp b/xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp
index a38fbe5..5d94f2d 100644
--- a/xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp
+++ b/xsec/utils/unixutils/XSECSOAPRequestorSimpleUnix.cpp
@@ -47,6 +47,8 @@
 #include <xsec/utils/XSECSafeBuffer.hpp>
 #include <xsec/framework/XSECError.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "../../utils/XSECAutoPtr.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -350,3 +352,5 @@
 
     return parseAndUnwrap(responseBuffer.rawCharBuffer(), lent);
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp b/xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp
index ef878c0..0eb5ea5 100644
--- a/xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp
+++ b/xsec/utils/winutils/XSECSOAPRequestorSimpleWin32.cpp
@@ -35,6 +35,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "../../utils/XSECAutoPtr.hpp"
 
 #define _WINSOCKAPI_
@@ -393,3 +395,5 @@
 
     return parseAndUnwrap(responseBuffer.rawCharBuffer(), lent);
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSAuthenticationImpl.cpp b/xsec/xkms/impl/XKMSAuthenticationImpl.cpp
index ff71c9c..b77e9a0 100644
--- a/xsec/xkms/impl/XKMSAuthenticationImpl.cpp
+++ b/xsec/xkms/impl/XKMSAuthenticationImpl.cpp
@@ -33,6 +33,8 @@
 
 #include <xsec/dsig/DSIGReference.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSAuthenticationImpl.hpp"
 #include "XKMSNotBoundAuthenticationImpl.hpp"
 
@@ -245,3 +247,4 @@
 
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSAuthenticationImpl.hpp b/xsec/xkms/impl/XKMSAuthenticationImpl.hpp
index e752598..0dd355b 100644
--- a/xsec/xkms/impl/XKMSAuthenticationImpl.hpp
+++ b/xsec/xkms/impl/XKMSAuthenticationImpl.hpp
@@ -35,6 +35,8 @@
 #include <xsec/framework/XSECProvider.hpp>
 #include <xsec/xkms/XKMSAuthentication.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 class XKMSKeyBindingAuthenticationImpl;
 class XKMSNotBoundAuthenticationImpl;
 class XSECEnv;
@@ -105,4 +107,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSAUTHENTICATIONIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSCompoundRequestImpl.cpp b/xsec/xkms/impl/XKMSCompoundRequestImpl.cpp
index 127a705..150b75a 100644
--- a/xsec/xkms/impl/XKMSCompoundRequestImpl.cpp
+++ b/xsec/xkms/impl/XKMSCompoundRequestImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSCompoundRequestImpl.hpp"
 #include "XKMSLocateRequestImpl.hpp"
 #include "XKMSValidateRequestImpl.hpp"
@@ -249,3 +251,4 @@
 	return r;
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSCompoundRequestImpl.hpp b/xsec/xkms/impl/XKMSCompoundRequestImpl.hpp
index 392ed8f..9f078df 100644
--- a/xsec/xkms/impl/XKMSCompoundRequestImpl.hpp
+++ b/xsec/xkms/impl/XKMSCompoundRequestImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSCompoundRequest.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRequestAbstractTypeImpl.hpp"
 #include "XKMSMessageFactoryImpl.hpp"
 
@@ -123,4 +125,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSCOMPOUNDREQUESTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSCompoundResultImpl.cpp b/xsec/xkms/impl/XKMSCompoundResultImpl.cpp
index 73a5749..c74cdec 100644
--- a/xsec/xkms/impl/XKMSCompoundResultImpl.cpp
+++ b/xsec/xkms/impl/XKMSCompoundResultImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSCompoundResultImpl.hpp"
 #include "XKMSLocateResultImpl.hpp"
 #include "XKMSStatusResultImpl.hpp"
@@ -303,3 +305,4 @@
 
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSCompoundResultImpl.hpp b/xsec/xkms/impl/XKMSCompoundResultImpl.hpp
index eb258a1..26025db 100644
--- a/xsec/xkms/impl/XKMSCompoundResultImpl.hpp
+++ b/xsec/xkms/impl/XKMSCompoundResultImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSCompoundResult.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResultTypeImpl.hpp"
 #include "XKMSMessageFactoryImpl.hpp"
 
@@ -144,4 +146,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSCOMPOUNDRESULTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp b/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp
index 3c995c9..3f6a80e 100644
--- a/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp
+++ b/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.cpp
@@ -42,6 +42,8 @@
 
 XERCES_CPP_NAMESPACE_USE
 
+#ifdef XSEC_XKMS_ENABLED
+
 // --------------------------------------------------------------------------------
 //           Constructor/Destructor
 // --------------------------------------------------------------------------------
@@ -514,3 +516,5 @@
 	return u;
 
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.hpp b/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.hpp
index c281abd..c889bac 100644
--- a/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.hpp
+++ b/xsec/xkms/impl/XKMSKeyBindingAbstractTypeImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSKeyBindingAbstractType.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include <vector>
 
 XSEC_DECLARE_XERCES_CLASS(DOMNode);
@@ -201,5 +203,5 @@
 		{return XKMSKeyBindingAbstractTypeImpl::appendUseKeyWithItem(application, identifier);}
 
 
-
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSKEYBINDINGABSTRACTTYPEIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSKeyBindingImpl.cpp b/xsec/xkms/impl/XKMSKeyBindingImpl.cpp
index a53c3c8..775c22d 100644
--- a/xsec/xkms/impl/XKMSKeyBindingImpl.cpp
+++ b/xsec/xkms/impl/XKMSKeyBindingImpl.cpp
@@ -35,6 +35,8 @@
 
 #include <xercesc/dom/DOM.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSKeyBindingImpl.hpp"
 #include "XKMSStatusImpl.hpp"
 
@@ -125,3 +127,4 @@
 
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSKeyBindingImpl.hpp b/xsec/xkms/impl/XKMSKeyBindingImpl.hpp
index 7fa7779..ea972f6 100644
--- a/xsec/xkms/impl/XKMSKeyBindingImpl.hpp
+++ b/xsec/xkms/impl/XKMSKeyBindingImpl.hpp
@@ -35,6 +35,8 @@
 #include <xsec/xkms/XKMSKeyBinding.hpp>
 #include <xsec/xkms/XKMSStatus.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSKeyBindingAbstractTypeImpl.hpp"
 
 class XKMSStatusImpl;
@@ -78,4 +80,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSKEYBINDINGIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSLocateRequestImpl.cpp b/xsec/xkms/impl/XKMSLocateRequestImpl.cpp
index 1b29775..e184026 100644
--- a/xsec/xkms/impl/XKMSLocateRequestImpl.cpp
+++ b/xsec/xkms/impl/XKMSLocateRequestImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSLocateRequestImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -165,3 +167,5 @@
 	return mp_queryKeyBinding;
 
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSLocateRequestImpl.hpp b/xsec/xkms/impl/XKMSLocateRequestImpl.hpp
index 08232e9..64c3ffc 100644
--- a/xsec/xkms/impl/XKMSLocateRequestImpl.hpp
+++ b/xsec/xkms/impl/XKMSLocateRequestImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSLocateRequest.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRequestAbstractTypeImpl.hpp"
 #include "XKMSQueryKeyBindingImpl.hpp"
 
@@ -95,4 +97,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSLOCATEREQUESTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSLocateResultImpl.cpp b/xsec/xkms/impl/XKMSLocateResultImpl.cpp
index 7013b91..c5e8509 100644
--- a/xsec/xkms/impl/XKMSLocateResultImpl.cpp
+++ b/xsec/xkms/impl/XKMSLocateResultImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSLocateResultImpl.hpp"
 #include "XKMSUnverifiedKeyBindingImpl.hpp"
 
@@ -182,3 +184,5 @@
 	return u;
 
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSLocateResultImpl.hpp b/xsec/xkms/impl/XKMSLocateResultImpl.hpp
index 40eda92..917286d 100644
--- a/xsec/xkms/impl/XKMSLocateResultImpl.hpp
+++ b/xsec/xkms/impl/XKMSLocateResultImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSLocateResult.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResultTypeImpl.hpp"
 
 #include <vector>
@@ -101,4 +103,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSLOCATERESULTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.cpp b/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.cpp
index 3088e3b..71d723c 100644
--- a/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.cpp
+++ b/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.cpp
@@ -38,6 +38,8 @@
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xercesc/util/Janitor.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSMessageAbstractTypeImpl.hpp"
 
 XERCES_CPP_NAMESPACE_USE
@@ -446,3 +448,5 @@
 	m_opaqueClientDataSize++;
 
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.hpp b/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.hpp
index a145be6..afab38c 100644
--- a/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.hpp
+++ b/xsec/xkms/impl/XKMSMessageAbstractTypeImpl.hpp
@@ -35,6 +35,8 @@
 #include <xsec/xkms/XKMSMessageAbstractType.hpp>
 #include <xsec/framework/XSECProvider.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 class XSECEnv;
 class DSIGSignature;
 
@@ -162,4 +164,5 @@
 	virtual void appendOpaqueClientDataItem(const XMLCh * item) \
 		{m_msg.appendOpaqueClientDataItem(item);}
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSMESSAGEABSTRACTTYPEIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSMessageFactoryImpl.cpp b/xsec/xkms/impl/XKMSMessageFactoryImpl.cpp
index af07de3..5fa1cb7 100644
--- a/xsec/xkms/impl/XKMSMessageFactoryImpl.cpp
+++ b/xsec/xkms/impl/XKMSMessageFactoryImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/util/Janitor.hpp>
 
@@ -1228,3 +1230,5 @@
 	}
 	return NULL;
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSMessageFactoryImpl.hpp b/xsec/xkms/impl/XKMSMessageFactoryImpl.hpp
index 845a665..33d6c3b 100644
--- a/xsec/xkms/impl/XKMSMessageFactoryImpl.hpp
+++ b/xsec/xkms/impl/XKMSMessageFactoryImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSMessageFactory.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 class XSECProvider;
 class XKMSCompoundRequest;
 class XKMSCompoundResult;
@@ -280,4 +282,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSMESSAGEFACTORYIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSNotBoundAuthentication.cpp b/xsec/xkms/impl/XKMSNotBoundAuthentication.cpp
index a083083..3f754ab 100644
--- a/xsec/xkms/impl/XKMSNotBoundAuthentication.cpp
+++ b/xsec/xkms/impl/XKMSNotBoundAuthentication.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSNotBoundAuthenticationImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -179,3 +181,4 @@
 		mp_notBoundAuthenticationElement->getAttributeNodeNS(NULL, XKMSConstants::s_tagValue);
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSNotBoundAuthenticationImpl.hpp b/xsec/xkms/impl/XKMSNotBoundAuthenticationImpl.hpp
index 73b8381..8b1e3da 100644
--- a/xsec/xkms/impl/XKMSNotBoundAuthenticationImpl.hpp
+++ b/xsec/xkms/impl/XKMSNotBoundAuthenticationImpl.hpp
@@ -33,6 +33,8 @@
 
 #include <xsec/xkms/XKMSNotBoundAuthentication.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 class XKMSNotBoundAuthenticationImpl : public XKMSNotBoundAuthentication {
 
 public:
@@ -88,4 +90,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSNOTBOUNDAUTHENTICATIONIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSPendingRequestImpl.cpp b/xsec/xkms/impl/XKMSPendingRequestImpl.cpp
index 04c9c90..5c8d42d 100644
--- a/xsec/xkms/impl/XKMSPendingRequestImpl.cpp
+++ b/xsec/xkms/impl/XKMSPendingRequestImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSPendingRequestImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -158,4 +160,4 @@
 
 }
 
-
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSPendingRequestImpl.hpp b/xsec/xkms/impl/XKMSPendingRequestImpl.hpp
index e0ca6ed..cd9ecce 100644
--- a/xsec/xkms/impl/XKMSPendingRequestImpl.hpp
+++ b/xsec/xkms/impl/XKMSPendingRequestImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSPendingRequest.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRequestAbstractTypeImpl.hpp"
 
 class XKMSPendingRequestImpl : public XKMSPendingRequest {
@@ -90,4 +92,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSPENDINGREQUESTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.cpp b/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.cpp
index 831da27..2ee973a 100644
--- a/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.cpp
+++ b/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSPrototypeKeyBindingImpl.hpp"
 #include "XKMSValidityIntervalImpl.hpp"
 
@@ -188,4 +190,4 @@
 
 }
 
-
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.hpp b/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.hpp
index f16ad8f..b5981d0 100644
--- a/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.hpp
+++ b/xsec/xkms/impl/XKMSPrototypeKeyBindingImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSPrototypeKeyBinding.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSKeyBindingAbstractTypeImpl.hpp"
 
 class XKMSValidityIntervalImpl;
@@ -89,4 +91,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSPROTOTYPEKEYBINDINGIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSQueryKeyBindingImpl.cpp b/xsec/xkms/impl/XKMSQueryKeyBindingImpl.cpp
index 062dee0..9fc2232 100644
--- a/xsec/xkms/impl/XKMSQueryKeyBindingImpl.cpp
+++ b/xsec/xkms/impl/XKMSQueryKeyBindingImpl.cpp
@@ -34,6 +34,8 @@
 
 #include <xercesc/dom/DOM.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSQueryKeyBindingImpl.hpp"
 
 XERCES_CPP_NAMESPACE_USE
@@ -85,3 +87,4 @@
 
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSQueryKeyBindingImpl.hpp b/xsec/xkms/impl/XKMSQueryKeyBindingImpl.hpp
index f6898c1..eb9d0d6 100644
--- a/xsec/xkms/impl/XKMSQueryKeyBindingImpl.hpp
+++ b/xsec/xkms/impl/XKMSQueryKeyBindingImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSQueryKeyBinding.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSKeyBindingAbstractTypeImpl.hpp"
 
 class XKMSQueryKeyBindingImpl : public XKMSQueryKeyBinding, public XKMSKeyBindingAbstractTypeImpl {
@@ -70,4 +72,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSQUERYKEYBINDING_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSRSAKeyPairImpl.cpp b/xsec/xkms/impl/XKMSRSAKeyPairImpl.cpp
index 3f97b22..6cc6489 100644
--- a/xsec/xkms/impl/XKMSRSAKeyPairImpl.cpp
+++ b/xsec/xkms/impl/XKMSRSAKeyPairImpl.cpp
@@ -34,6 +34,7 @@
 #include <xsec/framework/XSECEnv.hpp>

 #include <xsec/xkms/XKMSConstants.hpp>

 

+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSRSAKeyPairImpl.hpp"

 

@@ -179,3 +180,4 @@
 XKMS_RET_RSA_VAL(D)

 

 

+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRSAKeyPairImpl.hpp b/xsec/xkms/impl/XKMSRSAKeyPairImpl.hpp
index 48dca22..a2fc350 100644
--- a/xsec/xkms/impl/XKMSRSAKeyPairImpl.hpp
+++ b/xsec/xkms/impl/XKMSRSAKeyPairImpl.hpp
@@ -33,6 +33,8 @@
 

 #include <xsec/framework/XSECDefs.hpp>

 #include <xsec/xkms/XKMSRSAKeyPair.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 class XSECEnv;

 

@@ -101,4 +103,5 @@
 

 };

 

+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSRSAKEYPAIRIMPL_INCLUDE */

diff --git a/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.cpp b/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.cpp
index 110a4ff..559b1a0 100644
--- a/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.cpp
+++ b/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.cpp
@@ -34,6 +34,8 @@
 #include <xsec/xkms/XKMSConstants.hpp>

 

 #include <xercesc/dom/DOM.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSRecoverKeyBindingImpl.hpp"

 #include "XKMSStatusImpl.hpp"

@@ -128,3 +130,4 @@
 

 }

 

+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.hpp b/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.hpp
index e53d4c8..7cf2678 100644
--- a/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.hpp
+++ b/xsec/xkms/impl/XKMSRecoverKeyBindingImpl.hpp
@@ -33,7 +33,9 @@
 

 #include <xsec/framework/XSECDefs.hpp>

 #include <xsec/xkms/XKMSRecoverKeyBinding.hpp>

-#include <xsec/xkms/XKMSStatus.hpp>

+#include <xsec/xkms/XKMSStatus.hpp>
+
+#ifdef XSEC_XKMS_ENABLED

 

 #include "XKMSKeyBindingAbstractTypeImpl.hpp"

 

@@ -78,4 +80,5 @@
 

 };

 

+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSRECOVERKEYBINDINGIMPL_INCLUDE */

diff --git a/xsec/xkms/impl/XKMSRecoverRequestImpl.cpp b/xsec/xkms/impl/XKMSRecoverRequestImpl.cpp
index da46743..3b31fba 100644
--- a/xsec/xkms/impl/XKMSRecoverRequestImpl.cpp
+++ b/xsec/xkms/impl/XKMSRecoverRequestImpl.cpp
@@ -36,6 +36,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>

 #include <xsec/xkms/XKMSConstants.hpp>

 #include <xsec/xkms/XKMSStatus.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSRecoverRequestImpl.hpp"

 #include "XKMSRecoverKeyBindingImpl.hpp"

@@ -44,7 +46,7 @@
 #include <xercesc/dom/DOM.hpp>

 #include <xercesc/util/XMLUniDefs.hpp>

 

-XERCES_CPP_NAMESPACE_USE

+XERCES_CPP_NAMESPACE_USE
 

 // --------------------------------------------------------------------------------

 //           Construct/Destruct

@@ -255,4 +257,4 @@
 

 }

 

-

+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRecoverRequestImpl.hpp b/xsec/xkms/impl/XKMSRecoverRequestImpl.hpp
index 423e86b..424db5a 100644
--- a/xsec/xkms/impl/XKMSRecoverRequestImpl.hpp
+++ b/xsec/xkms/impl/XKMSRecoverRequestImpl.hpp
@@ -32,7 +32,10 @@
 // XSEC Includes

 

 #include <xsec/framework/XSECDefs.hpp>

-#include <xsec/xkms/XKMSRecoverRequest.hpp>

+#include <xsec/xkms/XKMSRecoverRequest.hpp>
+
+#ifdef XSEC_XKMS_ENABLED
+

 #include "XKMSRequestAbstractTypeImpl.hpp"

 

 class XKMSAuthenticationImpl;

@@ -100,5 +103,5 @@
 

 };

 

+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSRECOVERREQUESTIMPL_INCLUDE */

-

diff --git a/xsec/xkms/impl/XKMSRecoverResultImpl.cpp b/xsec/xkms/impl/XKMSRecoverResultImpl.cpp
index 2329eda..fe80185 100644
--- a/xsec/xkms/impl/XKMSRecoverResultImpl.cpp
+++ b/xsec/xkms/impl/XKMSRecoverResultImpl.cpp
@@ -39,6 +39,8 @@
 #include <xsec/xenc/XENCEncryptionMethod.hpp>

 #include <xsec/xenc/XENCCipher.hpp>

 

+#ifdef XSEC_XKMS_ENABLED

+

 #include "XKMSRecoverResultImpl.hpp"

 #include "XKMSKeyBindingImpl.hpp"

 #include "XKMSRSAKeyPairImpl.hpp"

@@ -375,3 +377,4 @@
 

 }	

 

+#endif /* XSEC_XKMS_ENABLED */

diff --git a/xsec/xkms/impl/XKMSRecoverResultImpl.hpp b/xsec/xkms/impl/XKMSRecoverResultImpl.hpp
index 17fc75e..dc0a8d7 100644
--- a/xsec/xkms/impl/XKMSRecoverResultImpl.hpp
+++ b/xsec/xkms/impl/XKMSRecoverResultImpl.hpp
@@ -35,6 +35,8 @@
 #include <xsec/xkms/XKMSRecoverResult.hpp>
 #include <xsec/framework/XSECProvider.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResultTypeImpl.hpp"
 
 #include <vector>
@@ -123,4 +125,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSRECOVERRESULTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSRegisterRequestImpl.cpp b/xsec/xkms/impl/XKMSRegisterRequestImpl.cpp
index 952c182..c820331 100644
--- a/xsec/xkms/impl/XKMSRegisterRequestImpl.cpp
+++ b/xsec/xkms/impl/XKMSRegisterRequestImpl.cpp
@@ -36,6 +36,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRegisterRequestImpl.hpp"
 #include "XKMSAuthenticationImpl.hpp"
 #include "XKMSPrototypeKeyBindingImpl.hpp"
@@ -344,5 +346,4 @@
 	return ret;
 }
 
-
-
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRegisterRequestImpl.hpp b/xsec/xkms/impl/XKMSRegisterRequestImpl.hpp
index 2015f6a..42ad718 100644
--- a/xsec/xkms/impl/XKMSRegisterRequestImpl.hpp
+++ b/xsec/xkms/impl/XKMSRegisterRequestImpl.hpp
@@ -33,6 +33,9 @@
 
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSRegisterRequest.hpp>
+
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRequestAbstractTypeImpl.hpp"
 
 class XKMSAuthenticationImpl;
@@ -106,4 +109,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSREGISTERREQUESTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSRegisterResultImpl.cpp b/xsec/xkms/impl/XKMSRegisterResultImpl.cpp
index 3d3b309..dd78694 100644
--- a/xsec/xkms/impl/XKMSRegisterResultImpl.cpp
+++ b/xsec/xkms/impl/XKMSRegisterResultImpl.cpp
@@ -39,6 +39,8 @@
 #include <xsec/xenc/XENCEncryptionMethod.hpp>
 #include <xsec/xenc/XENCCipher.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRegisterResultImpl.hpp"
 #include "XKMSKeyBindingImpl.hpp"
 #include "XKMSRSAKeyPairImpl.hpp"
@@ -377,3 +379,4 @@
 
 }	
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRegisterResultImpl.hpp b/xsec/xkms/impl/XKMSRegisterResultImpl.hpp
index fa590d8..0f7af88 100644
--- a/xsec/xkms/impl/XKMSRegisterResultImpl.hpp
+++ b/xsec/xkms/impl/XKMSRegisterResultImpl.hpp
@@ -35,6 +35,8 @@
 #include <xsec/xkms/XKMSRegisterResult.hpp>
 #include <xsec/framework/XSECProvider.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResultTypeImpl.hpp"
 
 #include <vector>
@@ -123,4 +125,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSREGISTERRESULTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSReissueKeyBindingImpl.cpp b/xsec/xkms/impl/XKMSReissueKeyBindingImpl.cpp
index 8874cb2..92deebb 100644
--- a/xsec/xkms/impl/XKMSReissueKeyBindingImpl.cpp
+++ b/xsec/xkms/impl/XKMSReissueKeyBindingImpl.cpp
@@ -34,6 +34,8 @@
 #include <xsec/xkms/XKMSConstants.hpp>

 

 #include <xercesc/dom/DOM.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSReissueKeyBindingImpl.hpp"

 #include "XKMSStatusImpl.hpp"

@@ -128,3 +130,4 @@
 

 }

 

+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSReissueKeyBindingImpl.hpp b/xsec/xkms/impl/XKMSReissueKeyBindingImpl.hpp
index c5b0fc7..a260130 100644
--- a/xsec/xkms/impl/XKMSReissueKeyBindingImpl.hpp
+++ b/xsec/xkms/impl/XKMSReissueKeyBindingImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>

 #include <xsec/xkms/XKMSReissueKeyBinding.hpp>

 #include <xsec/xkms/XKMSStatus.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSKeyBindingAbstractTypeImpl.hpp"

 

@@ -78,4 +80,5 @@
 

 };

 

+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSREISSUEKEYBINDINGIMPL_INCLUDE */

diff --git a/xsec/xkms/impl/XKMSReissueRequestImpl.cpp b/xsec/xkms/impl/XKMSReissueRequestImpl.cpp
index 36214ad..cae72c1 100644
--- a/xsec/xkms/impl/XKMSReissueRequestImpl.cpp
+++ b/xsec/xkms/impl/XKMSReissueRequestImpl.cpp
@@ -36,6 +36,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSReissueRequestImpl.hpp"
 #include "XKMSAuthenticationImpl.hpp"
 #include "XKMSReissueKeyBindingImpl.hpp"
@@ -344,5 +346,4 @@
 	return ret;
 }
 
-
-
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSReissueRequestImpl.hpp b/xsec/xkms/impl/XKMSReissueRequestImpl.hpp
index 7f63d54..98a0d3c 100644
--- a/xsec/xkms/impl/XKMSReissueRequestImpl.hpp
+++ b/xsec/xkms/impl/XKMSReissueRequestImpl.hpp
@@ -33,6 +33,9 @@
 
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSReissueRequest.hpp>
+
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRequestAbstractTypeImpl.hpp"
 
 class XKMSAuthenticationImpl;
@@ -106,4 +109,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSREISSUEREQUESTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSReissueResultImpl.cpp b/xsec/xkms/impl/XKMSReissueResultImpl.cpp
index 3e9a725..56150e0 100644
--- a/xsec/xkms/impl/XKMSReissueResultImpl.cpp
+++ b/xsec/xkms/impl/XKMSReissueResultImpl.cpp
@@ -31,6 +31,8 @@
 #include <xsec/framework/XSECEnv.hpp>

 #include <xsec/utils/XSECDOMUtils.hpp>

 #include <xsec/xkms/XKMSConstants.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSReissueResultImpl.hpp"

 #include "XKMSKeyBindingImpl.hpp"

@@ -183,3 +185,4 @@
 

 }

 

+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSReissueResultImpl.hpp b/xsec/xkms/impl/XKMSReissueResultImpl.hpp
index cc5b786..04ad20e 100644
--- a/xsec/xkms/impl/XKMSReissueResultImpl.hpp
+++ b/xsec/xkms/impl/XKMSReissueResultImpl.hpp
@@ -33,6 +33,8 @@
 

 #include <xsec/framework/XSECDefs.hpp>

 #include <xsec/xkms/XKMSReissueResult.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSResultTypeImpl.hpp"

 

@@ -101,4 +103,5 @@
 

 };

 

+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSREISSUERESULTIMPL_INCLUDE */

diff --git a/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.cpp b/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.cpp
index ca89819..1bacec9 100644
--- a/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.cpp
+++ b/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.cpp
@@ -36,6 +36,8 @@
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMNodeList.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRequestAbstractTypeImpl.hpp"
 #include "XKMSRespondWithImpl.hpp"
 #include "XKMSResponseMechanismImpl.hpp"
@@ -390,4 +392,4 @@
 
 }
 
-
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.hpp b/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.hpp
index 685c3f1..d158644 100644
--- a/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.hpp
+++ b/xsec/xkms/impl/XKMSRequestAbstractTypeImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSRequestAbstractType.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSMessageAbstractTypeImpl.hpp"
 
 #include <vector>
@@ -184,4 +186,5 @@
 	virtual void setResponseLimit(unsigned int limit) \
 		{m_request.setResponseLimit(limit);}
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSREQUESTABSTRACTTYPEIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSRespondWithImpl.cpp b/xsec/xkms/impl/XKMSRespondWithImpl.cpp
index c674d73..8019bc8 100644
--- a/xsec/xkms/impl/XKMSRespondWithImpl.cpp
+++ b/xsec/xkms/impl/XKMSRespondWithImpl.cpp
@@ -36,6 +36,8 @@
 
 #include <xercesc/util/XMLUniDefs.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRespondWithImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -158,3 +160,4 @@
 
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRespondWithImpl.hpp b/xsec/xkms/impl/XKMSRespondWithImpl.hpp
index a437a8f..cc55ffa 100644
--- a/xsec/xkms/impl/XKMSRespondWithImpl.hpp
+++ b/xsec/xkms/impl/XKMSRespondWithImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSRespondWith.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 class XSECEnv;
 
 class XKMSRespondWithImpl : public XKMSRespondWith {
@@ -84,4 +86,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSRESPONDWITHIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSResponseMechanismImpl.cpp b/xsec/xkms/impl/XKMSResponseMechanismImpl.cpp
index 958e842..0eba00a 100644
--- a/xsec/xkms/impl/XKMSResponseMechanismImpl.cpp
+++ b/xsec/xkms/impl/XKMSResponseMechanismImpl.cpp
@@ -36,6 +36,8 @@
 
 #include <xercesc/util/XMLUniDefs.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResponseMechanismImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -156,3 +158,4 @@
 
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSResponseMechanismImpl.hpp b/xsec/xkms/impl/XKMSResponseMechanismImpl.hpp
index f55cb17..28adce8 100644
--- a/xsec/xkms/impl/XKMSResponseMechanismImpl.hpp
+++ b/xsec/xkms/impl/XKMSResponseMechanismImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSResponseMechanism.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 class XSECEnv;
 
 class XKMSResponseMechanismImpl : public XKMSResponseMechanism {
@@ -84,4 +86,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSRESPONSEMECHANISMIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSResultImpl.cpp b/xsec/xkms/impl/XKMSResultImpl.cpp
index affb77a..f334696 100644
--- a/xsec/xkms/impl/XKMSResultImpl.cpp
+++ b/xsec/xkms/impl/XKMSResultImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResultImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -115,3 +117,4 @@
 
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSResultImpl.hpp b/xsec/xkms/impl/XKMSResultImpl.hpp
index 535ba35..90d8127 100644
--- a/xsec/xkms/impl/XKMSResultImpl.hpp
+++ b/xsec/xkms/impl/XKMSResultImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSResult.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResultTypeImpl.hpp"
 
 class XKMSResultImpl : public XKMSResult {
@@ -82,4 +84,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSRESULTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSResultTypeImpl.cpp b/xsec/xkms/impl/XKMSResultTypeImpl.cpp
index 9679d2e..91f568c 100644
--- a/xsec/xkms/impl/XKMSResultTypeImpl.cpp
+++ b/xsec/xkms/impl/XKMSResultTypeImpl.cpp
@@ -31,6 +31,8 @@
 #include <xsec/framework/XSECEnv.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResultTypeImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -310,3 +312,4 @@
 
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSResultTypeImpl.hpp b/xsec/xkms/impl/XKMSResultTypeImpl.hpp
index 67e4939..8332f60 100644
--- a/xsec/xkms/impl/XKMSResultTypeImpl.hpp
+++ b/xsec/xkms/impl/XKMSResultTypeImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSResultType.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSMessageAbstractTypeImpl.hpp"
 
 XSEC_DECLARE_XERCES_CLASS(DOMElement);
@@ -123,5 +125,5 @@
 	{m_result.setRequestSignatureValue(value);}
 
 
-
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSRESULTTYPEIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.cpp b/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.cpp
index 3317fe1..5d37725 100644
--- a/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.cpp
+++ b/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.cpp
@@ -34,6 +34,8 @@
 #include <xsec/xkms/XKMSConstants.hpp>

 

 #include <xercesc/dom/DOM.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSRevokeKeyBindingImpl.hpp"

 #include "XKMSStatusImpl.hpp"

@@ -128,3 +130,4 @@
 

 }

 

+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.hpp b/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.hpp
index 2aad045..1996f3a 100644
--- a/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.hpp
+++ b/xsec/xkms/impl/XKMSRevokeKeyBindingImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>

 #include <xsec/xkms/XKMSRevokeKeyBinding.hpp>

 #include <xsec/xkms/XKMSStatus.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSKeyBindingAbstractTypeImpl.hpp"

 

@@ -78,4 +80,5 @@
 

 };

 

+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSREVOKEKEYBINDINGIMPL_INCLUDE */

diff --git a/xsec/xkms/impl/XKMSRevokeRequestImpl.cpp b/xsec/xkms/impl/XKMSRevokeRequestImpl.cpp
index 1b008f7..21bb795 100644
--- a/xsec/xkms/impl/XKMSRevokeRequestImpl.cpp
+++ b/xsec/xkms/impl/XKMSRevokeRequestImpl.cpp
@@ -36,6 +36,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>

 #include <xsec/xkms/XKMSConstants.hpp>

 #include <xsec/xkms/XKMSStatus.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSRevokeRequestImpl.hpp"

 #include "XKMSRevokeKeyBindingImpl.hpp"

@@ -296,4 +298,4 @@
 

 }

 

-

+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRevokeRequestImpl.hpp b/xsec/xkms/impl/XKMSRevokeRequestImpl.hpp
index 7985a26..c2193f9 100644
--- a/xsec/xkms/impl/XKMSRevokeRequestImpl.hpp
+++ b/xsec/xkms/impl/XKMSRevokeRequestImpl.hpp
@@ -33,6 +33,9 @@
 

 #include <xsec/framework/XSECDefs.hpp>

 #include <xsec/xkms/XKMSRevokeRequest.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRequestAbstractTypeImpl.hpp"

 

 class XKMSAuthenticationImpl;

@@ -105,5 +108,5 @@
 

 };

 

+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSREVOKEREQUESTIMPL_INCLUDE */

-

diff --git a/xsec/xkms/impl/XKMSRevokeResultImpl.cpp b/xsec/xkms/impl/XKMSRevokeResultImpl.cpp
index 46a21ca..d26bf7b 100644
--- a/xsec/xkms/impl/XKMSRevokeResultImpl.cpp
+++ b/xsec/xkms/impl/XKMSRevokeResultImpl.cpp
@@ -31,6 +31,8 @@
 #include <xsec/framework/XSECEnv.hpp>

 #include <xsec/utils/XSECDOMUtils.hpp>

 #include <xsec/xkms/XKMSConstants.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSRevokeResultImpl.hpp"

 #include "XKMSKeyBindingImpl.hpp"

@@ -183,3 +185,4 @@
 

 }

 

+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSRevokeResultImpl.hpp b/xsec/xkms/impl/XKMSRevokeResultImpl.hpp
index 55eae0f..40acebf 100644
--- a/xsec/xkms/impl/XKMSRevokeResultImpl.hpp
+++ b/xsec/xkms/impl/XKMSRevokeResultImpl.hpp
@@ -33,6 +33,8 @@
 

 #include <xsec/framework/XSECDefs.hpp>

 #include <xsec/xkms/XKMSRevokeResult.hpp>

+
+#ifdef XSEC_XKMS_ENABLED
 

 #include "XKMSResultTypeImpl.hpp"

 

@@ -101,4 +103,5 @@
 

 };

 

+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSREVOKERESULTIMPL_INCLUDE */

diff --git a/xsec/xkms/impl/XKMSStatusImpl.cpp b/xsec/xkms/impl/XKMSStatusImpl.cpp
index b8443a7..77b6b78 100644
--- a/xsec/xkms/impl/XKMSStatusImpl.cpp
+++ b/xsec/xkms/impl/XKMSStatusImpl.cpp
@@ -34,6 +34,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSStatusImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -354,3 +356,5 @@
 	m_statusReasons[status-1][reason-1] = e;
 
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSStatusImpl.hpp b/xsec/xkms/impl/XKMSStatusImpl.hpp
index 237d341..df5579f 100644
--- a/xsec/xkms/impl/XKMSStatusImpl.hpp
+++ b/xsec/xkms/impl/XKMSStatusImpl.hpp
@@ -34,6 +34,7 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSStatus.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
 
 
 class XKMSStatusImpl : public XKMSStatus {
@@ -86,4 +87,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSSTATUSIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSStatusRequestImpl.cpp b/xsec/xkms/impl/XKMSStatusRequestImpl.cpp
index 2a5a066..50bedd6 100644
--- a/xsec/xkms/impl/XKMSStatusRequestImpl.cpp
+++ b/xsec/xkms/impl/XKMSStatusRequestImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSStatusRequestImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -158,4 +160,4 @@
 
 }
 
-
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSStatusRequestImpl.hpp b/xsec/xkms/impl/XKMSStatusRequestImpl.hpp
index 8b6c4d0..75a1c69 100644
--- a/xsec/xkms/impl/XKMSStatusRequestImpl.hpp
+++ b/xsec/xkms/impl/XKMSStatusRequestImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSStatusRequest.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRequestAbstractTypeImpl.hpp"
 
 class XKMSStatusRequestImpl : public XKMSStatusRequest {
@@ -90,4 +92,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSSTATUSREQUESTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSStatusResultImpl.cpp b/xsec/xkms/impl/XKMSStatusResultImpl.cpp
index f708e39..90209f9 100644
--- a/xsec/xkms/impl/XKMSStatusResultImpl.cpp
+++ b/xsec/xkms/impl/XKMSStatusResultImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSStatusResultImpl.hpp"
 #include "XKMSUnverifiedKeyBindingImpl.hpp"
 
@@ -220,4 +222,4 @@
 
 }
 
-
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSStatusResultImpl.hpp b/xsec/xkms/impl/XKMSStatusResultImpl.hpp
index 9cb8697..c438fb3 100644
--- a/xsec/xkms/impl/XKMSStatusResultImpl.hpp
+++ b/xsec/xkms/impl/XKMSStatusResultImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSStatusResult.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResultTypeImpl.hpp"
 
 #include <vector>
@@ -102,4 +104,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSSTATUSRESULTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.cpp b/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.cpp
index f07220a..41e4fff 100644
--- a/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.cpp
+++ b/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.cpp
@@ -34,6 +34,8 @@
 
 #include <xercesc/dom/DOM.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSUnverifiedKeyBindingImpl.hpp"
 
 XERCES_CPP_NAMESPACE_USE
@@ -85,3 +87,4 @@
 
 }
 
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.hpp b/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.hpp
index 39c7634..cb536be 100644
--- a/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.hpp
+++ b/xsec/xkms/impl/XKMSUnverifiedKeyBindingImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSUnverifiedKeyBinding.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSKeyBindingAbstractTypeImpl.hpp"
 
 class XKMSUnverifiedKeyBindingImpl : public XKMSUnverifiedKeyBinding, public XKMSKeyBindingAbstractTypeImpl {
@@ -70,4 +72,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSUNVERIFIEDKEYBINDINGIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSUseKeyWithImpl.cpp b/xsec/xkms/impl/XKMSUseKeyWithImpl.cpp
index 298e5c0..615f124 100644
--- a/xsec/xkms/impl/XKMSUseKeyWithImpl.cpp
+++ b/xsec/xkms/impl/XKMSUseKeyWithImpl.cpp
@@ -36,6 +36,8 @@
 
 #include <xercesc/dom/DOM.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSUseKeyWithImpl.hpp"
 
 XERCES_CPP_NAMESPACE_USE
@@ -200,3 +202,5 @@
 	mp_identifierAttr->setNodeValue(identifier);
 
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSUseKeyWithImpl.hpp b/xsec/xkms/impl/XKMSUseKeyWithImpl.hpp
index 245d976..68d2dd2 100644
--- a/xsec/xkms/impl/XKMSUseKeyWithImpl.hpp
+++ b/xsec/xkms/impl/XKMSUseKeyWithImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSUseKeyWith.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 class XKMSUseKeyWithImpl : public XKMSUseKeyWith {
 
 public:
@@ -86,4 +88,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSUSEKEYWITHIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSValidateRequestImpl.cpp b/xsec/xkms/impl/XKMSValidateRequestImpl.cpp
index f0f5a7c..8064e7b 100644
--- a/xsec/xkms/impl/XKMSValidateRequestImpl.cpp
+++ b/xsec/xkms/impl/XKMSValidateRequestImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSValidateRequestImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -165,3 +167,5 @@
 	return mp_queryKeyBinding;
 
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSValidateRequestImpl.hpp b/xsec/xkms/impl/XKMSValidateRequestImpl.hpp
index 9f2ba26..b57cb6f 100644
--- a/xsec/xkms/impl/XKMSValidateRequestImpl.hpp
+++ b/xsec/xkms/impl/XKMSValidateRequestImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSValidateRequest.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSRequestAbstractTypeImpl.hpp"
 #include "XKMSQueryKeyBindingImpl.hpp"
 
@@ -95,4 +97,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSVALIDATEREQUESTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSValidateResultImpl.cpp b/xsec/xkms/impl/XKMSValidateResultImpl.cpp
index 77a027a..6ed9c11 100644
--- a/xsec/xkms/impl/XKMSValidateResultImpl.cpp
+++ b/xsec/xkms/impl/XKMSValidateResultImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSValidateResultImpl.hpp"
 #include "XKMSKeyBindingImpl.hpp"
 
@@ -182,3 +184,5 @@
 	return u;
 
 }
+
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSValidateResultImpl.hpp b/xsec/xkms/impl/XKMSValidateResultImpl.hpp
index bb91bd4..c62ff5c 100644
--- a/xsec/xkms/impl/XKMSValidateResultImpl.hpp
+++ b/xsec/xkms/impl/XKMSValidateResultImpl.hpp
@@ -34,6 +34,8 @@
 #include <xsec/framework/XSECDefs.hpp>
 #include <xsec/xkms/XKMSValidateResult.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSResultTypeImpl.hpp"
 
 #include <vector>
@@ -100,4 +102,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSVALIDATERESULTIMPL_INCLUDE */
diff --git a/xsec/xkms/impl/XKMSValidityIntervalImpl.cpp b/xsec/xkms/impl/XKMSValidityIntervalImpl.cpp
index 3f09ddc..36916b7 100644
--- a/xsec/xkms/impl/XKMSValidityIntervalImpl.cpp
+++ b/xsec/xkms/impl/XKMSValidityIntervalImpl.cpp
@@ -32,6 +32,8 @@
 #include <xsec/utils/XSECDOMUtils.hpp>
 #include <xsec/xkms/XKMSConstants.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 #include "XKMSValidityIntervalImpl.hpp"
 
 #include <xercesc/dom/DOM.hpp>
@@ -244,4 +246,4 @@
 
 }
 
-
+#endif /* XSEC_XKMS_ENABLED */
diff --git a/xsec/xkms/impl/XKMSValidityIntervalImpl.hpp b/xsec/xkms/impl/XKMSValidityIntervalImpl.hpp
index 37ee010..34076e3 100644
--- a/xsec/xkms/impl/XKMSValidityIntervalImpl.hpp
+++ b/xsec/xkms/impl/XKMSValidityIntervalImpl.hpp
@@ -33,6 +33,8 @@
 
 #include <xsec/xkms/XKMSValidityInterval.hpp>
 
+#ifdef XSEC_XKMS_ENABLED
+
 class XSECEnv;
 
 class XKMSValidityIntervalImpl : public XKMSValidityInterval {
@@ -87,4 +89,5 @@
 
 };
 
+#endif /* XSEC_XKMS_ENABLED */
 #endif /* XKMSVALIDITYINTERVAL_INCLUDE */