--- a/src/ov-usr-fcn.h
+++ b/src/ov-usr-fcn.h
@@ -30,14 +30,13 @@
 #include <ctime>
 
 #include <string>
+#include <stack>
 
 #include "comment-list.h"
 #include "oct-obj.h"
 #include "ov-fcn.h"
 #include "ov-typeinfo.h"
 
-#include "SLStack.h"
-
 class string_vector;
 
 class octave_value;
@@ -134,7 +133,10 @@
       if (saved_args.empty ())
 	args_passed = octave_value_list ();
       else
-	args_passed = saved_args.pop ();
+	{
+	  args_passed = saved_args.top ();
+	  saved_args.pop ();
+	}
     }
 
   octave_value_list subsref (const std::string type,
@@ -213,7 +215,7 @@
   octave_value_list args_passed;
 
   // A place to store the passed args for recursive calls.
-  SLStack<octave_value_list> saved_args;
+  std::stack<octave_value_list> saved_args;
 
   // The number of arguments passed in.
   int num_args_passed;