diff --git a/finalize/finalize.cpp b/finalize/finalize.cpp
index b02ab99..e7899bf 100644
--- a/finalize/finalize.cpp
+++ b/finalize/finalize.cpp
@@ -12,8 +12,8 @@ ipin <label> <target uid> <field offset>
 ipin <label> <target uid> <field offset>
 ipin <label> <target uid> <field offset>
 ...
-dpin <symbol> <offset> <level> <target uid>
-dpin <symbol> <offset> <level> <target uid>
+dpin <local/global> <symbol> <offset> <level> <target uid>
+dpin <local/global> <symbol> <offset> <level> <target uid>
 ...
 
 
diff --git a/pinpoint/final/on_finish_unit.cpp b/pinpoint/final/on_finish_unit.cpp
index 8ef2502..7c5e603 100644
--- a/pinpoint/final/on_finish_unit.cpp
+++ b/pinpoint/final/on_finish_unit.cpp
@@ -19,7 +19,8 @@ void on_finish_unit(void* plugin_data, void* user_data) {
 		std::cout << "    Target " << uid << " -> \"" << target.name() << "\" (" << target.size() << ")" << std::endl;
 
 	for (const DataPin& dpin : dpins()) {
-		std::cout << "    Data pin at symbol \"" << dpin.symbol << "\":" << std::endl;
+		std::cout << "    " << (dpin.global ? "Global" : "Local") << " data pin at symbol \""
+			<< dpin.symbol << "\":" << std::endl;
 		for (const DataPin::Component& c : dpin.components)
 			std::cout << "        offset " << c.offset << " (level " << c.level << ") -> target " << c.target << std::endl;
 	}
diff --git a/pinpoint/stage0/on_finish_decl.cpp b/pinpoint/stage0/on_finish_decl.cpp
index 43c65a4..dd0ec8c 100644
--- a/pinpoint/stage0/on_finish_decl.cpp
+++ b/pinpoint/stage0/on_finish_decl.cpp
@@ -55,8 +55,7 @@ static void on_static_var(tree var) {
 		return;
 
 	DECL_PRESERVE_P(var) = 1;
-	DECL_VISIBILITY(var) = VISIBILITY_DEFAULT;
-	DECL_VISIBILITY_SPECIFIED(var) = 1;
+	pin.global = static_cast<bool>(TREE_PUBLIC(var));
 
 	tree symbol_tree = DECL_ASSEMBLER_NAME(var);
 	const char* symbol;
diff --git a/pinpoint/stage0/stage0.h b/pinpoint/stage0/stage0.h
index 30e2a22..9ae9580 100644
--- a/pinpoint/stage0/stage0.h
+++ b/pinpoint/stage0/stage0.h
@@ -77,6 +77,7 @@ struct DataPin {
 	};
 
 	std::string symbol;
+	bool global;
 	std::list<Component> components;
 };
 
diff --git a/subject/main.c b/subject/main.c
index 737d062..30729e3 100644
--- a/subject/main.c
+++ b/subject/main.c
@@ -3,7 +3,7 @@
 int second_pid();
 int third_pid();
 
-struct task_struct global = { .pid = 42, .comm = "main_global" };
+extern struct task_struct global = { .pid = 42, .comm = "main_global" };
 
 int main(void)
 {