diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h
index 9a02be006bc..453f98272c1 100644
--- a/src/libs/qmljs/qmljsdocument.h
+++ b/src/libs/qmljs/qmljsdocument.h
@@ -212,7 +212,7 @@ public:
 
 class QMLJS_EXPORT Snapshot
 {
-    typedef QHash<QString, Document::Ptr> _Base;
+    typedef QHash<QString, Document::Ptr> Base;
     QHash<QString, Document::Ptr> _documents;
     QHash<QString, QList<Document::Ptr> > _documentsByPath;
     QHash<QString, LibraryInfo> _libraries;
@@ -223,8 +223,8 @@ public:
     Snapshot(const Snapshot &o);
     ~Snapshot();
 
-    typedef _Base::iterator iterator;
-    typedef _Base::const_iterator const_iterator;
+    typedef Base::iterator iterator;
+    typedef Base::const_iterator const_iterator;
 
     const_iterator begin() const { return _documents.begin(); }
     const_iterator end() const { return _documents.end(); }
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index 0a374ce7bb2..f4721b99571 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -156,10 +156,10 @@ public:
     virtual bool getSourceLocation(QString *fileName, int *line, int *column) const;
 };
 
-template <typename _RetTy> const _RetTy *value_cast(const Value *)
+template <typename RetTy> const RetTy *value_cast(const Value *)
 {
     // Produce a good error message if a specialization is missing.
-    _RetTy::ERROR_MissingValueCastSpecialization();
+    RetTy::ERROR_MissingValueCastSpecialization();
     return 0;
 }