diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -24,7 +24,7 @@
    kexiprojectdata.cpp
    KexiRecentProjects.cpp
    kexiinternalpart.cpp
-   #TODO KEXI3 kexidragobjects.cpp
+   kexidragobjects.cpp
    kexistartupdata.cpp
    KexiCommandLineOptions.cpp
    kexiguimsghandler.cpp
diff --git a/src/core/kexidragobjects.cpp b/src/core/kexidragobjects.cpp
--- a/src/core/kexidragobjects.cpp
+++ b/src/core/kexidragobjects.cpp
@@ -26,6 +26,7 @@
 #include <QDomDocument>
 #include <QMimeData>
 #include <QDebug>
+#include <QWidget>
 
 bool KexiFieldDrag::canDecode(QDropEvent *e)
 {
@@ -79,10 +80,7 @@
 
 bool KexiDataProviderDrag::decode(QDropEvent* e, QString* sourceMimeType, QString *sourceName)
 {
-    Q_ASSERT(sourceMimeType);
-    Q_ASSERT(sourceName);
-
-    QByteArray payload = e->encodedData("kexidataprovider");
+    QByteArray payload = e->mimeData()->data("kexidataprovider");
     if (payload.isEmpty()) {
         return false;
     }
diff --git a/src/plugins/forms/kexiformview.cpp b/src/plugins/forms/kexiformview.cpp
--- a/src/plugins/forms/kexiformview.cpp
+++ b/src/plugins/forms/kexiformview.cpp
@@ -28,7 +28,7 @@
 #include <formeditor/WidgetTreeWidget.h>
 #include <kexi.h>
 #include <kexi_global.h>
-//! @todo KEXI3 Port #include <kexidragobjects.h>
+#include <kexidragobjects.h>
 #include <widget/kexiqueryparameters.h>
 #include <kexiutils/utils.h>
 #include <KexiMainWindowIface.h>
@@ -1052,11 +1052,13 @@
 void
 KexiFormView::slotHandleDragMoveEvent(QDragMoveEvent* e)
 {
-    Q_UNUSED(e);
-/*! @todo KEXI3 Port kexidragobjects.cpp
+#ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
     if (KexiFieldDrag::canDecode(e)) {
         e->setAccepted(true);
-    }*/
+    }
+#else
+    Q_UNUSED(e);
+#endif
 }
 
 void
diff --git a/src/plugins/queries/kexiquerydesignerguieditor.cpp b/src/plugins/queries/kexiquerydesignerguieditor.cpp
--- a/src/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/src/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -23,7 +23,7 @@
 #include <kexiproject.h>
 #include <KexiMainWindowIface.h>
 #include <kexiinternalpart.h>
-//! @todo KEXI3 Port #include <kexidragobjects.h>
+#include <kexidragobjects.h>
 #include <widget/tableview/KexiTableScrollArea.h>
 #include <widget/tableview/KexiDataTableView.h>
 #include <kexi.h>
@@ -1233,15 +1233,13 @@
 KexiQueryDesignerGuiEditor::slotDroppedAtRecord(KDbRecordData * /*data*/, int /*record*/,
         QDropEvent *ev, KDbRecordData*& newRecord)
 {
-    //QString sourcePartClass;
+    QString sourcePartClass;
     QString srcTable;
     QStringList srcFields;
 
-    Q_UNUSED(ev);
-    /*! @todo KEXI3 Port kexidragobjects.cpp
-    if (!KexiFieldDrag::decode(ev, &sourcePartClass, &srcTable, &srcFields))
+    if (!KexiFieldDrag::decode(ev, &sourcePartClass, &srcTable, &srcFields)) {
         return;
-    */
+    }
 
     if (srcFields.count() != 1) {
         return;
diff --git a/src/widget/relations/KexiRelationsTableContainer_p.cpp b/src/widget/relations/KexiRelationsTableContainer_p.cpp
--- a/src/widget/relations/KexiRelationsTableContainer_p.cpp
+++ b/src/widget/relations/KexiRelationsTableContainer_p.cpp
@@ -20,10 +20,11 @@
 
 #include "KexiRelationsTableContainer_p.h"
 #include "KexiRelationsScrollArea.h"
-//! @todo KEXI3 Port #include <kexidragobjects.h>
+#include <kexidragobjects.h>
 #include <kexiutils/utils.h>
 
 #include <KDbTableSchema>
+#include <KDbTableOrQuerySchema>
 #include <KDbUtils>
 
 #include <QLabel>
@@ -212,9 +213,6 @@
 
 void KexiRelationsTableFieldList::dragMoveEvent(QDragMoveEvent* event)
 {
-//! @todo KEXI3 Port kexidragobjects.cpp
-    Q_UNUSED(event);
-#if 0
     QModelIndex receiver = indexAt(event->pos());
     if (!receiver.isValid() || !KexiFieldDrag::canDecode(event))
         return;
@@ -250,15 +248,10 @@
     //qDebug() << "Source:" << srcTable << "Dest:" << schema()->name();
     if (!srcField.trimmed().startsWith('*') && !f.startsWith('*'))
         event->acceptProposedAction();
-#endif
 }
 
 void KexiRelationsTableFieldList::dropEvent(QDropEvent *event)
 {
-    //qDebug();
-//! @todo KEXI3 Port kexidragobjects.cpp
-    Q_UNUSED(event);
-#if 0
     QModelIndex idx = indexAt(event->pos());
 
     if (!idx.isValid() || !KexiFieldDrag::canDecode(event)) {
@@ -296,7 +289,6 @@
 
     //qDebug() << srcTable << ":" << srcField << schema()->name() << ":" << rcvField;
     event->accept();
-#endif
 }
 
 void KexiRelationsTableFieldList::slotContentsMoving()