diff --git a/PhysicsTools/TagAndProbe/src/PhysicsToolsTagAndProbeLinkDef.h b/PhysicsTools/TagAndProbe/src/PhysicsToolsTagAndProbeLinkDef.h
deleted file mode 100644
index 57b9e7c379675..0000000000000
--- a/PhysicsTools/TagAndProbe/src/PhysicsToolsTagAndProbeLinkDef.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma GCC diagnostic ignored "-Wwrite-strings" //needed to get rid of pesky "deprecated conversion from string constant to char *" compilation error
-#include "PhysicsTools/TagAndProbe/interface/RooCBExGaussShape.h"
-#include "PhysicsTools/TagAndProbe/interface/ZGeneratorLineShape.h"
-#include "PhysicsTools/TagAndProbe/interface/RooCMSShape.h"
-#include "TVirtualFFT.h"
-
-#ifdef __CINT__
-
-//never even gets here...
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-//#pragma GCC diagnostic ignored "-Wformat"
-// #pragma GCC diagnostic warning "-Wwrite-strings"
-
-#pragma link C++ class RooCBExGaussShape;
-#pragma link C++ class ZGeneratorLineShape;
-#pragma link C++ class RooCMSShape;
-
-
-#pragma link C++ global gROOT;
-#pragma link C++ global gEnv;
-
-
-#endif
diff --git a/PhysicsTools/TagAndProbe/src/classes.h b/PhysicsTools/TagAndProbe/src/classes.h
new file mode 100644
index 0000000000000..bc016ebb78d85
--- /dev/null
+++ b/PhysicsTools/TagAndProbe/src/classes.h
@@ -0,0 +1,9 @@
+#include "PhysicsTools/TagAndProbe/interface/RooCBExGaussShape.h"
+#include "PhysicsTools/TagAndProbe/interface/ZGeneratorLineShape.h"
+#include "PhysicsTools/TagAndProbe/interface/RooCMSShape.h"
+#include "TVirtualFFT.h"
+
+namespace PhysicsTools_TagAndProbe {
+  struct dictionary {
+  };
+}
diff --git a/PhysicsTools/TagAndProbe/src/classes_def.xml b/PhysicsTools/TagAndProbe/src/classes_def.xml
new file mode 100644
index 0000000000000..5b02fca94e0c8
--- /dev/null
+++ b/PhysicsTools/TagAndProbe/src/classes_def.xml
@@ -0,0 +1,5 @@
+<lcgdict>
+  <class name="RooCBExGaussShape"/>
+  <class name="ZGeneratorLineShape"/>
+  <class name="RooCMSShape"/>
+</lcgdict>