diff --git a/libasn1fix/Makefile.in b/libasn1fix/Makefile.in
index 91b9428..80a91c0 100644
--- a/libasn1fix/Makefile.in
+++ b/libasn1fix/Makefile.in
@@ -50,21 +50,18 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-libasn1fix_la_DEPENDENCIES =  \
-	${top_builddir}/libasn1parser/libasn1parser.la
+libasn1fix_la_LIBADD =
 am_libasn1fix_la_OBJECTS = asn1fix.lo asn1fix_misc.lo asn1fix_value.lo \
 	asn1fix_compat.lo asn1fix_constr.lo asn1fix_cstring.lo \
-	asn1fix_retrieve.lo asn1fix_bitstring.lo asn1fix_integer.lo \
-	asn1fix_dereft.lo asn1fix_derefv.lo asn1fix_export.lo \
-	asn1fix_param.lo asn1fix_class.lo asn1fix_tags.lo \
-	asn1fix_enum.lo
+	asn1fix_retrieve.lo asn1fix_bitstring.lo asn1fix_constraint.lo \
+	asn1fix_integer.lo asn1fix_crange.lo asn1fix_dereft.lo \
+	asn1fix_derefv.lo asn1fix_export.lo asn1fix_param.lo \
+	asn1fix_class.lo asn1fix_tags.lo asn1fix_enum.lo \
+	asn1fix_constraint_compat.lo
 libasn1fix_la_OBJECTS = $(am_libasn1fix_la_OBJECTS)
 check_fixer_SOURCES = check_fixer.c
 check_fixer_OBJECTS = check_fixer.$(OBJEXT)
-check_fixer_LDADD = $(LDADD)
 am__DEPENDENCIES_1 = libasn1fix.la
-am__DEPENDENCIES_2 = ${top_builddir}/libasn1parser/libasn1parser.la
-check_fixer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -73,6 +70,9 @@
 @AMDEP_TRUE@	./$(DEPDIR)/asn1fix_class.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/asn1fix_compat.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/asn1fix_constr.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/asn1fix_constraint.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/asn1fix_constraint_compat.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/asn1fix_crange.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/asn1fix_cstring.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/asn1fix_dereft.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/asn1fix_derefv.Plo \
@@ -209,31 +209,39 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AM_CFLAGS = @ADD_CFLAGS@
-AM_CPPFLAGS = -I${top_srcdir}/libasn1parser
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/libasn1parser	\
+	-I$(top_srcdir)/libasn1cnst
+
 noinst_LTLIBRARIES = libasn1fix.la
 libasn1fix_la_LDFLAGS = -all-static
 libasn1fix_la_SOURCES = \
-	asn1fix.c asn1fix.h			\
-	asn1fix_internal.h			\
-	asn1fix_misc.c asn1fix_misc.h		\
-	asn1fix_value.c asn1fix_value.h		\
-	asn1fix_compat.c asn1fix_compat.h	\
-	asn1fix_constr.c asn1fix_constr.h	\
-	asn1fix_cstring.c asn1fix_cstring.h	\
-	asn1fix_retrieve.c asn1fix_retrieve.h	\
-	asn1fix_bitstring.c asn1fix_bitstring.h	\
-	asn1fix_integer.c asn1fix_integer.h	\
-	asn1fix_dereft.c asn1fix_dereft.h	\
-	asn1fix_derefv.c asn1fix_derefv.h	\
-	asn1fix_export.c asn1fix_export.h	\
-	asn1fix_param.c asn1fix_param.h		\
-	asn1fix_class.c asn1fix_class.h		\
-	asn1fix_tags.c asn1fix_tags.h		\
-	asn1fix_enum.c asn1fix_enum.h
+	asn1fix.c asn1fix.h				\
+	asn1fix_internal.h				\
+	asn1fix_misc.c asn1fix_misc.h			\
+	asn1fix_value.c asn1fix_value.h			\
+	asn1fix_compat.c asn1fix_compat.h		\
+	asn1fix_constr.c asn1fix_constr.h		\
+	asn1fix_cstring.c asn1fix_cstring.h		\
+	asn1fix_retrieve.c asn1fix_retrieve.h		\
+	asn1fix_bitstring.c asn1fix_bitstring.h		\
+	asn1fix_constraint.c asn1fix_constraint.h	\
+	asn1fix_integer.c asn1fix_integer.h		\
+	asn1fix_crange.c asn1fix_crange.h		\
+	asn1fix_dereft.c asn1fix_dereft.h		\
+	asn1fix_derefv.c asn1fix_derefv.h		\
+	asn1fix_export.c asn1fix_export.h		\
+	asn1fix_param.c asn1fix_param.h			\
+	asn1fix_class.c asn1fix_class.h			\
+	asn1fix_tags.c asn1fix_tags.h			\
+	asn1fix_enum.c asn1fix_enum.h			\
+	asn1fix_constraint_compat.c
 
-libasn1fix_la_LIBADD = ${top_builddir}/libasn1parser/libasn1parser.la
-LDADD = ${noinst_LTLIBRARIES} ${libasn1fix_la_LIBADD}
-DEPENDENCIES = ${LDADD} 
+check_fixer_LDADD = $(noinst_LTLIBRARIES)		\
+	$(top_builddir)/libasn1cnst/libasn1cnst.la	\
+	$(top_builddir)/libasn1parser/libasn1parser.la
+
+check_fixer_DEPENDENCIES = $(check_fixer_LDADD)
 TESTS_ENVIRONMENT = ./check_fixer
 TESTS = ${top_srcdir}/tests/*.asn1
 all: all-am
@@ -302,6 +310,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1fix_class.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1fix_compat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1fix_constr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1fix_constraint.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1fix_constraint_compat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1fix_crange.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1fix_cstring.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1fix_dereft.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1fix_derefv.Plo@am__quote@