diff --git a/builds/win32/msvc12/common.vcxproj b/builds/win32/msvc12/common.vcxproj
index 449ad3c6ba..49fe82043f 100644
--- a/builds/win32/msvc12/common.vcxproj
+++ b/builds/win32/msvc12/common.vcxproj
@@ -154,7 +154,6 @@
-
diff --git a/builds/win32/msvc12/common.vcxproj.filters b/builds/win32/msvc12/common.vcxproj.filters
index ffc6d9c8fe..8e383410b6 100644
--- a/builds/win32/msvc12/common.vcxproj.filters
+++ b/builds/win32/msvc12/common.vcxproj.filters
@@ -467,9 +467,6 @@
headers
-
- headers
-
headers
diff --git a/builds/win32/msvc14/common.vcxproj b/builds/win32/msvc14/common.vcxproj
index ff4e726c80..92535eb870 100644
--- a/builds/win32/msvc14/common.vcxproj
+++ b/builds/win32/msvc14/common.vcxproj
@@ -155,7 +155,6 @@
-
diff --git a/builds/win32/msvc14/common.vcxproj.filters b/builds/win32/msvc14/common.vcxproj.filters
index 4da18bbba5..16fd5664eb 100644
--- a/builds/win32/msvc14/common.vcxproj.filters
+++ b/builds/win32/msvc14/common.vcxproj.filters
@@ -470,9 +470,6 @@
headers
-
- headers
-
headers
diff --git a/builds/win32/msvc15/common.vcxproj b/builds/win32/msvc15/common.vcxproj
index b69bde6772..b2f779e8a6 100644
--- a/builds/win32/msvc15/common.vcxproj
+++ b/builds/win32/msvc15/common.vcxproj
@@ -155,7 +155,6 @@
-
diff --git a/builds/win32/msvc15/common.vcxproj.filters b/builds/win32/msvc15/common.vcxproj.filters
index 776d4a9db7..4eed236250 100644
--- a/builds/win32/msvc15/common.vcxproj.filters
+++ b/builds/win32/msvc15/common.vcxproj.filters
@@ -470,9 +470,6 @@
headers
-
- headers
-
headers
diff --git a/src/common/classes/TriState.h b/src/common/classes/TriState.h
deleted file mode 100644
index 9c5c5d93aa..0000000000
--- a/src/common/classes/TriState.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * PROGRAM: Firebird aux classes.
- * MODULE: TriState.h
- * DESCRIPTION: Firebird's SQL tri-state emulation class.
- *
- * The contents of this file are subject to the Initial
- * Developer's Public License Version 1.0 (the "License");
- * you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
- *
- * Software distributed under the License is distributed AS IS,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied.
- * See the License for the specific language governing rights
- * and limitations under the License.
- *
- * The Original Code was created by Claudio Valderrama on 28-Aug-2007
- * for the Firebird Open Source RDBMS project.
- *
- * Copyright (c) 2007 Claudio Valderrama
- * and all contributors signed below.
- *
- * All Rights Reserved.
- * Contributor(s): ______________________________________.
- *
- *
- */
-
-#ifndef CLASSES_TRISTATE_H
-#define CLASSES_TRISTATE_H
-
-
-class TriState
-{
-public:
- TriState();
- explicit TriState(bool input);
-
- void operator=(bool input);
-
- bool asBool() const;
- void reset();
- bool assignOnce(bool input);
- bool isUnknown() const;
- bool isAssigned() const;
- bool toggle();
-
-private:
- bool m_init, m_val;
-};
-
-// The var is left uninitialized.
-inline TriState::TriState()
- : m_init(false), m_val(false)
-{
-}
-
-// The var is initialized to the explicit value.
-inline TriState::TriState(bool input)
- : m_init(true), m_val(input)
-{
-}
-
-// The var receives a T/F value.
-inline void TriState::operator=(bool input)
-{
- m_init = true;
- m_val = input;
-}
-
-// The var is coerced to a T/F value as result.
-inline bool TriState::asBool() const
-{
- return m_init && m_val;
-}
-
-// The var is returned to its uninitialized state.
-inline void TriState::reset()
-{
- m_init = m_val = false;
-}
-
-// The assignment succeeds only if the var is uninitialized.
-inline bool TriState::assignOnce(bool input)
-{
- if (m_init)
- return false;
-
- m_init = true;
- m_val = input;
- return true;
-}
-
-// Tests whether the var is uninitialized.
-inline bool TriState::isUnknown() const
-{
- return !m_init;
-}
-
-// Tests whether the var is initialized.
-inline bool TriState::isAssigned() const
-{
- return m_init;
-}
-
-// The var is toggled between T and F only if it's already initialized.
-inline bool TriState::toggle()
-{
- if (!m_init)
- return false;
-
- m_val = !m_val;
- return true;
-}
-
-
-#endif // CLASSES_TRISTATE_H