diff --git a/src/cert-tree-model.cpp b/src/cert-tree-model.cpp
index 3c7362b..37331c8 100644
--- a/src/cert-tree-model.cpp
+++ b/src/cert-tree-model.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014, Regents of the University of California,
+ * Copyright (c) 2013-2017, Regents of the University of California,
  *
  * This file is part of NFD Control Center.  See AUTHORS.md for complete list of NFD
  * authors and contributors.
@@ -18,10 +18,7 @@
  */
 
 #include "cert-tree-model.hpp"
-
-#ifdef WAF
 #include "cert-tree-model.moc"
-#endif
 
 namespace ndn {
 namespace ncc {
diff --git a/src/fib-status.cpp b/src/fib-status.cpp
index 9b8079f..c748439 100644
--- a/src/fib-status.cpp
+++ b/src/fib-status.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014, Regents of the University of California,
+ * Copyright (c) 2013-2017, Regents of the University of California,
  *
  * This file is part of NFD Control Center.  See AUTHORS.md for complete list of NFD
  * authors and contributors.
@@ -18,11 +18,7 @@
  */
 
 #include "fib-status.hpp"
-
-#ifdef WAF
 #include "fib-status.moc"
-// #include "fib-status.cpp.moc"
-#endif
 
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/name.hpp>
diff --git a/src/forwarder-status.cpp b/src/forwarder-status.cpp
index 8b37990..80ccc63 100644
--- a/src/forwarder-status.cpp
+++ b/src/forwarder-status.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2016, Regents of the University of California.
+ * Copyright (c) 2013-2017, Regents of the University of California,
  *
  * This file is part of NFD Control Center.  See AUTHORS.md for complete list of NFD
  * authors and contributors.
@@ -18,6 +18,7 @@
  */
 
 #include "forwarder-status.hpp"
+#include "forwarder-status.moc"
 
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/name.hpp>
@@ -26,10 +27,6 @@
 #include <ndn-cxx/management/nfd-face-status.hpp>
 #include <ndn-cxx/management/nfd-forwarder-status.hpp>
 
-#ifdef WAF
-#include "forwarder-status.moc"
-#endif
-
 namespace ndn {
 
 ForwarderStatusModel::ForwarderStatusModel(QObject* parent/* = 0*/)
diff --git a/src/key-tree-model.cpp b/src/key-tree-model.cpp
index 56c4ec1..44bf362 100644
--- a/src/key-tree-model.cpp
+++ b/src/key-tree-model.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014, Regents of the University of California,
+ * Copyright (c) 2013-2017, Regents of the University of California,
  *
  * This file is part of NFD Control Center.  See AUTHORS.md for complete list of NFD
  * authors and contributors.
@@ -18,6 +18,7 @@
  */
 
 #include "key-tree-model.hpp"
+#include "key-tree-model.moc"
 #include "key-tree-item.hpp"
 
 #include <QStringList>
@@ -25,11 +26,6 @@
 #include <QBrush>
 #include <iostream>
 
-
-#ifdef WAF
-#include "key-tree-model.moc"
-#endif
-
 namespace ndn {
 namespace ncc {
 
@@ -234,5 +230,5 @@
   // }
 // }
 
-} // namespace ndn
 } // namespace ncc
+} // namespace ndn
diff --git a/src/key-viewer-dialog.cpp b/src/key-viewer-dialog.cpp
index 07604dd..540adec 100644
--- a/src/key-viewer-dialog.cpp
+++ b/src/key-viewer-dialog.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2014, Regents of the University of California,
+ * Copyright (c) 2013-2017, Regents of the University of California,
  *
  * This file is part of NFD Control Center.  See AUTHORS.md for complete list of NFD
  * authors and contributors.
@@ -18,6 +18,7 @@
  */
 
 #include "key-viewer-dialog.hpp"
+#include "key-viewer-dialog.moc"
 #include "ui_key-viewer-dialog.h"
 #include "key-tree-item.hpp"
 
@@ -26,11 +27,6 @@
 #include <Qt>
 #include <QMenu>
 
-
-#ifdef WAF
-#include "key-viewer-dialog.moc"
-#endif
-
 namespace ndn {
 namespace ncc {
 
diff --git a/src/tray-menu.cpp b/src/tray-menu.cpp
index 28b6d36..d4d2637 100644
--- a/src/tray-menu.cpp
+++ b/src/tray-menu.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2017, Regents of the University of California.
+ * Copyright (c) 2013-2017, Regents of the University of California,
  *
  * This file is part of NFD Control Center.  See AUTHORS.md for complete list of NFD
  * authors and contributors.
@@ -17,13 +17,12 @@
  * Control Center, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.hpp"
 #include "tray-menu.hpp"
+#include "tray-menu.moc"
 
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/interest.hpp>
 
-
 #ifdef OSX_BUILD
 #define CONNECT_ICON ":/res/icon-connected-black.png"
 #define DISCONNECT_ICON ":/res/icon-disconnected-black.png"
@@ -35,10 +34,6 @@
 #define DISCONNECT_ICON ":/res/icon-disconnected-white.png"
 #endif // OSX_BUILD
 
-#ifdef WAF
-#include "tray-menu.moc"
-#endif
-
 namespace ndn {
 
 TrayMenu::TrayMenu(QQmlContext* context, Face& face)