diff --git a/Fireworks/Core/BuildFile.xml b/Fireworks/Core/BuildFile.xml
index 668f534e37ef3..244d7de01ca84 100644
--- a/Fireworks/Core/BuildFile.xml
+++ b/Fireworks/Core/BuildFile.xml
@@ -32,6 +32,7 @@
 <lib name="GX11"/>
 <lib name="RGL"/>
 <lib name="GLEW"/>
+<lib name="Gui"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/Fireworks/Core/interface/FWEveViewManager.h b/Fireworks/Core/interface/FWEveViewManager.h
index eaccbcd251fac..49f643aaf7ab8 100644
--- a/Fireworks/Core/interface/FWEveViewManager.h
+++ b/Fireworks/Core/interface/FWEveViewManager.h
@@ -77,7 +77,7 @@ class FWEveViewManager : public FWViewManagerBase
 
    FWTypeToRepresentations supportedTypesAndRepresentations() const;
 
-   static void syncAllViews() { s_syncAllViews = false; }
+   static void syncAllViews() { s_syncAllViews = true; }
 protected:
    virtual void modelChangesComing();
    virtual void modelChangesDone();
diff --git a/Fireworks/Core/src/FireworksCoreLinkDef.h b/Fireworks/Core/src/FireworksCoreLinkDef.h
deleted file mode 100644
index 36c2cf6cad249..0000000000000
--- a/Fireworks/Core/src/FireworksCoreLinkDef.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "Fireworks/Core/src/CSGConnector.h"
-#include "Fireworks/Core/interface/FWIntValueListenerBase.h"
-#include "Fireworks/Core/interface/FWSummaryManager.h"
-#include "Fireworks/Core/src/FWGUIEventDataAdder.h"
-#include "Fireworks/Core/src/FWColorSelect.h"
-#include "Fireworks/Core/src/FWNumberEntry.h"
-#include "Fireworks/Core/src/FWCollectionSummaryWidget.h"
-#include "Fireworks/Core/src/FWCompactVerticalLayout.h"
-#include "Fireworks/Core/src/FWModelContextMenuHandler.h"
-
-#include "Fireworks/Core/interface/CmsShowEDI.h"
-#include "Fireworks/Core/interface/FWViewEnergyScaleEditor.h"
-#include "Fireworks/Core/interface/CmsShowSearchFiles.h"
-
-#include "Fireworks/Core/interface/FWGUISubviewArea.h"
-#include "Fireworks/Core/interface/CmsShowMainFrame.h"
-#include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
-
-#include "Fireworks/Core/interface/CmsShowModelPopup.h"
-#include "Fireworks/Core/interface/FWGUIEventFilter.h"
-#include "Fireworks/Core/interface/CmsShowCommonPopup.h"
-#include "Fireworks/Core/interface/CmsShowViewPopup.h"
-#include "Fireworks/Core/interface/FWInvMassDialog.h"
-
-#include "Fireworks/Core/interface/FWGeometryTableViewBase.h"
-#include "Fireworks/Core/src/FWGeometryTableView.h"
-#include "Fireworks/Core/src/FWOverlapTableView.h"
-#include "Fireworks/Core/interface/FWTextProjected.h"
-
-#include "Fireworks/Core/interface/FWGeoTopNode.h"
-#include "Fireworks/Core/src/FWEveOverlap.h"
-#include "Fireworks/Core/src/FWEveDetectorGeo.h"
-#include "Fireworks/Core/src/FWGeoTopNodeGL.h"
-
-
-
-#ifdef __CINT__
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-#pragma link C++ class FWGUIEventDataAdder;
-
-#pragma link C++ class CSGConnector;
-#pragma link C++ class FWIntValueListenerBase;
-#pragma link C++ class FWColorFrame;
-#pragma link C++ class FWColorPopup;
-#pragma link C++ class FWColorRow;
-#pragma link C++ class FWColorSelect;
-#pragma link C++ class FWNumberEntryField;
-
-#pragma link C++ class FWCollectionSummaryWidget;
-#pragma link C++ class FWSummaryManager;
-
-#pragma link C++ class FWCompactVerticalLayout;
-#pragma link C++ class FWModelContextMenuHandler;
-
-#pragma link C++ class CmsShowEDI;
-#pragma link C++ class FWViewEnergyScaleEditor;
-#pragma link C++ class CmsShowSearchFiles;
-
-#pragma link C++ class FWGUISubviewArea;
-#pragma link C++ class CmsShowMainFrame;
-#pragma link C++ class FWGUIValidatingTextEntry;
-
-#pragma link C++ class CmsShowModelPopup;
-#pragma link C++ class FWGUIEventFilter;
-#pragma link C++ class CmsShowCommonPopup;
-#pragma link C++ class CmsShowViewPopup;
-#pragma link C++ class FWInvMassDialog;
-
-#pragma link C++ class FWEveText;
-#pragma link C++ class FWEveTextProjected;
-#pragma link C++ class FWEveTextGL;
-
-#pragma link C++ class FWInvMassDialog;
-
-#pragma link C++ class FWGeometryTableViewBase;
-#pragma link C++ class FWGeometryTableView;
-#pragma link C++ class FWOverlapTableView;
-
-#pragma link C++ class FWGeoTopNode;
-#pragma link C++ class FWEveOverlap;
-#pragma link C++ class FWEveDetectorGeo;
-#pragma link C++ class FWGeoTopNodeGL;
-#endif
diff --git a/Fireworks/Core/src/classes.h b/Fireworks/Core/src/classes.h
index 5a2c153c6d15f..ecd360af8e477 100644
--- a/Fireworks/Core/src/classes.h
+++ b/Fireworks/Core/src/classes.h
@@ -31,6 +31,42 @@
 #include "Fireworks/Core/interface/FWTSelectorToEventList.h"
 #include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h"
 #include "Fireworks/Core/src/FW3DViewDistanceMeasureTool.h"
