diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd96d24..02ed079 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,9 @@ include(FetchContent)
 FetchContent_Declare(
         endstone
         GIT_REPOSITORY https://github.com/EndstoneMC/endstone.git
-        GIT_TAG v0.5.5 # TODO: CHANGE ME to the actual version you are using
+        GIT_TAG main # TODO: CHANGE ME to the actual version you are using
 )
 FetchContent_MakeAvailable(endstone)
 
 endstone_add_plugin(${PROJECT_NAME} src/example_plugin.cpp)
+target_include_directories(${PROJECT_NAME} PRIVATE include)
diff --git a/include/example_listener.h b/include/example_listener.h
index 51d2102..6082834 100644
--- a/include/example_listener.h
+++ b/include/example_listener.h
@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <endstone/event/server/server_load_event.h>
-#include <endstone/plugin/plugin.h>
+#include <endstone/endstone.hpp>
 
 class ExampleListener {
 public:
diff --git a/include/example_plugin.h b/include/example_plugin.h
index 9258ac6..ce17b6f 100644
--- a/include/example_plugin.h
+++ b/include/example_plugin.h
@@ -1,13 +1,11 @@
 // Copyright (c) 2024, The Endstone Project. (https://endstone.dev) All Rights Reserved.
 
+#pragma once
+
 #include "example_listener.h"
 #include "fibonacci_command.h"
 
-#include <endstone/color_format.h>
-#include <endstone/command/plugin_command.h>
-#include <endstone/event/server/server_command_event.h>
-#include <endstone/event/server/server_load_event.h>
-#include <endstone/plugin/plugin.h>
+#include <endstone/endstone.hpp>
 #include <memory>
 #include <vector>
 
diff --git a/include/fibonacci_command.h b/include/fibonacci_command.h
index 6fee6c0..3610818 100644
--- a/include/fibonacci_command.h
+++ b/include/fibonacci_command.h
@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <endstone/command/command.h>
-#include <endstone/command/command_executor.h>
+#include <endstone/endstone.hpp>
 #include <string>
 
 class FibonacciCommandExecutor : public endstone::CommandExecutor {