diff --git a/libasn1fix/asn1fix_class.c b/libasn1fix/asn1fix_class.c
index bb24a16..5f124df 100644
--- a/libasn1fix/asn1fix_class.c
+++ b/libasn1fix/asn1fix_class.c
@@ -65,16 +65,3 @@
 	return NULL;
 }
 
-
-int
-asn1f_parse_class_with_syntax(arg_t *arg) {
-	asn1p_expr_t *expr = arg->expr;
-
-	if(expr->expr_type != A1TC_CLASSDEF
-	|| expr->with_syntax == NULL)
-		return 0;
-
-	DEBUG("Class %s: checking WITH SYNTAX", expr->Identifier);
-
-	return 0;
-}
diff --git a/libasn1fix/asn1fix_class.h b/libasn1fix/asn1fix_class.h
index b8a6e78..763e48c 100644
--- a/libasn1fix/asn1fix_class.h
+++ b/libasn1fix/asn1fix_class.h
@@ -12,10 +12,4 @@
 asn1p_expr_t *asn1f_class_access2(asn1p_t *asn, asn1p_module_t *mod,
 	asn1p_expr_t *expr, asn1p_ref_t *);
 
-/*
- * CLASS may contain the "WITH SYNTAX" clause, in which case we are
- * going to parse it.
- */
-int asn1f_parse_class_with_syntax(arg_t *arg);
-
 #endif	/* _ASN1FIX_CLASS_H_ */
diff --git a/libasn1fix/asn1fix_cws.c b/libasn1fix/asn1fix_cws.c
index 6a8abf9..a605c24 100644
--- a/libasn1fix/asn1fix_cws.c
+++ b/libasn1fix/asn1fix_cws.c
@@ -1,2 +1,15 @@
 #include "asn1fix_internal.h"
 #include "asn1fix_cws.h"
+
+int
+asn1f_parse_class_with_syntax(arg_t *arg) {
+	asn1p_expr_t *expr = arg->expr;
+
+	if(expr->expr_type != A1TC_CLASSDEF
+	|| expr->with_syntax == NULL)
+		return 0;
+
+	DEBUG("Class %s: checking WITH SYNTAX", expr->Identifier);
+
+	return 0;
+}
diff --git a/libasn1fix/asn1fix_cws.h b/libasn1fix/asn1fix_cws.h
index 75f7830..25fd208 100644
--- a/libasn1fix/asn1fix_cws.h
+++ b/libasn1fix/asn1fix_cws.h
@@ -1,4 +1,10 @@
 #ifndef	_ASN1FIX_CLASS_WITH_SYNTAX_H_
 #define	_ASN1FIX_CLASS_WITH_SYNTAX_H_
 
+/*
+ * CLASS may contain the "WITH SYNTAX" clause, in which case we are
+ * going to parse it.
+ */
+int asn1f_parse_class_with_syntax(arg_t *arg);
+
 #endif	/* _ASN1FIX_CLASS_WITH_SYNTAX_H_ */
diff --git a/libasn1fix/asn1fix_internal.h b/libasn1fix/asn1fix_internal.h
index 9ca2904..dabf856 100644
--- a/libasn1fix/asn1fix_internal.h
+++ b/libasn1fix/asn1fix_internal.h
@@ -61,6 +61,7 @@
 #include "asn1fix_compat.h"		/* Data compatibility */
 #include "asn1fix_constr.h"		/* Constructed types */
 #include "asn1fix_class.h"		/* CLASS support */
+#include "asn1fix_cws.h"		/* CLASS WITH SYNTAX support */
 #include "asn1fix_param.h"		/* Parametrization */
 #include "asn1fix_retrieve.h"		/* Data retrieval */
 #include "asn1fix_enum.h"		/* Process ENUMERATED */