diff --git a/src/examples/misc/RootDatamodelExample/CMakeLists.txt b/src/examples/misc/RootDatamodelExample/CMakeLists.txt
index 589ff9cf0..7dd974de0 100644
--- a/src/examples/misc/RootDatamodelExample/CMakeLists.txt
+++ b/src/examples/misc/RootDatamodelExample/CMakeLists.txt
@@ -14,7 +14,7 @@ if(${USE_ROOT})
 	include_directories(${CMAKE_CURRENT_SOURCE_DIR})
     set(my_pcms)
     foreach( CLASS Hit Cluster )
-        ROOT_GENERATE_DICTIONARY(G__${CLASS} ${CLASS}.h)
+        ROOT_GENERATE_DICTIONARY(G__${CLASS} ${CLASS}.h LINKDEF ${CLASS}_LinkDef.h)
         list(APPEND my_pcms ${CMAKE_CURRENT_BINARY_DIR}/lib${CLASS}_rdict.pcm )
     endforeach()
 
diff --git a/src/examples/misc/RootDatamodelExample/Cluster_LinkDef.h b/src/examples/misc/RootDatamodelExample/Cluster_LinkDef.h
new file mode 100644
index 000000000..1d095ceed
--- /dev/null
+++ b/src/examples/misc/RootDatamodelExample/Cluster_LinkDef.h
@@ -0,0 +1,9 @@
+#ifdef __CLING__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class Cluster+;
+
+#endif
diff --git a/src/examples/misc/RootDatamodelExample/Hit_LinkDef.h b/src/examples/misc/RootDatamodelExample/Hit_LinkDef.h
new file mode 100644
index 000000000..5a60697f2
--- /dev/null
+++ b/src/examples/misc/RootDatamodelExample/Hit_LinkDef.h
@@ -0,0 +1,9 @@
+#ifdef __CLING__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class Hit+;
+
+#endif
diff --git a/src/plugins/janaview/CMakeLists.txt b/src/plugins/janaview/CMakeLists.txt
index 5a1c5943a..9bc7ae051 100644
--- a/src/plugins/janaview/CMakeLists.txt
+++ b/src/plugins/janaview/CMakeLists.txt
@@ -3,7 +3,7 @@
 if(USE_ROOT)
 
     find_package(ROOT REQUIRED COMPONENTS Gui Core RIO Net Hist Graf Graf3d Gpad Tree Rint Postscript Matrix Physics MathCore Thread MultiProc)
-    ROOT_GENERATE_DICTIONARY(G__jv_mainframe jv_mainframe.h)
+    ROOT_GENERATE_DICTIONARY(G__jv_mainframe jv_mainframe.h LINKDEF jv_mainframe_LinkDef.h)
 
     file(GLOB JANAVIEW_HEADERS "*.h*")
 
diff --git a/src/plugins/janaview/jv_mainframe_LinkDef.h b/src/plugins/janaview/jv_mainframe_LinkDef.h
new file mode 100644
index 000000000..27b1fa8d3
--- /dev/null
+++ b/src/plugins/janaview/jv_mainframe_LinkDef.h
@@ -0,0 +1,9 @@
+#ifdef __CLING__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class jv_mainframe+;
+
+#endif