diff --git a/Doxyfile b/Doxyfile
index 792c2a4..faeaa63 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -99,7 +99,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = include/evmc.h
+INPUT                  = include/evmc/evmc.h
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO
diff --git a/examples/capi.c b/examples/capi.c
index 16cf165..cfa275e 100644
--- a/examples/capi.c
+++ b/examples/capi.c
@@ -1,4 +1,4 @@
-#include <evmc.h>
+#include <evmc/evmc.h>
 
 #include <inttypes.h>
 #include <string.h>
diff --git a/examples/examplevm/examplevm.h b/examples/examplevm/examplevm.h
index 4e5e65a..f1ebf98 100644
--- a/examples/examplevm/examplevm.h
+++ b/examples/examplevm/examplevm.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <evmc.h>
+#include <evmc/evmc.h>
 
 /**
  * Creates EVMC Example VM.
diff --git a/include/evmc.h b/include/evmc/evmc.h
similarity index 100%
rename from include/evmc.h
rename to include/evmc/evmc.h
diff --git a/test/vmtester/vmtester.cpp b/test/vmtester/vmtester.cpp
index d01a056..30c58af 100644
--- a/test/vmtester/vmtester.cpp
+++ b/test/vmtester/vmtester.cpp
@@ -1,13 +1,9 @@
-// EVMC -- Ethereum Client-VM Connector API
+// EVMC: Ethereum Client-VM Connector API.
 // Copyright 2018 Pawel Bylica.
 // Licensed under the MIT License. See the LICENSE file.
 
 #include "vmtester.hpp"
 
-#include <evmc.h>
-
-#include <gtest/gtest.h>
-
 #include <boost/dll.hpp>
 #include <boost/dll/alias.hpp>
 #include <boost/function.hpp>
diff --git a/test/vmtester/vmtester.hpp b/test/vmtester/vmtester.hpp
index 90f7668..a815dd4 100644
--- a/test/vmtester/vmtester.hpp
+++ b/test/vmtester/vmtester.hpp
@@ -1,8 +1,11 @@
-// EVMC -- Ethereum Client-VM Connector API
+// EVMC: Ethereum Client-VM Connector API
 // Copyright 2018 Pawel Bylica.
 // Licensed under the MIT License. See the LICENSE file.
 
-#include <evmc.h>
+#pragma once
+
+#include <evmc/evmc.h>
+
 #include <gtest/gtest.h>
 
 evmc_instance* get_vm_instance();