kcoreaddons commit fbc5881b9 (current head) breaks building kwin.

I'm running gentoo, with most kde packages from live-git using the gentoo/kde overlay.  Today, kwin refused to update, and even pinning to the currently installed commit wouldn't allow it to build due to an automoc error.  I traced it down to kcoreaddons, and bisected there to current head, fbc5881b9.  Using the previous commit, kwin builds fine.

Here's the error from the log:

make[2]: Entering directory
'/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999_build'
AutoMoc: Checking:
/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinscripts/main.cpp

AutoMoc error
-------------
 
"/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinscripts/main.cpp"
The file contains a K_PLUGIN_FACTORY macro, but does not include "main.moc"!
Consider to
 - add #include "main.moc"
 - enable SKIP_AUTOMOC for this file

AutoMoc: Checking:
/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinrules/detectwidget.cpp
AutoMoc: Checking:
/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinrules/kcm.cpp
AutoMoc: Checking:
/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinrules/kwinsrc.cpp
AutoMoc: Checking:
/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinrules/ruleslist.cpp
AutoMoc: Checking:
/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinrules/ruleswidget.cpp
AutoMoc: Checking:
/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinrules/detectwidget.h
AutoMoc: Checking:
/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinrules/kcm.h
AutoMoc: Checking:
/tmp/portage/kde-plasma/kwin-9999/work/kwin-9999/kcmkwin/kwinrules/ruleslist.h
make[2]: ***
[kcmkwin/kwinscripts/CMakeFiles/kcm_kwin_scripts_autogen.dir/build.make:58:
kcmkwin/kwinscripts/CMakeFiles/kcm_kwin_scripts_autogen] Error 1

The full failing kwin build log and additional info can be found in the gentoo bug (opened before I figured out the problem)

https://bugs.gentoo.org/show_bug.cgi?id=641436