diff --git a/components/delegation/Makefile.am b/components/delegation/Makefile.am
index 70596bd82..8711e3b1e 100644
--- a/components/delegation/Makefile.am
+++ b/components/delegation/Makefile.am
@@ -12,8 +12,7 @@ EXTRA_DIST = \
 libdelegation_la_SOURCES = \
 	delegationcomponent.cpp \
 	delegationcomponent.h \
-	delegation-type.cpp \
-	i2-delegation.h
+	delegation-type.cpp
 
 libdelegation_la_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
diff --git a/components/notification/Makefile.am b/components/notification/Makefile.am
index fd19df7c1..ac96d3048 100644
--- a/components/notification/Makefile.am
+++ b/components/notification/Makefile.am
@@ -12,8 +12,7 @@ EXTRA_DIST = \
 libnotification_la_SOURCES = \
 	notificationcomponent.cpp \
 	notificationcomponent.h \
-	notification-type.cpp \
-	i2-notification.h
+	notification-type.cpp
 
 libnotification_la_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
diff --git a/components/replication/Makefile.am b/components/replication/Makefile.am
index 02a883cbd..d6cf716ef 100644
--- a/components/replication/Makefile.am
+++ b/components/replication/Makefile.am
@@ -12,8 +12,7 @@ EXTRA_DIST = \
 libreplication_la_SOURCES = \
 	replicationcomponent.cpp \
 	replicationcomponent.h \
-	replication-type.cpp \
-	i2-replication.h
+	replication-type.cpp
 
 libreplication_la_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
diff --git a/configure.ac b/configure.ac
index 5c8d4203a..729fc6297 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,8 +73,8 @@ AC_CHECK_LIB(ws2_32, getsockname)
 AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA)
 AC_CHECK_FUNCS([backtrace_symbols execvpe pipe2])
 
-CFLAGS="$CFLAGS -Wall -Wextra"
-CXXFLAGS="$CXXFLAGS -Wall -Wextra"
+CFLAGS="$CFLAGS -Wall -Wextra -Weffc++"
+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Weffc++"
 
 AC_MSG_CHECKING(whether to enable debugging)
 AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes]   turn on debugging (default=no)],, enable_debug=no)
diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index 86a8d8468..b948f6623 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -4,9 +4,6 @@
 pkglib_LTLIBRARIES =  \
 	libbase.la
 
-EXTRA_DIST = \
-	i2-base.cpp
-
 libbase_la_SOURCES =  \
 	application.cpp \
 	application.h \
diff --git a/lib/config/Makefile.am b/lib/config/Makefile.am
index 1e2f14e9c..df64075e1 100644
--- a/lib/config/Makefile.am
+++ b/lib/config/Makefile.am
@@ -9,8 +9,7 @@ BUILT_SOURCES = config_parser.h
 AM_YFLAGS = -d
 
 EXTRA_DIST = \
-	base-type.conf \
-	i2-config.cpp
+	base-type.conf
 
 .conf.cpp: $(top_builddir)/tools/mkembedconfig.c
 	$(top_builddir)/tools/mkembedconfig $< $@
diff --git a/lib/icinga/Makefile.am b/lib/icinga/Makefile.am
index 86b7d4336..59f8bccf1 100644
--- a/lib/icinga/Makefile.am
+++ b/lib/icinga/Makefile.am
@@ -5,8 +5,7 @@ pkglib_LTLIBRARIES =  \
 	libicinga.la
 
 EXTRA_DIST = \
-	icinga-type.conf \
-	i2-icinga.cpp
+	icinga-type.conf
 
 .conf.cpp: $(top_builddir)/tools/mkembedconfig.c
 	$(top_builddir)/tools/mkembedconfig $< $@
diff --git a/lib/remoting/Makefile.am b/lib/remoting/Makefile.am
index 57c7a7a2f..b3390c68a 100644
--- a/lib/remoting/Makefile.am
+++ b/lib/remoting/Makefile.am
@@ -7,9 +7,6 @@ pkglib_LTLIBRARIES = \
 .conf.cpp: $(top_builddir)/tools/mkembedconfig.c
 	$(top_builddir)/tools/mkembedconfig $< $@
 
-EXTRA_DIST = \
-	i2-remoting.cpp
-
 libremoting_la_SOURCES = \
 	endpoint.cpp \
 	endpoint.h \