diff --git a/expkg/src/BinaryOPT/BinaryReader.cpp b/expkg/src/BinaryOPT/BinaryReader.cpp
index 5aaed08..24dc40f 100644
--- a/expkg/src/BinaryOPT/BinaryReader.cpp
+++ b/expkg/src/BinaryOPT/BinaryReader.cpp
@@ -5,9 +5,7 @@
 #include "BinaryReader.h"
 
 #include <filesystem>
-#include <fstream>
 #include <iostream>
-#include <vector>
 
 namespace PKG
 {
diff --git a/expkg/src/BinaryOPT/BinaryReader.h b/expkg/src/BinaryOPT/BinaryReader.h
index ca617cd..0c9d560 100644
--- a/expkg/src/BinaryOPT/BinaryReader.h
+++ b/expkg/src/BinaryOPT/BinaryReader.h
@@ -4,12 +4,13 @@
 
 #ifndef BINARYREADER_H
 #define BINARYREADER_H
-#include <cstdint>
+
 #include <filesystem>
 #include <fstream>
 #include <vector>
 
-#include "../Core.h"
+#include "Core.h"
+
 
 namespace PKG
 {
diff --git a/expkg/src/BinaryOPT/BinaryWriter.cpp b/expkg/src/BinaryOPT/BinaryWriter.cpp
index e9fe624..96ce3c3 100644
--- a/expkg/src/BinaryOPT/BinaryWriter.cpp
+++ b/expkg/src/BinaryOPT/BinaryWriter.cpp
@@ -5,7 +5,6 @@
 #include "BinaryWriter.h"
 
 #include <filesystem>
-#include <fstream>
 #include <iostream>
 
 namespace PKG
diff --git a/expkg/src/BinaryOPT/BinaryWriter.h b/expkg/src/BinaryOPT/BinaryWriter.h
index ccf2b38..3e168aa 100644
--- a/expkg/src/BinaryOPT/BinaryWriter.h
+++ b/expkg/src/BinaryOPT/BinaryWriter.h
@@ -7,9 +7,8 @@
 
 #include <filesystem>
 #include <fstream>
-#include <vector>
 
-#include "../Core.h"
+#include "Core.h"
 
 namespace PKG
 {
diff --git a/expkg/src/BinaryOPT/ImageReader.cpp b/expkg/src/BinaryOPT/ImageReader.cpp
index 1e775a2..c628447 100644
--- a/expkg/src/BinaryOPT/ImageReader.cpp
+++ b/expkg/src/BinaryOPT/ImageReader.cpp
@@ -4,10 +4,8 @@
 
 #include "ImageReader.h"
 
-#include <filesystem>
 #include <iostream>
 
-#include "BinaryWriter.h"
 #include "lz4.h"
 
 
diff --git a/expkg/src/BinaryOPT/ImageReader.h b/expkg/src/BinaryOPT/ImageReader.h
index 7699af9..87ba0b3 100644
--- a/expkg/src/BinaryOPT/ImageReader.h
+++ b/expkg/src/BinaryOPT/ImageReader.h
@@ -4,8 +4,8 @@
 
 #ifndef IMAGEREADER_H
 #define IMAGEREADER_H
-#include "BinaryReader.h"
-#include "../Tex/TexImageContainer.h"
+#include "BinaryOPT/BinaryReader.h"
+#include "Tex/TexImageContainer.h"
 
 namespace PKG
 {
diff --git a/expkg/src/EXPKG/EXPKG.cpp b/expkg/src/EXPKG/EXPKG.cpp
index 7e3432a..429aafc 100644
--- a/expkg/src/EXPKG/EXPKG.cpp
+++ b/expkg/src/EXPKG/EXPKG.cpp
@@ -4,12 +4,11 @@
 
 #include "EXPKG.h"
 
-#include "BinaryOPT/BinaryWriter.h"
-#include "BinaryOPT/ImageReader.h"
-
-#include "stb_image_write.h"
 #include <iostream>
 
+#include "BinaryOPT/BinaryWriter.h"
+#include "BinaryOPT/ImageReader.h"
+#include "Tex/Tex.h"
 
 extern "C" unsigned char* stbi_write_png_to_mem(const unsigned char* pixels, int stride_bytes, int x, int y, int n,
                                                 int*                 out_len);
@@ -331,7 +330,7 @@ example:
 
             // return ImageResult
             // data format
-            std::filesystem::path outPath = m_OutDir / m_Reader->GetFileName();
+            std::filesystem::path outPath = m_OutDir / reader->GetFileName();
             outPath.replace_extension(GetFileExtension(format));
 
             std::cout << "convert file: " << outPath << std::endl;
diff --git a/expkg/src/EXPKG/EXPKG.h b/expkg/src/EXPKG/EXPKG.h
index 7aac695..87f62d8 100644
--- a/expkg/src/EXPKG/EXPKG.h
+++ b/expkg/src/EXPKG/EXPKG.h
@@ -4,11 +4,10 @@
 
 #ifndef EXPKG_H
 #define EXPKG_H
-#include <filesystem>
-#include <memory>
 
-#include "BinaryOPT/BinaryReader.h"
-#include "Tex/Tex.h"
+#include <vector>
+
+#include "Entry.h"
 
 
 typedef struct CommandArgs
@@ -19,6 +18,7 @@ typedef struct CommandArgs
 
 namespace PKG
 {
+    class BinaryReader;
     enum class FILE_EXTENSION;
 
     class PKG_API EXPKG
@@ -38,7 +38,6 @@ namespace PKG
 
     private:
         std::shared_ptr<BinaryReader> m_Reader;
-        std::shared_ptr<Tex>          m_Tex;
         std::filesystem::path         m_OutDir;
 
 
diff --git a/expkg/src/Entry.h b/expkg/src/Entry.h
index 39a5315..e8c822b 100644
--- a/expkg/src/Entry.h
+++ b/expkg/src/Entry.h
@@ -4,12 +4,13 @@
 
 #ifndef ENTRY_H
 #define ENTRY_H
-#include <cstdint>
+
 #include <filesystem>
 #include <string>
 
 #include "Core.h"
 
+
 namespace PKG
 {
     enum class TexFormat
diff --git a/expkg/src/Tex/Tex.h b/expkg/src/Tex/Tex.h
index 97739dd..516fec4 100644
--- a/expkg/src/Tex/Tex.h
+++ b/expkg/src/Tex/Tex.h
@@ -4,10 +4,7 @@
 
 #ifndef TEX_H
 #define TEX_H
-#include <optional>
-#include <string>
 
-#include "Entry.h"
 #include "TexImageContainer.h"
 
 
diff --git a/expkg/src/Tex/TexImage.h b/expkg/src/Tex/TexImage.h
index 829d30e..df0d59a 100644
--- a/expkg/src/Tex/TexImage.h
+++ b/expkg/src/Tex/TexImage.h
@@ -4,9 +4,10 @@
 
 #ifndef TEXIMAGE_H
 #define TEXIMAGE_H
+
 #include <vector>
 
-#include "../Entry.h"
+#include "Entry.h"
 
 namespace PKG
 {
diff --git a/expkg/src/Tex/TexImageContainer.h b/expkg/src/Tex/TexImageContainer.h
index 3102081..548e8c2 100644
--- a/expkg/src/Tex/TexImageContainer.h
+++ b/expkg/src/Tex/TexImageContainer.h
@@ -4,11 +4,8 @@
 
 #ifndef TEXIMAGECONTAINER_H
 #define TEXIMAGECONTAINER_H
-#include <memory>
 
-#include "../Entry.h"
 #include "TexImage.h"
-#include "BinaryOPT/BinaryReader.h"
 
 namespace PKG
 {
diff --git a/expkg/src/expkg.h b/expkg/src/expkg.h
index 93d14e6..b494a97 100644
--- a/expkg/src/expkg.h
+++ b/expkg/src/expkg.h
@@ -1,15 +1,14 @@
 #ifndef EXPKG_H
 #define EXPKG_H
 
+#include "Entry.h"
 #include "BinaryOPT/BinaryReader.h"
 #include "BinaryOPT/BinaryWriter.h"
-#include "Entry.h"
+#include "BinaryOPT/ImageReader.h"
+#include "EXPKG/EXPKG.h"
 #include "Tex/Tex.h"
 #include "Tex/TexImage.h"
 #include "Tex/TexImageContainer.h"
-#include "BinaryOPT/ImageReader.h"
-
-#include "EXPKG/EXPKG.h"
 
 
 #endif // EXPKG_H