diff --git a/LedOK/gutil/cpp.h b/LedOK/gutil/cpp.h
index 2a36e87..2562ef2 100644
--- a/LedOK/gutil/cpp.h
+++ b/LedOK/gutil/cpp.h
@@ -85,9 +85,7 @@ template <class V>
 class Vector : public SharedPtr<std::vector<V>> {
 public:
     using SharedPtr<std::vector<V>>::SharedPtr;
-
-    using iterator       = std::_Vector_iterator<std::_Vector_val<std::_Simple_types<V>>>;
-    using const_iterator = std::_Vector_const_iterator<std::_Vector_val<std::_Simple_types<V>>>;
+    typedef typename std::vector<V>::iterator iterator;
 
     Vector(std::initializer_list<V> _Ilist) {
         this->ptr = new SharedData<std::vector<V>>{1, _Ilist};
@@ -98,7 +96,7 @@ public:
         return *this;
     }
     Vector &append(V&& val) {
-        (*this)->push_back(_STD move(val));
+        (*this)->push_back(std::move(val));
         return *this;
     }
     Vector &operator<<(const V &val) {
@@ -106,7 +104,7 @@ public:
         return *this;
     }
     Vector &operator<<(V&& val) {
-        (*this)->push_back(_STD move(val));
+        (*this)->push_back(std::move(val));
         return *this;
     }
 
@@ -127,8 +125,8 @@ public:
 
 
 struct NodeBase {
-    NodeBase *next{this};
-    NodeBase *prev{this};
+    NodeBase *next = this;
+    NodeBase *prev = this;
 };
 template <class P>
 struct _Node : NodeBase {