2 files changed, 7 insertions, 9 deletions
diff --git a/src/model/types/Type.hpp b/src/model/types/Type.hpp
index 155f898..c4a9900 100644
--- a/src/model/types/Type.hpp
+++ b/src/model/types/Type.hpp
@@ -16,18 +16,16 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _TYPE_HPP_
-#define _TYPE_HPP_
-
-#include <model/GraphNode.hpp>
+#ifndef _OUSIA_TYPES_TYPE_HPP_
+#define _OUSIA_TYPES_TYPE_HPP_
 
 namespace ousia {
 namespace types {
 
-class Type : public GraphNode {
+class Type {
 
 //TODO: THIS IS A DUMMY CLASS DECLARATION
 };
 }
 }
-#endif /* _TYPE_HPP_ */
+#endif /* _OUSIA_TYPES_TYPE_HPP_ */
diff --git a/src/model/types/Value.hpp b/src/model/types/Value.hpp
index 3076dd2..ec9f354 100644
--- a/src/model/types/Value.hpp
+++ b/src/model/types/Value.hpp
@@ -16,8 +16,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _VALUE_HPP_
-#define _VALUE_HPP_
+#ifndef _OUSIA_TYPES_VALUE_HPP_
+#define _OUSIA_TYPES_VALUE_HPP_
 
 namespace ousia {
 namespace types {
@@ -28,4 +28,4 @@ class Value {
 };
 }
 }
-#endif /* _VALUE_HPP_ */
+#endif /* _OUSIA_TYPES_VALUE_HPP_ */