1 files changed, 7 insertions, 1 deletions
diff --git a/g10/tlv.c b/g10/tlv.c
index b5dcd4021..bb7f99902 100644
--- a/g10/tlv.c
+++ b/g10/tlv.c
@@ -15,7 +15,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
  */
 
 #include <config.h>
@@ -25,7 +26,12 @@
 #include <string.h>
 #include <assert.h>
 
+#if GNUPG_MAJOR_VERSION == 1
+#include "cardglue.h"
+#else
 #include <gpg-error.h>
+#endif
+
 
 #include "tlv.h"