diff --git a/apps/shared/Makefile b/apps/shared/Makefile
index 28f6a1e12..db1d6dd7f 100644
--- a/apps/shared/Makefile
+++ b/apps/shared/Makefile
@@ -9,7 +9,6 @@ app_objs += $(addprefix apps/shared/,\
   curve_view_range.o\
   double_pair_store.o\
   editable_cell_table_view_controller.o\
-  expiring_pointer.o\
   expression_field_delegate_app.o\
   expression_model.o\
   expression_model_list_controller.o\
diff --git a/apps/shared/expiring_pointer.cpp b/apps/shared/expiring_pointer.cpp
deleted file mode 100644
index 6f7096e24..000000000
--- a/apps/shared/expiring_pointer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "expiring_pointer.h"
-#include "storage_expression_model.h"
-#include "storage_cartesian_function.h"
-#include "storage_function.h"
-
-namespace Shared {
-
-#if DEBUG
-template<>
-StorageExpressionModel * ExpiringPointer<StorageExpressionModel>::s_global = nullptr;
-template<>
-StorageFunction * ExpiringPointer<StorageFunction>::s_global = nullptr;
-template<>
-StorageCartesianFunction * ExpiringPointer<StorageCartesianFunction>::s_global = nullptr;
-#endif
-
-}
diff --git a/apps/shared/expiring_pointer.h b/apps/shared/expiring_pointer.h
index 75cdbe5c4..85642ef02 100644
--- a/apps/shared/expiring_pointer.h
+++ b/apps/shared/expiring_pointer.h
@@ -32,6 +32,11 @@ private:
   T * m_rawPointer;
 };
 
+#if DEBUG
+template<class T>
+T * ExpiringPointer<T>::s_global = nullptr;
+#endif
+
 }
 
 #endif