diff --git a/src/fst/morphology/Makefile.am b/src/fst/morphology/Makefile.am
index d853c6c..bfb1742 100644
--- a/src/fst/morphology/Makefile.am
+++ b/src/fst/morphology/Makefile.am
@@ -20,7 +20,7 @@ SUBDIRS=. test
 
 # Add language-specific flags for hfst-lexc compilation here:
 if HAVE_SHARED_COMMON
-HFST_LEXC_LOCAL_FLAGS=  # --Werror # uncomment if lexc is good enough
+HFST_LEXC_LOCAL_FLAGS=--Werror # uncomment if lexc is good enough
 else
 HFST_LEXC_LOCAL_FLAGS=  # No --Werror if deps are missing !
 endif
@@ -36,14 +36,13 @@ GT_LEXC_SRCS_L1_L2=\
 			 affixes/adjectives.lexc  \
 			 affixes/ligatures.lexc	\
 			 affixes/nouns.lexc       \
-			 affixes/propernouns.lexc \
 			 affixes/symbols.lexc     \
 			 affixes/verbs.lexc       \
 			 stems/adjectives.lexc    \
+			 stems/interrogatives.lexc	\
 			 stems/nouns.lexc         \
 			 stems/numerals.lexc      \
 			 stems/particles.lexc	  \
-			 stems/prefixes.lexc      \
 			 stems/pronouns.lexc      \
 			 stems/verbs.lexc
 
diff --git a/src/fst/morphology/stems/prefixes.lexc b/src/fst/morphology/affixes/prefixes.lexc
similarity index 64%
rename from src/fst/morphology/stems/prefixes.lexc
rename to src/fst/morphology/affixes/prefixes.lexc
index 0529813..352244f 100644
--- a/src/fst/morphology/stems/prefixes.lexc
+++ b/src/fst/morphology/affixes/prefixes.lexc
@@ -2,9 +2,9 @@
 !  --------
 !! Prefixes in the Cebuano language are attatched to the left of other words.
 
-LEXICON Prefixes
-nounprefix-     Nouns   ;
-verbprefix-     Verbs   ;
+!LEXICON Prefixes
+!nounprefix-     Nouns   ;
+!verbprefix-     Verbs   ;
 
 
 ! vim: set ft=xfst-lexc: