diff --git a/configure.ac b/configure.ac
index 4cf9835..218b6a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,7 @@ elm_code/data/themes/Makefile
 elm_code/data/themes/default/Makefile
 elm_code/src/Makefile
 elm_code/src/lib/Makefile
+elm_code/src/lib/widget/Makefile
 elm_code/src/bin/Makefile
 elm_code/src/tests/Makefile
 doc/edi.1
diff --git a/elm_code/src/lib/Makefile.am b/elm_code/src/lib/Makefile.am
index 087f863..95129e8 100644
--- a/elm_code/src/lib/Makefile.am
+++ b/elm_code/src/lib/Makefile.am
@@ -1,5 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
+SUBDIRS = widget
+
 CLEANFILES=
 
 EOLIAN_FLAGS = @DEPS_EOLIAN_FLAGS@ \
@@ -9,6 +11,9 @@ include $(top_srcdir)/Makefile_Eolian_Helper.am
 
 AM_CPPFLAGS = \
 -I$(top_srcdir)/elm_code/src/lib \
+-I$(top_builddir)/elm_code/src/lib \
+-I$(top_srcdir)/elm_code/src/lib/widget \
+-I$(top_builddir)/elm_code/src/lib/widget \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DEFL_BETA_API_SUPPORT \
 -DEFL_EO_API_SUPPORT \
@@ -25,6 +30,7 @@ elm_code_file.h \
 elm_code_parse.h \
 widget/elm_code_widget.eo.h \
 widget/elm_code_widget.eo.legacy.h \
+widget/elm_code_widget_legacy.h \
 widget/elm_code_widget_selection.h \
 elm_code_diff_widget.h \
 Elm_Code.h
@@ -62,3 +68,6 @@ BUILT_SOURCES = \
 elmcodeeolianfilesdir = $(datadir)/eolian/include/elm_code-@VMAJ@
 elmcodeeolianfiles_DATA = $(elm_code_eolian_files)
 EXTRA_DIST = ${elmcodeeolianfiles_DATA}
+
+CLEANFILES += $(elm_code_eolian_h) $(elm_code_eolian_legacy_h)
+
diff --git a/elm_code/src/lib/widget/Makefile.am b/elm_code/src/lib/widget/Makefile.am
new file mode 100644
index 0000000..e69de29
diff --git a/elm_code/src/tests/Makefile.am b/elm_code/src/tests/Makefile.am
index 86acce2..6256c35 100644
--- a/elm_code/src/tests/Makefile.am
+++ b/elm_code/src/tests/Makefile.am
@@ -17,10 +17,13 @@ widget/elm_code_test_widget_text.c \
 widget/elm_code_test_widget_selection.c \
 elm_code_suite.c
 
-elm_code_suite_CPPFLAGS = -I$(top_builddir)/elm_code/src/lib/ \
+elm_code_suite_CPPFLAGS = \
 -DEFL_BETA_API_SUPPORT \
 -DEFL_EO_API_SUPPORT \
 -I$(top_srcdir)/elm_code/src/lib \
+-I$(top_builddir)/elm_code/src/lib \
+-I$(top_srcdir)/elm_code/src/lib/widget \
+-I$(top_builddir)/elm_code/src/lib/widget \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DPACKAGE_TESTS_DIR=\"$(top_srcdir)/elm_code/src/tests/\" \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/elm_code/src/tests/\" \