+
+
+#include "Fireworks/Core/src/CSGConnector.h"
+#include "Fireworks/Core/interface/FWIntValueListenerBase.h"
+#include "Fireworks/Core/interface/FWSummaryManager.h"
+#include "Fireworks/Core/src/FWGUIEventDataAdder.h"
+#include "Fireworks/Core/src/FWColorSelect.h"
+#include "Fireworks/Core/src/FWNumberEntry.h"
+#include "Fireworks/Core/src/FWCollectionSummaryWidget.h"
+#include "Fireworks/Core/src/FWCompactVerticalLayout.h"
+#include "Fireworks/Core/src/FWModelContextMenuHandler.h"
+
+#include "Fireworks/Core/interface/CmsShowEDI.h"
+#include "Fireworks/Core/interface/FWViewEnergyScaleEditor.h"
+#include "Fireworks/Core/interface/CmsShowSearchFiles.h"
+
+#include "Fireworks/Core/interface/FWGUISubviewArea.h"
+#include "Fireworks/Core/interface/CmsShowMainFrame.h"
+#include "Fireworks/Core/src/FWGUIValidatingTextEntry.h"
+
+#include "Fireworks/Core/interface/CmsShowModelPopup.h"
+#include "Fireworks/Core/interface/FWGUIEventFilter.h"
+#include "Fireworks/Core/interface/CmsShowCommonPopup.h"
+#include "Fireworks/Core/interface/CmsShowViewPopup.h"
+#include "Fireworks/Core/interface/FWInvMassDialog.h"
+
+#include "Fireworks/Core/interface/FWGeometryTableViewBase.h"
+#include "Fireworks/Core/src/FWGeometryTableView.h"
+#include "Fireworks/Core/src/FWOverlapTableView.h"
+#include "Fireworks/Core/interface/FWTextProjected.h"
+
+#include "Fireworks/Core/interface/FWGeoTopNode.h"
+#include "Fireworks/Core/src/FWEveOverlap.h"
+#include "Fireworks/Core/src/FWEveDetectorGeo.h"
+#include "Fireworks/Core/src/FWGeoTopNodeGL.h"
+
 namespace Fireworks_Core {
    struct Fireworks_Core {
       //add 'dummy' Wrapper variable for each class type you put into the Event
diff --git a/Fireworks/Core/src/classes_def.xml b/Fireworks/Core/src/classes_def.xml
index 69e8e51c00b23..b16f438d83a01 100644
--- a/Fireworks/Core/src/classes_def.xml
+++ b/Fireworks/Core/src/classes_def.xml
@@ -36,4 +36,40 @@
   <class name="FWEveDigitSetScalableMarker"/>
   <class name="FWEveDigitSetScalableMarkerGL"/>
   <class name="FW3DViewDistanceMeasureTool"/>
+
+  <class name="FWGUIEventDataAdder"/>
+  <class name="CSGConnector"/>
+  <class name="FWIntValueListenerBase"/>
+  <class name="FWColorFrame"/>
+  <class name="FWColorPopup"/>
+  <class name="FWColorRow"/>
+  <class name="FWColorSelect"/>
+  <class name="FWNumberEntryField"/>
+  <class name="FWCollectionSummaryWidget"/>
+  <class name="FWSummaryManager"/>
+  <class name="FWCompactVerticalLayout"/>
+  <class name="FWModelContextMenuHandler"/>
+  <class name="CmsShowEDI"/>
+  <class name="FWViewEnergyScaleEditor"/>
+  <class name="CmsShowSearchFiles"/>
+  <class name="FWGUISubviewArea"/>
+  <class name="CmsShowMainFrame"/>
+  <class name="FWGUIValidatingTextEntry"/>
+  <class name="CmsShowModelPopup"/>
+  <class name="FWGUIEventFilter"/>
+  <class name="CmsShowCommonPopup"/>
+  <class name="CmsShowViewPopup"/>
+  <class name="FWInvMassDialog"/>
+  <class name="FWEveText"/>
+  <class name="FWEveTextProjected"/>
+  <class name="FWEveTextGL"/>
+  <class name="FWInvMassDialog"/>
+  <class name="FWGeometryTableViewBase"/>
+  <class name="FWGeometryTableView"/>
+  <class name="FWOverlapTableView"/>
+  <class name="FWGeoTopNode"/>
+  <class name="FWEveOverlap"/>
+  <class name="FWEveDetectorGeo"/>
+  <class name="FWGeoTopNodeGL"/>
+
 </lcgdict>
diff --git a/Fireworks/Eve/BuildFile.xml b/Fireworks/Eve/BuildFile.xml
index 74c5f9ad986d2..4a7abd56e381c 100644
--- a/Fireworks/Eve/BuildFile.xml
+++ b/Fireworks/Eve/BuildFile.xml
@@ -5,6 +5,7 @@
 <use name="rootcore"/>
 <use name="rootinteractive"/>
 <lib name="Geom"/>
+<lib name="Gui"/>
 <lib name="Eve"/>
 <export>
 <lib name="1"/>
diff --git a/Fireworks/Eve/python/testEve_cfg.py b/Fireworks/Eve/python/testEve_cfg.py
index fa4e31d670b5a..7e24b449b688a 100644
--- a/Fireworks/Eve/python/testEve_cfg.py
+++ b/Fireworks/Eve/python/testEve_cfg.py
@@ -7,7 +7,7 @@
 ### Expects test.root in current directory.
 process.source = cms.Source(
     "PoolSource",
-    fileNames=cms.untracked.vstring('file:test.root')
+    fileNames=cms.untracked.vstring('file:/home/alja/cms-dev/7.3/RelValZEE-reco.root')
 )
 
 # process.maxEvents = cms.untracked.PSet(
diff --git a/Fireworks/Eve/src/FireworksEveLinkDef.h b/Fireworks/Eve/src/FireworksEveLinkDef.h
deleted file mode 100644
index 7691369de3415..0000000000000
--- a/Fireworks/Eve/src/FireworksEveLinkDef.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "Fireworks/Eve/interface/EveService.h"
-
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-#pragma link C++ class EveService;
-
-#endif
diff --git a/Fireworks/Eve/src/classes.h b/Fireworks/Eve/src/classes.h
new file mode 100644
index 0000000000000..064a0adbe4505
--- /dev/null
+++ b/Fireworks/Eve/src/classes.h
@@ -0,0 +1,2 @@
+#include "Fireworks/Eve/interface/EveService.h"
+
diff --git a/Fireworks/Eve/src/classes_def.xml b/Fireworks/Eve/src/classes_def.xml
new file mode 100644
index 0000000000000..8178072c3438f
--- /dev/null
+++ b/Fireworks/Eve/src/classes_def.xml
@@ -0,0 +1,3 @@
+<lcgdict>
+  <class name="EveService"/>
+</lcgdict>
diff --git a/Fireworks/FWInterface/BuildFile.xml b/Fireworks/FWInterface/BuildFile.xml
index cf115689bdefd..7949c0dd89e25 100644
--- a/Fireworks/FWInterface/BuildFile.xml
+++ b/Fireworks/FWInterface/BuildFile.xml
@@ -13,6 +13,8 @@
 <lib name="Geom"/>
 <lib name="Eve"/>
 <lib name="RGL"/>
+<lib name="GuiHtml"/>
+<lib name="GX11"/>
 <export>
 <lib name="1"/>
 </export>
diff --git a/Fireworks/FWInterface/src/FireworksFWInterfaceLinkDef.h b/Fireworks/FWInterface/src/FireworksFWInterfaceLinkDef.h
deleted file mode 100644
index c7981b8bfd6f3..0000000000000
--- a/Fireworks/FWInterface/src/FireworksFWInterfaceLinkDef.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "Fireworks/FWInterface/src/FWPathsPopup.h"
-
-#ifdef __CINT__
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-#pragma link C++ class FWPathsPopup;
-
-#endif
diff --git a/Fireworks/FWInterface/src/classes.h b/Fireworks/FWInterface/src/classes.h
new file mode 100644
index 0000000000000..cf4712939f913
--- /dev/null
+++ b/Fireworks/FWInterface/src/classes.h
@@ -0,0 +1,2 @@
+#include "Fireworks/FWInterface/src/FWPathsPopup.h"
+
diff --git a/Fireworks/FWInterface/src/classes_def.xml b/Fireworks/FWInterface/src/classes_def.xml
new file mode 100644
index 0000000000000..aea744ae56e5f
--- /dev/null
+++ b/Fireworks/FWInterface/src/classes_def.xml
@@ -0,0 +1,3 @@
+<lcgdict>
+  <class name="FWPathsPopup"/>
+</lcgdict>
diff --git a/Fireworks/TableWidget/src/FireworksTableWidgetLinkDef.h b/Fireworks/TableWidget/src/FireworksTableWidgetLinkDef.h
deleted file mode 100644
index b17640d9df0ff..0000000000000
--- a/Fireworks/TableWidget/src/FireworksTableWidgetLinkDef.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "Fireworks/TableWidget/interface/FWTableWidget.h"
-#include "Fireworks/TableWidget/interface/FWTableManagerBase.h"
-#include "Fireworks/TableWidget/interface/FWCheckedTextTableCellRenderer.h"
-#include "Fireworks/TableWidget/src/FWTabularWidget.h"
-
-#ifdef __CINT__
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-#pragma link C++ class FWTabularWidget;
-#pragma link C++ class FWTableWidget;
-#pragma link C++ class FWTableManagerBase;
-#pragma link C++ class FWCheckedTextTableCellRenderer;
-#endif
-
diff --git a/Fireworks/TableWidget/src/classes.h b/Fireworks/TableWidget/src/classes.h
new file mode 100644
index 0000000000000..67f1e2d806f20
--- /dev/null
+++ b/Fireworks/TableWidget/src/classes.h
@@ -0,0 +1,4 @@
+#include "Fireworks/TableWidget/interface/FWTableWidget.h"
+#include "Fireworks/TableWidget/interface/FWTableManagerBase.h"
+#include "Fireworks/TableWidget/interface/FWCheckedTextTableCellRenderer.h"
+#include "Fireworks/TableWidget/src/FWTabularWidget.h"
diff --git a/Fireworks/TableWidget/src/classes_def.xml b/Fireworks/TableWidget/src/classes_def.xml
new file mode 100644
index 0000000000000..2b99aa4ebda6e
--- /dev/null
+++ b/Fireworks/TableWidget/src/classes_def.xml
@@ -0,0 +1,6 @@
+<lcgdict>
+  <class name="FWTabularWidget"/>
+  <class name="FWTableWidget"/>
+  <class name="FWTableManagerBase"/>
+  <class name="FWCheckedTextTableCellRenderer"/>
+</lcgdict>
\ No newline at end of file
diff --git a/Fireworks/Vertices/BuildFile.xml b/Fireworks/Vertices/BuildFile.xml
index 9d91d36ce2602..f99abdc429bd0 100644
--- a/Fireworks/Vertices/BuildFile.xml
+++ b/Fireworks/Vertices/BuildFile.xml
@@ -6,6 +6,7 @@
 <lib name="Geom"/>
 <lib name="Physics"/>
 <lib name="RGL"/>
+<lib name="Core"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/Fireworks/Vertices/plugins/BuildFile.xml b/Fireworks/Vertices/plugins/BuildFile.xml
index ea6c4d749b171..8bda6bc5a92e8 100644
--- a/Fireworks/Vertices/plugins/BuildFile.xml
+++ b/Fireworks/Vertices/plugins/BuildFile.xml
@@ -7,5 +7,6 @@
  <use name="roothistmatrix"/>
  <lib name="Eve"/>
  <lib name="Geom"/>
+ <lib name="Core"/>
  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Fireworks/Vertices/src/FireworksVerticesLinkDef.h b/Fireworks/Vertices/src/FireworksVerticesLinkDef.h
deleted file mode 100644
index 8d94b57b2c746..0000000000000
--- a/Fireworks/Vertices/src/FireworksVerticesLinkDef.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "Fireworks/Vertices/interface/TEveEllipsoid.h"
-#include "Fireworks/Vertices/interface/TEveEllipsoidGL.h"
-
-#ifdef __CINT__
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-#pragma link C++ class TEveEllipsoid;
-#pragma link C++ class TEveEllipsoidGL;
-#pragma link C++ class TEveEllipsoidProjected;
-#pragma link C++ class TEveEllipsoidProjectedGL;
-#endif
diff --git a/Fireworks/Vertices/src/classes.h b/Fireworks/Vertices/src/classes.h
new file mode 100644
index 0000000000000..99588bd4d0968
--- /dev/null
+++ b/Fireworks/Vertices/src/classes.h
@@ -0,0 +1,4 @@
+#include "Fireworks/Vertices/interface/TEveEllipsoid.h"
+#include "Fireworks/Vertices/interface/TEveEllipsoidGL.h"
+
+
diff --git a/Fireworks/Vertices/src/classes_def.xml b/Fireworks/Vertices/src/classes_def.xml
new file mode 100644
index 0000000000000..f59c65cc740aa
--- /dev/null
+++ b/Fireworks/Vertices/src/classes_def.xml
@@ -0,0 +1,6 @@
+<lcgdict>
+  <class name="TEveEllipsoid"/>
+  <class name="TEveEllipsoidGL"/>
+  <class name="TEveEllipsoidProjected"/>
+  <class name="TEveEllipsoidProjectedGL"/>
+</lcgdict>