diff --git a/core/ScopeGuard.h b/core/ScopeGuard.h
index 5a27a33..a9ae41b 100644
--- a/core/ScopeGuard.h
+++ b/core/ScopeGuard.h
@@ -1,6 +1,8 @@
 #ifndef SCOPEGUARD_H
 #define SCOPEGUARD_H
 
+#include <utility>
+
 /** \brief Template class for executing code at scope exit.
  *
  * By default the object will be an active mode and execute the function
diff --git a/pglab/CodeGenerator.ui b/pglab/CodeGenerator.ui
index 8d91f1b..dccfd31 100644
--- a/pglab/CodeGenerator.ui
+++ b/pglab/CodeGenerator.ui
@@ -72,7 +72,7 @@
   <customwidget>
    <class>CodeEditor</class>
    <extends>QPlainTextEdit</extends>
-   <header>CodeEditor.h</header>
+   <header>codeeditor/CodeEditor.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pglab/widgets/SingleRecordWidget.ui b/pglab/widgets/SingleRecordWidget.ui
index d14dee0..bfc73fd 100644
--- a/pglab/widgets/SingleRecordWidget.ui
+++ b/pglab/widgets/SingleRecordWidget.ui
@@ -23,7 +23,7 @@
   <customwidget>
    <class>PgLabTableView</class>
    <extends>QTableView</extends>
-   <header>PgLabTableView.h</header>
+   <header>util/PgLabTableView.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/pglablib/ASyncDBConnection.cpp b/pglablib/ASyncDBConnection.cpp
index d518ab7..13684a0 100644
--- a/pglablib/ASyncDBConnection.cpp
+++ b/pglablib/ASyncDBConnection.cpp
@@ -269,7 +269,7 @@ void ASyncDBConnectionThread::doStateCallback(ASyncDBConnection::State state)
 //	if (m_stateCallback.m_func) {
 //		m_stateCallback.m_func(state);
 //	}
-	emit asyncConnObject->onStateChanged(state);
+    Q_EMIT asyncConnObject->onStateChanged(state);
 }
 
 void ASyncDBConnectionThread::waitForAndSendCommand()
@@ -439,7 +439,7 @@ void ASyncDBConnectionThread::processNotice(const PGresult *result)
 //		m_noticeCallback.m_func(details);
 //	}
 	Pgsql::ErrorDetails details = Pgsql::ErrorDetails::createErrorDetailsFromPGresult(result);
-	emit asyncConnObject->onNotice(details);
+    Q_EMIT asyncConnObject->onNotice(details);
 }
 
 
@@ -480,7 +480,7 @@ void ASyncDBConnection::doStateCallback(State state)
         m_connection.setNoticeReceiver(
             [this](const PGresult *result) { processNotice(result); });
     }
-	emit onStateChanged(state);	
+    Q_EMIT onStateChanged(state);
 }
 
 
@@ -526,5 +526,5 @@ bool ASyncDBConnection::cancel()
 void ASyncDBConnection::processNotice(const PGresult *result)
 {
     Pgsql::ErrorDetails details = Pgsql::ErrorDetails::createErrorDetailsFromPGresult(result);
-	emit onNotice(details);
+    Q_EMIT onNotice(details);
 }
diff --git a/pglablib/ASyncDBConnection.h b/pglablib/ASyncDBConnection.h
index cdd6965..45f568b 100644
--- a/pglablib/ASyncDBConnection.h
+++ b/pglablib/ASyncDBConnection.h
@@ -65,7 +65,7 @@ public:
 
 	bool cancel();
     
-signals:
+Q_SIGNALS:
     void onStateChanged(ASyncDBConnection::State state);
     void onNotice(Pgsql::ErrorDetails notice);
 //	void onQueryResult(std::shared_ptr<Pgsql::Result> result);
diff --git a/pglablib/ParamListModel.cpp b/pglablib/ParamListModel.cpp
index d8d4b81..f21b4e9 100644
--- a/pglablib/ParamListModel.cpp
+++ b/pglablib/ParamListModel.cpp
@@ -87,7 +87,7 @@ bool ParamListModel::setData(const QModelIndex &index, const QVariant &value, in
 				break;
 			}
 
-			emit dataChanged(index, index, QVector<int>() << role);
+            Q_EMIT dataChanged(index, index, QVector<int>() << role);
 			return true;
 		}
 	}
diff --git a/pglablib/catalog/PgDatabaseCatalog.h b/pglablib/catalog/PgDatabaseCatalog.h
index 60262ca..5e6fbd7 100644
--- a/pglablib/catalog/PgDatabaseCatalog.h
+++ b/pglablib/catalog/PgDatabaseCatalog.h
@@ -88,7 +88,7 @@ public:
 	};
 	using RefreshFlags = int;
 
-signals:
+Q_SIGNALS:
 	void refreshed(const PgDatabaseCatalog *catalog, RefreshFlags flags);
 private:
 	QString m_serverVersionString;