diff --git a/LunaHook/CMakeLists.txt b/LunaHook/CMakeLists.txt
index ceac234..03b32d0 100644
--- a/LunaHook/CMakeLists.txt
+++ b/LunaHook/CMakeLists.txt
@@ -25,6 +25,12 @@ set(texthook_src
 		hijackfuns.cc
 		veh_hook.cpp
 ) 
+
+
+add_library(pchhook pchhook.cpp)
+target_precompile_headers(pchhook PUBLIC pchhook.h)
+
+
 add_subdirectory(util)
 add_subdirectory(engines)
 
@@ -41,7 +47,7 @@ generate_product_version(
 
 add_library(LunaHook MODULE ${texthook_src} resource.rc ${versioninfohook})
 
-target_precompile_headers(LunaHook REUSE_FROM pch) 
+target_precompile_headers(LunaHook REUSE_FROM pchhook) 
 
 set_target_properties(LunaHook PROPERTIES OUTPUT_NAME "LunaHook${bitappendix}")
 
diff --git a/LunaHook/NoEngine.h b/LunaHook/NoEngine.h
index bd78867..21aa4be 100644
--- a/LunaHook/NoEngine.h
+++ b/LunaHook/NoEngine.h
@@ -1,4 +1,3 @@
-#include"engine.h"
 class NoEngine:public ENGINE{
     public: 
     bool attach_function(){
diff --git a/LunaHook/embed_util.cc b/LunaHook/embed_util.cc
index b415c70..013cdb8 100644
--- a/LunaHook/embed_util.cc
+++ b/LunaHook/embed_util.cc
@@ -1,11 +1,3 @@
-#include"embed_util.h"
-#include"MinHook.h"
-#include"stringutils.h"
-#include"main.h"
-#include"detours.h"
-#include"hijackfuns.h"
-#include"stringfilters.h"
-#include"util.h"
 DynamicShiftJISCodec *dynamiccodec=new DynamicShiftJISCodec(932);
 
 
diff --git a/LunaHook/embed_util.h b/LunaHook/embed_util.h
index bb9a63b..2a2fd6f 100644
--- a/LunaHook/embed_util.h
+++ b/LunaHook/embed_util.h
@@ -1,6 +1,5 @@
 #ifndef __LUNA_EMBED_ENGINE_H
 #define __LUNA_EMBED_ENGINE_H
-#include"dyncodec/dynsjiscodec.h"
 
 extern EmbedSharedMem *embedsharedmem;
 extern DynamicShiftJISCodec *dynamiccodec ;
diff --git a/LunaHook/engine.h b/LunaHook/engine.h
index 5f7d5b1..d92e674 100644
--- a/LunaHook/engine.h
+++ b/LunaHook/engine.h
@@ -1,14 +1,6 @@
 #ifndef __LUNA_ENGINE_H
 #define __LUNA_ENGINE_H
 
-#include"stackoffset.hpp"
-#include"stringutils.h"
-#include"stringfilters.h"
-#include "util/util.h"
-#include "ithsys/ithsys.h"
-#include"pchooks/pchooks.h"
-#include "disasm/disasm.h"
-#include"main.h"
 
 extern WCHAR* processName,  processPath[MAX_PATH],processName_lower[MAX_PATH]; // cached
 extern uintptr_t processStartAddress, processStopAddress;
diff --git a/LunaHook/engine32/5pb.h b/LunaHook/engine32/5pb.h
index 9101af5..88e57ab 100644
--- a/LunaHook/engine32/5pb.h
+++ b/LunaHook/engine32/5pb.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class _5pb:public ENGINE{
     public:
diff --git a/LunaHook/engine32/AB2Try.h b/LunaHook/engine32/AB2Try.h
index e6a4a1f..acdb41d 100644
--- a/LunaHook/engine32/AB2Try.h
+++ b/LunaHook/engine32/AB2Try.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class AB2Try:public ENGINE{
     public:
diff --git a/LunaHook/engine32/ACTGS.h b/LunaHook/engine32/ACTGS.h
index e389ca0..6d9ceba 100644
--- a/LunaHook/engine32/ACTGS.h
+++ b/LunaHook/engine32/ACTGS.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class ACTGS:public ENGINE{
     public:
diff --git a/LunaHook/engine32/AGS.h b/LunaHook/engine32/AGS.h
index 13e35b1..bf99070 100644
--- a/LunaHook/engine32/AGS.h
+++ b/LunaHook/engine32/AGS.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class AGS:public ENGINE{
     public:
diff --git a/LunaHook/engine32/AIL2.h b/LunaHook/engine32/AIL2.h
index ec52302..97bbf12 100644
--- a/LunaHook/engine32/AIL2.h
+++ b/LunaHook/engine32/AIL2.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class AIL2:public ENGINE{
     public:
diff --git a/LunaHook/engine32/AOS.h b/LunaHook/engine32/AOS.h
index a8f1ac3..6c08d15 100644
--- a/LunaHook/engine32/AOS.h
+++ b/LunaHook/engine32/AOS.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class AOS:public ENGINE{
     public:
diff --git a/LunaHook/engine32/AXL.h b/LunaHook/engine32/AXL.h
index a4a82d2..92f25e6 100644
--- a/LunaHook/engine32/AXL.h
+++ b/LunaHook/engine32/AXL.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class AXL:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Abalone.h b/LunaHook/engine32/Abalone.h
index 739dade..b9becd9 100644
--- a/LunaHook/engine32/Abalone.h
+++ b/LunaHook/engine32/Abalone.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Abalone:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Abel.h b/LunaHook/engine32/Abel.h
index 9732d83..786050a 100644
--- a/LunaHook/engine32/Abel.h
+++ b/LunaHook/engine32/Abel.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Abel:public ENGINE{
     public:
diff --git a/LunaHook/engine32/AdobeAir.h b/LunaHook/engine32/AdobeAir.h
index 193296f..58c6e23 100644
--- a/LunaHook/engine32/AdobeAir.h
+++ b/LunaHook/engine32/AdobeAir.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class AdobeAir:public ENGINE{
     public:
diff --git a/LunaHook/engine32/AdobeFlash10.h b/LunaHook/engine32/AdobeFlash10.h
index 6dfbd7e..335e96f 100644
--- a/LunaHook/engine32/AdobeFlash10.h
+++ b/LunaHook/engine32/AdobeFlash10.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class AdobeFlash10:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Ages3ResT.h b/LunaHook/engine32/Ages3ResT.h
index 566670b..c4d6cd9 100644
--- a/LunaHook/engine32/Ages3ResT.h
+++ b/LunaHook/engine32/Ages3ResT.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Ages3ResT:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Aksys.h b/LunaHook/engine32/Aksys.h
index 065607c..312ebe9 100644
--- a/LunaHook/engine32/Aksys.h
+++ b/LunaHook/engine32/Aksys.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Aksys:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Alice.h b/LunaHook/engine32/Alice.h
index 78a4f34..400fc11 100644
--- a/LunaHook/engine32/Alice.h
+++ b/LunaHook/engine32/Alice.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Alice:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Anex86.h b/LunaHook/engine32/Anex86.h
index 381334f..97f1ed8 100644
--- a/LunaHook/engine32/Anex86.h
+++ b/LunaHook/engine32/Anex86.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Anex86:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Anim.h b/LunaHook/engine32/Anim.h
index 07211e0..31a33f3 100644
--- a/LunaHook/engine32/Anim.h
+++ b/LunaHook/engine32/Anim.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Anim:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Anisetta.h b/LunaHook/engine32/Anisetta.h
index 820f9ee..1f4d934 100644
--- a/LunaHook/engine32/Anisetta.h
+++ b/LunaHook/engine32/Anisetta.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Anisetta:public ENGINE{
     public:
diff --git a/LunaHook/engine32/ApricoT.h b/LunaHook/engine32/ApricoT.h
index 11fdc4e..5d45430 100644
--- a/LunaHook/engine32/ApricoT.h
+++ b/LunaHook/engine32/ApricoT.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class ApricoT:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Artemis.h b/LunaHook/engine32/Artemis.h
index e738efa..9100516 100644
--- a/LunaHook/engine32/Artemis.h
+++ b/LunaHook/engine32/Artemis.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Artemis:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Atelier.h b/LunaHook/engine32/Atelier.h
index bcef5bd..9af9229 100644
--- a/LunaHook/engine32/Atelier.h
+++ b/LunaHook/engine32/Atelier.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Atelier:public ENGINE{
     public:
diff --git a/LunaHook/engine32/BGI.cpp b/LunaHook/engine32/BGI.cpp
index 1f79949..6c0a705 100644
--- a/LunaHook/engine32/BGI.cpp
+++ b/LunaHook/engine32/BGI.cpp
@@ -1,5 +1,4 @@
 #include"BGI.h"
-#include"embed_util.h"
 /********************************************************************************************
 BGI hook:
   Usually game folder contains BGI.*. After first run BGI.gdb appears.
diff --git a/LunaHook/engine32/BGI.h b/LunaHook/engine32/BGI.h
index 087db3a..326a9bb 100644
--- a/LunaHook/engine32/BGI.h
+++ b/LunaHook/engine32/BGI.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class BGI:public ENGINE{
     public:
diff --git a/LunaHook/engine32/BKEngine.h b/LunaHook/engine32/BKEngine.h
index 9673648..068cd08 100644
--- a/LunaHook/engine32/BKEngine.h
+++ b/LunaHook/engine32/BKEngine.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class BKEngine:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Bishop.h b/LunaHook/engine32/Bishop.h
index 8b62079..d6321d0 100644
--- a/LunaHook/engine32/Bishop.h
+++ b/LunaHook/engine32/Bishop.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Bishop:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Bootup.h b/LunaHook/engine32/Bootup.h
index bd022cb..5cd16dd 100644
--- a/LunaHook/engine32/Bootup.h
+++ b/LunaHook/engine32/Bootup.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Bootup:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Bruns.h b/LunaHook/engine32/Bruns.h
index 0dd2b6c..2ff72c5 100644
--- a/LunaHook/engine32/Bruns.h
+++ b/LunaHook/engine32/Bruns.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Bruns:public ENGINE{
     public:
diff --git a/LunaHook/engine32/C4.h b/LunaHook/engine32/C4.h
index e0f0afc..feff8e2 100644
--- a/LunaHook/engine32/C4.h
+++ b/LunaHook/engine32/C4.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class C4:public ENGINE{
     public:
diff --git a/LunaHook/engine32/CMVS.h b/LunaHook/engine32/CMVS.h
index dba444a..9d4b3c0 100644
--- a/LunaHook/engine32/CMVS.h
+++ b/LunaHook/engine32/CMVS.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class CMVS:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Candy.h b/LunaHook/engine32/Candy.h
index 09a8d91..bb93758 100644
--- a/LunaHook/engine32/Candy.h
+++ b/LunaHook/engine32/Candy.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Candy:public ENGINE{
     public:
diff --git a/LunaHook/engine32/CaramelBox.h b/LunaHook/engine32/CaramelBox.h
index 55d4746..6cae650 100644
--- a/LunaHook/engine32/CaramelBox.h
+++ b/LunaHook/engine32/CaramelBox.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class CaramelBox:public ENGINE{
     public:
diff --git a/LunaHook/engine32/CatSystem.cpp b/LunaHook/engine32/CatSystem.cpp
index 5ffc019..fd08ba2 100644
--- a/LunaHook/engine32/CatSystem.cpp
+++ b/LunaHook/engine32/CatSystem.cpp
@@ -1,6 +1,4 @@
 #include"CatSystem.h"
-#include"embed_util.h"
-#include"dyncodec/dynsjis.h"
 // jichi 5/10/2014
 // See also: http://bbs.sumisora.org/read.php?tid=11044704&fpage=2
 //
diff --git a/LunaHook/engine32/CatSystem.h b/LunaHook/engine32/CatSystem.h
index 31affc1..7d3315f 100644
--- a/LunaHook/engine32/CatSystem.h
+++ b/LunaHook/engine32/CatSystem.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class CatSystem:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Ciel.h b/LunaHook/engine32/Ciel.h
index a0f62a5..1069a04 100644
--- a/LunaHook/engine32/Ciel.h
+++ b/LunaHook/engine32/Ciel.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Ciel:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Circus1.h b/LunaHook/engine32/Circus1.h
index c3c3ece..b0415e1 100644
--- a/LunaHook/engine32/Circus1.h
+++ b/LunaHook/engine32/Circus1.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Circus1:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Circus2.cpp b/LunaHook/engine32/Circus2.cpp
index 8c828d0..916e217 100644
--- a/LunaHook/engine32/Circus2.cpp
+++ b/LunaHook/engine32/Circus2.cpp
@@ -1,5 +1,4 @@
 #include"Circus2.h"
-#include"embed_util.h"
 namespace{
   bool filter(void* data, size_t* len, HookParam* hp){
     if (strstr((char*)data,"@i")||strstr((char*)data,"@y"))return false;
diff --git a/LunaHook/engine32/Circus2.h b/LunaHook/engine32/Circus2.h
index c73c90d..93279d5 100644
--- a/LunaHook/engine32/Circus2.h
+++ b/LunaHook/engine32/Circus2.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Circus2:public ENGINE{
     public:
diff --git a/LunaHook/engine32/CodeX.h b/LunaHook/engine32/CodeX.h
index 4c2c5a4..c03b6c9 100644
--- a/LunaHook/engine32/CodeX.h
+++ b/LunaHook/engine32/CodeX.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class CodeX:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Cotopha.cpp b/LunaHook/engine32/Cotopha.cpp
index 7b77e5b..9f9f5e1 100644
--- a/LunaHook/engine32/Cotopha.cpp
+++ b/LunaHook/engine32/Cotopha.cpp
@@ -1,5 +1,4 @@
 #include"Cotopha.h"
-#include"embed_util.h"
 #define s2_mov_ecx_edi  0xcf8b
 
 namespace { // unnamed
diff --git a/LunaHook/engine32/Cotopha.h b/LunaHook/engine32/Cotopha.h
index 64ab6c9..3a34be4 100644
--- a/LunaHook/engine32/Cotopha.h
+++ b/LunaHook/engine32/Cotopha.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Cotopha:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Debonosu.h b/LunaHook/engine32/Debonosu.h
index 4dfe38e..9865c74 100644
--- a/LunaHook/engine32/Debonosu.h
+++ b/LunaHook/engine32/Debonosu.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Debonosu:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Diskdream.h b/LunaHook/engine32/Diskdream.h
index 5b99d41..cd68a96 100644
--- a/LunaHook/engine32/Diskdream.h
+++ b/LunaHook/engine32/Diskdream.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Diskdream:public ENGINE{
     public:
diff --git a/LunaHook/engine32/DxLib.h b/LunaHook/engine32/DxLib.h
index 499c73e..ad73b7d 100644
--- a/LunaHook/engine32/DxLib.h
+++ b/LunaHook/engine32/DxLib.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class DxLib:public ENGINE{
     public:
diff --git a/LunaHook/engine32/EME.h b/LunaHook/engine32/EME.h
index b844b2e..90db548 100644
--- a/LunaHook/engine32/EME.h
+++ b/LunaHook/engine32/EME.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class EME:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Eagls.h b/LunaHook/engine32/Eagls.h
index 261f5de..46c8171 100644
--- a/LunaHook/engine32/Eagls.h
+++ b/LunaHook/engine32/Eagls.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Eagls:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Elf.cpp b/LunaHook/engine32/Elf.cpp
index 66741c0..4d8a4d9 100644
--- a/LunaHook/engine32/Elf.cpp
+++ b/LunaHook/engine32/Elf.cpp
@@ -174,7 +174,6 @@ namespace{
     return  false;
   }
 }
-#include"embed_util.h"
 namespace { // unnamed
 namespace ScenarioHook {
 namespace Private {
diff --git a/LunaHook/engine32/Elf.h b/LunaHook/engine32/Elf.h
index 442ef51..6560a8d 100644
--- a/LunaHook/engine32/Elf.h
+++ b/LunaHook/engine32/Elf.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Elf:public ENGINE{
     public:
diff --git a/LunaHook/engine32/EntisGLS.h b/LunaHook/engine32/EntisGLS.h
index c0d6b10..4ef1579 100644
--- a/LunaHook/engine32/EntisGLS.h
+++ b/LunaHook/engine32/EntisGLS.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class EntisGLS:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Escude.cpp b/LunaHook/engine32/Escude.cpp
index c87d50b..9b014bb 100644
--- a/LunaHook/engine32/Escude.cpp
+++ b/LunaHook/engine32/Escude.cpp
@@ -1,5 +1,4 @@
 #include"Escude.h"
-#include"embed_util.h"
 /** jichi 7/23/2015 Escude
  *  Sample game: Re;Lord ��ルフォルト�魔女とぬぁ�るみ *  See: http://capita.tistory.com/m/post/210
  *
diff --git a/LunaHook/engine32/Escude.h b/LunaHook/engine32/Escude.h
index bcab7ab..f6d6635 100644
--- a/LunaHook/engine32/Escude.h
+++ b/LunaHook/engine32/Escude.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Escude:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Eushully.h b/LunaHook/engine32/Eushully.h
index 0aebc8c..d9b1c4c 100644
--- a/LunaHook/engine32/Eushully.h
+++ b/LunaHook/engine32/Eushully.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Eushully:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Exp.h b/LunaHook/engine32/Exp.h
index 5507c3e..070749e 100644
--- a/LunaHook/engine32/Exp.h
+++ b/LunaHook/engine32/Exp.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Exp:public ENGINE{
     public:
diff --git a/LunaHook/engine32/FVP.cpp b/LunaHook/engine32/FVP.cpp
index 7024ca0..0ff83fd 100644
--- a/LunaHook/engine32/FVP.cpp
+++ b/LunaHook/engine32/FVP.cpp
@@ -1,4 +1,4 @@
-#include"engine32/FVP.h"
+#include"FVP.h"
 
 namespace { // unnamed
 namespace ScenarioHook {
diff --git a/LunaHook/engine32/FVP.h b/LunaHook/engine32/FVP.h
index 0bffdfb..83fc1dc 100644
--- a/LunaHook/engine32/FVP.h
+++ b/LunaHook/engine32/FVP.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class FVP:public ENGINE{
     public:
diff --git a/LunaHook/engine32/FocasLens.h b/LunaHook/engine32/FocasLens.h
index c7c98bb..7561c66 100644
--- a/LunaHook/engine32/FocasLens.h
+++ b/LunaHook/engine32/FocasLens.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class FocasLens:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Footy2.h b/LunaHook/engine32/Footy2.h
index dfbedcb..458a617 100644
--- a/LunaHook/engine32/Footy2.h
+++ b/LunaHook/engine32/Footy2.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Footy2:public ENGINE{
     public:
diff --git a/LunaHook/engine32/FrontWing.h b/LunaHook/engine32/FrontWing.h
index 42ccae2..cb9a515 100644
--- a/LunaHook/engine32/FrontWing.h
+++ b/LunaHook/engine32/FrontWing.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 //https://vndb.org/v760
 //魔界天使ジブリール
 /*
diff --git a/LunaHook/engine32/GASTRO.h b/LunaHook/engine32/GASTRO.h
index 02864f2..d311891 100644
--- a/LunaHook/engine32/GASTRO.h
+++ b/LunaHook/engine32/GASTRO.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class GASTRO:public ENGINE{
     public:
diff --git a/LunaHook/engine32/GSX.h b/LunaHook/engine32/GSX.h
index daadf60..66bdc94 100644
--- a/LunaHook/engine32/GSX.h
+++ b/LunaHook/engine32/GSX.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class GSX:public ENGINE{
     public:
diff --git a/LunaHook/engine32/GXP.cpp b/LunaHook/engine32/GXP.cpp
index 1e73bb7..e435273 100644
--- a/LunaHook/engine32/GXP.cpp
+++ b/LunaHook/engine32/GXP.cpp
@@ -312,7 +312,6 @@ bool InsertGXPHook()
   ok = InsertGXP2Hook() || ok;
   return ok;
 }
-#include"util/textunion.h"
 namespace { // unnamed
 
 ULONG moduleBaseAddress_; // saved only for debugging purposes
diff --git a/LunaHook/engine32/GXP.h b/LunaHook/engine32/GXP.h
index a24f21b..b1415b1 100644
--- a/LunaHook/engine32/GXP.h
+++ b/LunaHook/engine32/GXP.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class GXP:public ENGINE{
     public:
diff --git a/LunaHook/engine32/GameMaker.h b/LunaHook/engine32/GameMaker.h
index 04c60b9..213d653 100644
--- a/LunaHook/engine32/GameMaker.h
+++ b/LunaHook/engine32/GameMaker.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class GameMaker:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Giga.h b/LunaHook/engine32/Giga.h
index b37b365..e594e2d 100644
--- a/LunaHook/engine32/Giga.h
+++ b/LunaHook/engine32/Giga.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Giga:public ENGINE{
     public:
diff --git a/LunaHook/engine32/HXP.h b/LunaHook/engine32/HXP.h
index 10c52ca..6646ecf 100644
--- a/LunaHook/engine32/HXP.h
+++ b/LunaHook/engine32/HXP.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class HXP:public ENGINE{
     public:
diff --git a/LunaHook/engine32/HorkEye.h b/LunaHook/engine32/HorkEye.h
index c1661e6..4622f9f 100644
--- a/LunaHook/engine32/HorkEye.h
+++ b/LunaHook/engine32/HorkEye.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class HorkEye:public ENGINE{
     public:
diff --git a/LunaHook/engine32/IGScript.h b/LunaHook/engine32/IGScript.h
index 226735d..e231d1c 100644
--- a/LunaHook/engine32/IGScript.h
+++ b/LunaHook/engine32/IGScript.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class IGScript:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Interheart.h b/LunaHook/engine32/Interheart.h
index fa43a6f..b6276e5 100644
--- a/LunaHook/engine32/Interheart.h
+++ b/LunaHook/engine32/Interheart.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Interheart:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Interlude.h b/LunaHook/engine32/Interlude.h
index 3045156..9a644e3 100644
--- a/LunaHook/engine32/Interlude.h
+++ b/LunaHook/engine32/Interlude.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Interlude:public ENGINE{
     public:
diff --git a/LunaHook/engine32/IronGameSystem.h b/LunaHook/engine32/IronGameSystem.h
index 2888a7b..6108417 100644
--- a/LunaHook/engine32/IronGameSystem.h
+++ b/LunaHook/engine32/IronGameSystem.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class IronGameSystem:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Jellyfish.h b/LunaHook/engine32/Jellyfish.h
index b134e9a..b800b39 100644
--- a/LunaHook/engine32/Jellyfish.h
+++ b/LunaHook/engine32/Jellyfish.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Jellyfish:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Jisatu101.h b/LunaHook/engine32/Jisatu101.h
index 5c0afcb..74e5b35 100644
--- a/LunaHook/engine32/Jisatu101.h
+++ b/LunaHook/engine32/Jisatu101.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Jisatu101:public ENGINE{
     public:
diff --git a/LunaHook/engine32/KISS.h b/LunaHook/engine32/KISS.h
index 6bb2808..d6c0b72 100644
--- a/LunaHook/engine32/KISS.h
+++ b/LunaHook/engine32/KISS.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class KISS:public ENGINE{
     public:
diff --git a/LunaHook/engine32/KiriKiri.h b/LunaHook/engine32/KiriKiri.h
index 9e3759a..7877539 100644
--- a/LunaHook/engine32/KiriKiri.h
+++ b/LunaHook/engine32/KiriKiri.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class KiriKiri:public ENGINE{
     public:
diff --git a/LunaHook/engine32/LCScript.cpp b/LunaHook/engine32/LCScript.cpp
index 30ffa7e..57b6144 100644
--- a/LunaHook/engine32/LCScript.cpp
+++ b/LunaHook/engine32/LCScript.cpp
@@ -1,7 +1,4 @@
 #include"LCScript.h"
-#include"embed_util.h"
-#include"dyncodec/dynsjis.h"
-#include"detours.h"
 namespace { // unnamed
 namespace ScenarioHook {
 namespace Private {
diff --git a/LunaHook/engine32/LCScript.h b/LunaHook/engine32/LCScript.h
index 61718b2..f4deb07 100644
--- a/LunaHook/engine32/LCScript.h
+++ b/LunaHook/engine32/LCScript.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 #define LCSE_0  "[0]" // pseudo separator
 #define LCSE_0W  L"[0]" // pseudo separator
diff --git a/LunaHook/engine32/Leaf.h b/LunaHook/engine32/Leaf.h
index 9bd9731..f696aae 100644
--- a/LunaHook/engine32/Leaf.h
+++ b/LunaHook/engine32/Leaf.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Leaf:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Lightvn.h b/LunaHook/engine32/Lightvn.h
index d3bfa88..28c655c 100644
--- a/LunaHook/engine32/Lightvn.h
+++ b/LunaHook/engine32/Lightvn.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Lightvn:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Live.h b/LunaHook/engine32/Live.h
index e81d92a..04e725f 100644
--- a/LunaHook/engine32/Live.h
+++ b/LunaHook/engine32/Live.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Live:public ENGINE{
     public:
diff --git a/LunaHook/engine32/LovaGame.h b/LunaHook/engine32/LovaGame.h
index c299e83..6cf1a46 100644
--- a/LunaHook/engine32/LovaGame.h
+++ b/LunaHook/engine32/LovaGame.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 class LovaGame:public ENGINE{
     public:
     LovaGame(){
diff --git a/LunaHook/engine32/LunaSoft.cpp b/LunaHook/engine32/LunaSoft.cpp
index 10941a0..4a65199 100644
--- a/LunaHook/engine32/LunaSoft.cpp
+++ b/LunaHook/engine32/LunaSoft.cpp
@@ -1,5 +1,4 @@
 #include"LunaSoft.h"
-#include"embed_util.h"
 /** jichi 12/27/2014 LunaSoft
  * Sample game: [141226] [LunaSoft] 悪堕ラビリンス -- /hsn8@46C5EF
  *
diff --git a/LunaHook/engine32/LunaSoft.h b/LunaHook/engine32/LunaSoft.h
index 444484a..4931444 100644
--- a/LunaHook/engine32/LunaSoft.h
+++ b/LunaHook/engine32/LunaSoft.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class LunaSoft:public ENGINE{
     public:
diff --git a/LunaHook/engine32/MBLMED.h b/LunaHook/engine32/MBLMED.h
index 47e2c76..321370a 100644
--- a/LunaHook/engine32/MBLMED.h
+++ b/LunaHook/engine32/MBLMED.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class MBLMED:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Majiro.h b/LunaHook/engine32/Majiro.h
index 0d2c336..5b0ff95 100644
--- a/LunaHook/engine32/Majiro.h
+++ b/LunaHook/engine32/Majiro.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Majiro:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Malie.cpp b/LunaHook/engine32/Malie.cpp
index 2399619..95cad66 100644
--- a/LunaHook/engine32/Malie.cpp
+++ b/LunaHook/engine32/Malie.cpp
@@ -1,5 +1,4 @@
 #include"Malie.h"
- #include"embed_util.h"
 namespace { // unnamed Malie
 /********************************************************************************************
 Malie hook:
diff --git a/LunaHook/engine32/Malie.h b/LunaHook/engine32/Malie.h
index 0168fbf..3de8b01 100644
--- a/LunaHook/engine32/Malie.h
+++ b/LunaHook/engine32/Malie.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Malie:public ENGINE{
     public:
diff --git a/LunaHook/engine32/MarineHeart.h b/LunaHook/engine32/MarineHeart.h
index 7abb231..9a721a6 100644
--- a/LunaHook/engine32/MarineHeart.h
+++ b/LunaHook/engine32/MarineHeart.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class MarineHeart:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Mink.h b/LunaHook/engine32/Mink.h
index 8beb5ac..c265d1a 100644
--- a/LunaHook/engine32/Mink.h
+++ b/LunaHook/engine32/Mink.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Mink:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Minori.cpp b/LunaHook/engine32/Minori.cpp
index 3471653..72c15b3 100644
--- a/LunaHook/engine32/Minori.cpp
+++ b/LunaHook/engine32/Minori.cpp
@@ -1,5 +1,4 @@
 #include"Minori.h"
-#include"util/textunion.h"
 
 
 bool Minori1EngFilter(LPVOID data, size_t* size, HookParam*)
diff --git a/LunaHook/engine32/Minori.h b/LunaHook/engine32/Minori.h
index 87705cd..dc1da5f 100644
--- a/LunaHook/engine32/Minori.h
+++ b/LunaHook/engine32/Minori.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Minori:public ENGINE{
     public:
diff --git a/LunaHook/engine32/NNNConfig.h b/LunaHook/engine32/NNNConfig.h
index 946e1ec..2340b0a 100644
--- a/LunaHook/engine32/NNNConfig.h
+++ b/LunaHook/engine32/NNNConfig.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class NNNConfig:public ENGINE{
     public:
diff --git a/LunaHook/engine32/NeXAS.h b/LunaHook/engine32/NeXAS.h
index ee1adc2..c2bbd76 100644
--- a/LunaHook/engine32/NeXAS.h
+++ b/LunaHook/engine32/NeXAS.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class NeXAS:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Nekopack.h b/LunaHook/engine32/Nekopack.h
index 0835c29..84d6801 100644
--- a/LunaHook/engine32/Nekopack.h
+++ b/LunaHook/engine32/Nekopack.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Nekopack:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Nexton.cpp b/LunaHook/engine32/Nexton.cpp
index cc6d5bc..b4ffb74 100644
--- a/LunaHook/engine32/Nexton.cpp
+++ b/LunaHook/engine32/Nexton.cpp
@@ -1,5 +1,4 @@
 #include"Nexton.h"
-#include"embed_util.h"
 /**
  *  jichi 9/5/2013: NEXTON games with aInfo.db
  *  Sample games:
diff --git a/LunaHook/engine32/Nexton.h b/LunaHook/engine32/Nexton.h
index 56e17f0..17f2a66 100644
--- a/LunaHook/engine32/Nexton.h
+++ b/LunaHook/engine32/Nexton.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Nexton:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Nijyuei.h b/LunaHook/engine32/Nijyuei.h
index 157ec8d..b511d5c 100644
--- a/LunaHook/engine32/Nijyuei.h
+++ b/LunaHook/engine32/Nijyuei.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Nijyuei:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Nitroplus.h b/LunaHook/engine32/Nitroplus.h
index d26f2c9..c0bad43 100644
--- a/LunaHook/engine32/Nitroplus.h
+++ b/LunaHook/engine32/Nitroplus.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Nitroplus:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Nitroplus2.cpp b/LunaHook/engine32/Nitroplus2.cpp
index 20696be..bced08a 100644
--- a/LunaHook/engine32/Nitroplus2.cpp
+++ b/LunaHook/engine32/Nitroplus2.cpp
@@ -1,6 +1,5 @@
 #include"Nitroplus2.h"
 
-#include"embed_util.h"
 /**
  *  Jazzinghen 23/05/2020: Add TokyoNecro hook
  *
diff --git a/LunaHook/engine32/Nitroplus2.h b/LunaHook/engine32/Nitroplus2.h
index 7956630..b1e4411 100644
--- a/LunaHook/engine32/Nitroplus2.h
+++ b/LunaHook/engine32/Nitroplus2.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Nitroplus2:public ENGINE{
     public:
diff --git a/LunaHook/engine32/ONScripterru.h b/LunaHook/engine32/ONScripterru.h
index 3ba18e4..06e7df8 100644
--- a/LunaHook/engine32/ONScripterru.h
+++ b/LunaHook/engine32/ONScripterru.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class ONScripterru:public ENGINE{
     public:
diff --git a/LunaHook/engine32/OVERDRIVE.h b/LunaHook/engine32/OVERDRIVE.h
index 6a68831..4bbb36a 100644
--- a/LunaHook/engine32/OVERDRIVE.h
+++ b/LunaHook/engine32/OVERDRIVE.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class OVERDRIVE:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Ohgetsu.h b/LunaHook/engine32/Ohgetsu.h
index b049450..450f630 100644
--- a/LunaHook/engine32/Ohgetsu.h
+++ b/LunaHook/engine32/Ohgetsu.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Ohgetsu:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Overflow.h b/LunaHook/engine32/Overflow.h
index 7211e05..3615894 100644
--- a/LunaHook/engine32/Overflow.h
+++ b/LunaHook/engine32/Overflow.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Overflow:public ENGINE{
     public:
diff --git a/LunaHook/engine32/PCSX2.h b/LunaHook/engine32/PCSX2.h
index 928a8fb..050c917 100644
--- a/LunaHook/engine32/PCSX2.h
+++ b/LunaHook/engine32/PCSX2.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class PCSX2:public ENGINE{
     public:
diff --git a/LunaHook/engine32/PONScripter.h b/LunaHook/engine32/PONScripter.h
index 377342b..32a2f9c 100644
--- a/LunaHook/engine32/PONScripter.h
+++ b/LunaHook/engine32/PONScripter.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class PONScripter:public ENGINE{
     public:
diff --git a/LunaHook/engine32/PPSSPP.cpp b/LunaHook/engine32/PPSSPP.cpp
index 3c06006..68d0740 100644
--- a/LunaHook/engine32/PPSSPP.cpp
+++ b/LunaHook/engine32/PPSSPP.cpp
@@ -3640,7 +3640,7 @@ bool InsertPPSSPPHooks()
 }
 #endif
 
-bool PPSSPP::attach_function() {
+bool PPSSPPengine::attach_function() {
   return InsertPPSSPPcommonhooks();
 }
  
\ No newline at end of file
diff --git a/LunaHook/engine32/PPSSPP.h b/LunaHook/engine32/PPSSPP.h
index 4892a45..0fd7518 100644
--- a/LunaHook/engine32/PPSSPP.h
+++ b/LunaHook/engine32/PPSSPP.h
@@ -1,8 +1,8 @@
-#include"engine.h"
 
-class PPSSPP:public ENGINE{
+
+class PPSSPPengine:public ENGINE{
     public:
-    PPSSPP(){
+    PPSSPPengine(){
         
         check_by=CHECK_BY::FILE;
         check_by_target=L"PPSSPP*.exe";
diff --git a/LunaHook/engine32/Pal.cpp b/LunaHook/engine32/Pal.cpp
index cad1acd..b8c26ac 100644
--- a/LunaHook/engine32/Pal.cpp
+++ b/LunaHook/engine32/Pal.cpp
@@ -1,5 +1,4 @@
 #include"Pal.h"
-#include"embed_util.h"
 /** jichi 6/1/2014 AMUSE CRAFT
  *  Related brands: http://erogetrailers.com/brand/2047
  *  Sample game: 魔女こいにっ� *  See:  http://sakuradite.com/topic/223
diff --git a/LunaHook/engine32/Pal.h b/LunaHook/engine32/Pal.h
index 4498011..e1793fc 100644
--- a/LunaHook/engine32/Pal.h
+++ b/LunaHook/engine32/Pal.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Pal:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Palette.h b/LunaHook/engine32/Palette.h
index 92acc43..214228b 100644
--- a/LunaHook/engine32/Palette.h
+++ b/LunaHook/engine32/Palette.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Palette:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Pensil.cpp b/LunaHook/engine32/Pensil.cpp
index 91a0c20..b0588d7 100644
--- a/LunaHook/engine32/Pensil.cpp
+++ b/LunaHook/engine32/Pensil.cpp
@@ -1,5 +1,4 @@
 #include"Pensil.h"
-#include"embed_util.h"
 bool InsertPensilHook()
 {
   for (DWORD i = processStartAddress; i < processStopAddress - 4; i++)
diff --git a/LunaHook/engine32/Pensil.h b/LunaHook/engine32/Pensil.h
index a108dec..efdbefe 100644
--- a/LunaHook/engine32/Pensil.h
+++ b/LunaHook/engine32/Pensil.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Pensil:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Purple.h b/LunaHook/engine32/Purple.h
index 6de8fca..93b45f6 100644
--- a/LunaHook/engine32/Purple.h
+++ b/LunaHook/engine32/Purple.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Purple:public ENGINE{
     public:
diff --git a/LunaHook/engine32/QLIE.cpp b/LunaHook/engine32/QLIE.cpp
index 27980ff..958adef 100644
--- a/LunaHook/engine32/QLIE.cpp
+++ b/LunaHook/engine32/QLIE.cpp
@@ -1,5 +1,4 @@
 #include"QLIE.h"
-#include"embed_util.h"
 /**
  * jichi 8/18/2013:  QLIE identified by GameData/data0.pack
  *
diff --git a/LunaHook/engine32/QLIE.h b/LunaHook/engine32/QLIE.h
index 3eb5a39..a30441a 100644
--- a/LunaHook/engine32/QLIE.h
+++ b/LunaHook/engine32/QLIE.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class QLIE:public ENGINE{
     public:
diff --git a/LunaHook/engine32/RPGMakerRGSS3.cpp b/LunaHook/engine32/RPGMakerRGSS3.cpp
index afc23f2..d742d98 100644
--- a/LunaHook/engine32/RPGMakerRGSS3.cpp
+++ b/LunaHook/engine32/RPGMakerRGSS3.cpp
@@ -1,7 +1,4 @@
 #include"RPGMakerRGSS3.h"
-#include<Shlwapi.h>
-#include"embed_util.h"
-#pragma comment(lib,"shlwapi.lib")
 namespace { // unnamed
 
 namespace RGSS3 {
diff --git a/LunaHook/engine32/RPGMakerRGSS3.h b/LunaHook/engine32/RPGMakerRGSS3.h
index 74c7c8e..5c3af9e 100644
--- a/LunaHook/engine32/RPGMakerRGSS3.h
+++ b/LunaHook/engine32/RPGMakerRGSS3.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class RPGMakerRGSS3:public ENGINE{
     public:
diff --git a/LunaHook/engine32/RRE.h b/LunaHook/engine32/RRE.h
index 9a37932..91e6198 100644
--- a/LunaHook/engine32/RRE.h
+++ b/LunaHook/engine32/RRE.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class RRE:public ENGINE{
     public:
diff --git a/LunaHook/engine32/RUGP.h b/LunaHook/engine32/RUGP.h
index f79847c..6ca9678 100644
--- a/LunaHook/engine32/RUGP.h
+++ b/LunaHook/engine32/RUGP.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class RUGP:public ENGINE{
     public:
diff --git a/LunaHook/engine32/RUNE.h b/LunaHook/engine32/RUNE.h
index 1750623..330db76 100644
--- a/LunaHook/engine32/RUNE.h
+++ b/LunaHook/engine32/RUNE.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class RUNE:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Reallive.h b/LunaHook/engine32/Reallive.h
index f787ed2..f8c4f0e 100644
--- a/LunaHook/engine32/Reallive.h
+++ b/LunaHook/engine32/Reallive.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Reallive:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Regista.h b/LunaHook/engine32/Regista.h
index 8aa8c37..733ecb4 100644
--- a/LunaHook/engine32/Regista.h
+++ b/LunaHook/engine32/Regista.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Regista:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Rejet.h b/LunaHook/engine32/Rejet.h
index d289958..db6d825 100644
--- a/LunaHook/engine32/Rejet.h
+++ b/LunaHook/engine32/Rejet.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Rejet:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Renpy.h b/LunaHook/engine32/Renpy.h
index ca03d54..61d8246 100644
--- a/LunaHook/engine32/Renpy.h
+++ b/LunaHook/engine32/Renpy.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Renpy:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Retouch.h b/LunaHook/engine32/Retouch.h
index 39918f0..34b48d2 100644
--- a/LunaHook/engine32/Retouch.h
+++ b/LunaHook/engine32/Retouch.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Retouch:public ENGINE{
     public:
diff --git a/LunaHook/engine32/RpgmXP.h b/LunaHook/engine32/RpgmXP.h
index 23a50ea..68dd04a 100644
--- a/LunaHook/engine32/RpgmXP.h
+++ b/LunaHook/engine32/RpgmXP.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class RpgmXP:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Ruf.h b/LunaHook/engine32/Ruf.h
index d2a36ff..d609038 100644
--- a/LunaHook/engine32/Ruf.h
+++ b/LunaHook/engine32/Ruf.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Ruf:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Ryokucha.cpp b/LunaHook/engine32/Ryokucha.cpp
index 77f508a..0acfce8 100644
--- a/LunaHook/engine32/Ryokucha.cpp
+++ b/LunaHook/engine32/Ryokucha.cpp
@@ -1,5 +1,4 @@
 #include"Ryokucha.h"
-#include"ntxpundef.h"
 static void SpecialHookRyokucha(hook_stack* stack,  HookParam *hp, uintptr_t *data, uintptr_t *split, size_t*len)
 {
   for (DWORD i = 1; i < 5; i++) {
diff --git a/LunaHook/engine32/Ryokucha.h b/LunaHook/engine32/Ryokucha.h
index 975126f..9699129 100644
--- a/LunaHook/engine32/Ryokucha.h
+++ b/LunaHook/engine32/Ryokucha.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Ryokucha:public ENGINE{
     public:
diff --git a/LunaHook/engine32/SRPGStudio.h b/LunaHook/engine32/SRPGStudio.h
index 5154554..b389265 100644
--- a/LunaHook/engine32/SRPGStudio.h
+++ b/LunaHook/engine32/SRPGStudio.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class SRPGStudio:public ENGINE{
     public:
diff --git a/LunaHook/engine32/SYSD.h b/LunaHook/engine32/SYSD.h
index faca19e..31bc65a 100644
--- a/LunaHook/engine32/SYSD.h
+++ b/LunaHook/engine32/SYSD.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class SYSD:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Sakuradog.h b/LunaHook/engine32/Sakuradog.h
index 9ed2e3c..6867816 100644
--- a/LunaHook/engine32/Sakuradog.h
+++ b/LunaHook/engine32/Sakuradog.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Sakuradog:public ENGINE{
     public:
diff --git a/LunaHook/engine32/ScrPlayer.h b/LunaHook/engine32/ScrPlayer.h
index 750197a..e5e6906 100644
--- a/LunaHook/engine32/ScrPlayer.h
+++ b/LunaHook/engine32/ScrPlayer.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
  
 class ScrPlayer:public ENGINE{
     public:
diff --git a/LunaHook/engine32/ShinaRio.cpp b/LunaHook/engine32/ShinaRio.cpp
index 614bb54..9ac2647 100644
--- a/LunaHook/engine32/ShinaRio.cpp
+++ b/LunaHook/engine32/ShinaRio.cpp
@@ -1,6 +1,4 @@
 #include"ShinaRio.h"
-#include"embed_util.h"
-#include<shlwapi.h>
 	template <void* funcA, void* funcW, int depth = 100>
 	bool StackSearchingTrigger(LPVOID funcAddr, DWORD, DWORD stack)
 	{
diff --git a/LunaHook/engine32/ShinaRio.h b/LunaHook/engine32/ShinaRio.h
index 95a5b0c..5e1bea8 100644
--- a/LunaHook/engine32/ShinaRio.h
+++ b/LunaHook/engine32/ShinaRio.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class ShinaRio:public ENGINE{
     public:
diff --git a/LunaHook/engine32/ShinyDaysGame.cpp b/LunaHook/engine32/ShinyDaysGame.cpp
index 7ec8fa1..bb7791a 100644
--- a/LunaHook/engine32/ShinyDaysGame.cpp
+++ b/LunaHook/engine32/ShinyDaysGame.cpp
@@ -1,5 +1,4 @@
 #include"ShinyDaysGame.h"
-#include"util/textunion.h"
 
 
 /** Game-specific engines */
diff --git a/LunaHook/engine32/ShinyDaysGame.h b/LunaHook/engine32/ShinyDaysGame.h
index 2136e49..cf3e670 100644
--- a/LunaHook/engine32/ShinyDaysGame.h
+++ b/LunaHook/engine32/ShinyDaysGame.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class ShinyDaysGame:public ENGINE{
     public:
diff --git a/LunaHook/engine32/SideB.h b/LunaHook/engine32/SideB.h
index 669effc..0867dfb 100644
--- a/LunaHook/engine32/SideB.h
+++ b/LunaHook/engine32/SideB.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class SideB:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Siglus.cpp b/LunaHook/engine32/Siglus.cpp
index abf2d7f..e4c705d 100644
--- a/LunaHook/engine32/Siglus.cpp
+++ b/LunaHook/engine32/Siglus.cpp
@@ -1,6 +1,4 @@
 #include"Siglus.h"
-#include"util/textunion.h"
-#include"embed_util.h"
 namespace { // unnamed
 
 /**
diff --git a/LunaHook/engine32/Siglus.h b/LunaHook/engine32/Siglus.h
index 459cf26..63728f5 100644
--- a/LunaHook/engine32/Siglus.h
+++ b/LunaHook/engine32/Siglus.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Siglus:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Silkys.h b/LunaHook/engine32/Silkys.h
index 5d0b5ac..e90d36a 100644
--- a/LunaHook/engine32/Silkys.h
+++ b/LunaHook/engine32/Silkys.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Silkys:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Speed.h b/LunaHook/engine32/Speed.h
index b8faf8e..c88d97f 100644
--- a/LunaHook/engine32/Speed.h
+++ b/LunaHook/engine32/Speed.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Speed:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Sprite.h b/LunaHook/engine32/Sprite.h
index 022889b..b372319 100644
--- a/LunaHook/engine32/Sprite.h
+++ b/LunaHook/engine32/Sprite.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Sprite:public ENGINE{public:
     Sprite(){
diff --git a/LunaHook/engine32/Suika2.h b/LunaHook/engine32/Suika2.h
index e4407e4..25e69b1 100644
--- a/LunaHook/engine32/Suika2.h
+++ b/LunaHook/engine32/Suika2.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Suika2:public ENGINE{
     public:
diff --git a/LunaHook/engine32/System4x.cpp b/LunaHook/engine32/System4x.cpp
index c2eb7db..4e5531d 100644
--- a/LunaHook/engine32/System4x.cpp
+++ b/LunaHook/engine32/System4x.cpp
@@ -1,5 +1,4 @@
 #include"System4x.h"
-#include"embed_util.h"
 
 /**
  *  jichi 12/26/2013: Rance hook
diff --git a/LunaHook/engine32/System4x.h b/LunaHook/engine32/System4x.h
index 08b072e..ce6fb76 100644
--- a/LunaHook/engine32/System4x.h
+++ b/LunaHook/engine32/System4x.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class System4x:public ENGINE{
     public:
diff --git a/LunaHook/engine32/SystemAoi.cpp b/LunaHook/engine32/SystemAoi.cpp
index f262a51..2499f16 100644
--- a/LunaHook/engine32/SystemAoi.cpp
+++ b/LunaHook/engine32/SystemAoi.cpp
@@ -1,5 +1,4 @@
 #include"SystemAoi.h"
-#include"embed_util.h"
 /* 7/8/2014: The engine name is supposed to be: AoiGameSystem Engine
  * See: http://capita.tistory.com/m/post/205
  *
diff --git a/LunaHook/engine32/SystemAoi.h b/LunaHook/engine32/SystemAoi.h
index 0204486..0d3b424 100644
--- a/LunaHook/engine32/SystemAoi.h
+++ b/LunaHook/engine32/SystemAoi.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class SystemAoi:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Syuntada.h b/LunaHook/engine32/Syuntada.h
index 614f74a..f68a780 100644
--- a/LunaHook/engine32/Syuntada.h
+++ b/LunaHook/engine32/Syuntada.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Syuntada:public ENGINE{
     public:
diff --git a/LunaHook/engine32/TSSystem.h b/LunaHook/engine32/TSSystem.h
index 52437a2..49debb0 100644
--- a/LunaHook/engine32/TSSystem.h
+++ b/LunaHook/engine32/TSSystem.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class TSSystem:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Tamamo.h b/LunaHook/engine32/Tamamo.h
index be54b48..d87e488 100644
--- a/LunaHook/engine32/Tamamo.h
+++ b/LunaHook/engine32/Tamamo.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Tamamo:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Tanuki.h b/LunaHook/engine32/Tanuki.h
index 856f09c..f4e55bb 100644
--- a/LunaHook/engine32/Tanuki.h
+++ b/LunaHook/engine32/Tanuki.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Tanuki:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Tarte.h b/LunaHook/engine32/Tarte.h
index a817154..3de652f 100644
--- a/LunaHook/engine32/Tarte.h
+++ b/LunaHook/engine32/Tarte.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Tarte:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Taskforce2.cpp b/LunaHook/engine32/Taskforce2.cpp
index 316e84c..6a4a257 100644
--- a/LunaHook/engine32/Taskforce2.cpp
+++ b/LunaHook/engine32/Taskforce2.cpp
@@ -1,5 +1,4 @@
 #include"Taskforce2.h"
-#include"embed_util.h"
 /**
  *  jichi 1/2/2014: Taskforce2 Engine
  *
diff --git a/LunaHook/engine32/Taskforce2.h b/LunaHook/engine32/Taskforce2.h
index 2f875a4..05f3a7b 100644
--- a/LunaHook/engine32/Taskforce2.h
+++ b/LunaHook/engine32/Taskforce2.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Taskforce2:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Tenco.h b/LunaHook/engine32/Tenco.h
index c01605a..87b6949 100644
--- a/LunaHook/engine32/Tenco.h
+++ b/LunaHook/engine32/Tenco.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Tenco:public ENGINE{
     public:
diff --git a/LunaHook/engine32/TerraLunar.h b/LunaHook/engine32/TerraLunar.h
index ade0559..f5884d8 100644
--- a/LunaHook/engine32/TerraLunar.h
+++ b/LunaHook/engine32/TerraLunar.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class TerraLunar:public ENGINE{
     public:
diff --git a/LunaHook/engine32/TinkerBell.h b/LunaHook/engine32/TinkerBell.h
index ab18051..989c6b4 100644
--- a/LunaHook/engine32/TinkerBell.h
+++ b/LunaHook/engine32/TinkerBell.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class TinkerBell:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Tomato.h b/LunaHook/engine32/Tomato.h
index dd9ef37..fdab39b 100644
--- a/LunaHook/engine32/Tomato.h
+++ b/LunaHook/engine32/Tomato.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Tomato:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Triangle.h b/LunaHook/engine32/Triangle.h
index a5b2ac8..b963917 100644
--- a/LunaHook/engine32/Triangle.h
+++ b/LunaHook/engine32/Triangle.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Triangle:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Troy.h b/LunaHook/engine32/Troy.h
index 4430317..2f25236 100644
--- a/LunaHook/engine32/Troy.h
+++ b/LunaHook/engine32/Troy.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Troy:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Unicorn.cpp b/LunaHook/engine32/Unicorn.cpp
index 2aeaec0..76407f3 100644
--- a/LunaHook/engine32/Unicorn.cpp
+++ b/LunaHook/engine32/Unicorn.cpp
@@ -1,5 +1,4 @@
 #include"Unicorn.h"
- #include"embed_util.h"
 /**
  *  jichi 9/16/2013: a-unicorn / gesen18
  *  See (CaoNiMaGeBi): http://tieba.baidu.com/p/2586681823
diff --git a/LunaHook/engine32/Unicorn.h b/LunaHook/engine32/Unicorn.h
index f967df5..cbc8d79 100644
--- a/LunaHook/engine32/Unicorn.h
+++ b/LunaHook/engine32/Unicorn.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Unicorn:public ENGINE{
     public:
diff --git a/LunaHook/engine32/UnisonShift.h b/LunaHook/engine32/UnisonShift.h
index 7bd8677..c9227a9 100644
--- a/LunaHook/engine32/UnisonShift.h
+++ b/LunaHook/engine32/UnisonShift.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class UnisonShift:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Unknown.h b/LunaHook/engine32/Unknown.h
index 1a03cd9..fde9c11 100644
--- a/LunaHook/engine32/Unknown.h
+++ b/LunaHook/engine32/Unknown.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Unknown:public ENGINE{
     public:
diff --git a/LunaHook/engine32/V8.h b/LunaHook/engine32/V8.h
index 10ecb9d..7c779f1 100644
--- a/LunaHook/engine32/V8.h
+++ b/LunaHook/engine32/V8.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class V8:public ENGINE{
     public:
diff --git a/LunaHook/engine32/VanillawareGC.h b/LunaHook/engine32/VanillawareGC.h
index 9bbb0f0..9f8887f 100644
--- a/LunaHook/engine32/VanillawareGC.h
+++ b/LunaHook/engine32/VanillawareGC.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class VanillawareGC:public ENGINE{
     public:
diff --git a/LunaHook/engine32/VitaminSoft.h b/LunaHook/engine32/VitaminSoft.h
index 94afdba..db2575e 100644
--- a/LunaHook/engine32/VitaminSoft.h
+++ b/LunaHook/engine32/VitaminSoft.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
  
 
 class VitaminSoft:public ENGINE{
diff --git a/LunaHook/engine32/Waffle.cpp b/LunaHook/engine32/Waffle.cpp
index 3e70b61..d7c976a 100644
--- a/LunaHook/engine32/Waffle.cpp
+++ b/LunaHook/engine32/Waffle.cpp
@@ -1,7 +1,5 @@
 #include"Waffle.h"
-#include"embed_util.h"
-#include"util/textunion.h"
-#include"ntxpundef.h"
+
 bool InsertWaffleDynamicHook(LPVOID addr, uintptr_t frame, uintptr_t stack)
 {
 	ConsoleOutput("WaffleDynamic:triggered");
diff --git a/LunaHook/engine32/Waffle.h b/LunaHook/engine32/Waffle.h
index 3ebea18..db632bb 100644
--- a/LunaHook/engine32/Waffle.h
+++ b/LunaHook/engine32/Waffle.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Waffle:public ENGINE{
     public:
diff --git a/LunaHook/engine32/WillPlus.cpp b/LunaHook/engine32/WillPlus.cpp
index 463f986..95a8b29 100644
--- a/LunaHook/engine32/WillPlus.cpp
+++ b/LunaHook/engine32/WillPlus.cpp
@@ -1,6 +1,4 @@
 #include"WillPlus.h"
-#include"embed_util.h"
-#include"dyncodec/dynsjis.h"
 /** 1/18/2015 jichi Add new WillPlus
  *  The old hook no longer works for new game.
  *  Sample game: [150129] [honeybee] RE:BIRTHDAY SONG
diff --git a/LunaHook/engine32/WillPlus.h b/LunaHook/engine32/WillPlus.h
index 61838d3..e5001e9 100644
--- a/LunaHook/engine32/WillPlus.h
+++ b/LunaHook/engine32/WillPlus.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class WillPlus:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Wolf.cpp b/LunaHook/engine32/Wolf.cpp
index 98f755f..5854d80 100644
--- a/LunaHook/engine32/Wolf.cpp
+++ b/LunaHook/engine32/Wolf.cpp
@@ -1,5 +1,4 @@
 #include"Wolf.h"
-#include"embed_util.h"
 /**
  *  jichi 10/12/2014
  *  P.S.: Another approach
diff --git a/LunaHook/engine32/Wolf.h b/LunaHook/engine32/Wolf.h
index 904f6b3..4539a1f 100644
--- a/LunaHook/engine32/Wolf.h
+++ b/LunaHook/engine32/Wolf.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Wolf:public ENGINE{
     public:
diff --git a/LunaHook/engine32/XUSE.h b/LunaHook/engine32/XUSE.h
index f50769a..c5c8fb5 100644
--- a/LunaHook/engine32/XUSE.h
+++ b/LunaHook/engine32/XUSE.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class XUSE:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Xbangbang.h b/LunaHook/engine32/Xbangbang.h
index 52679db..6066f21 100644
--- a/LunaHook/engine32/Xbangbang.h
+++ b/LunaHook/engine32/Xbangbang.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Xbangbang:public ENGINE{
     public:
diff --git a/LunaHook/engine32/YukaSystem2.h b/LunaHook/engine32/YukaSystem2.h
index 6b81846..48ed0b8 100644
--- a/LunaHook/engine32/YukaSystem2.h
+++ b/LunaHook/engine32/YukaSystem2.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class YukaSystem2:public ENGINE{
     public:
diff --git a/LunaHook/engine32/Yuris.h b/LunaHook/engine32/Yuris.h
index 8ffa3dd..a12424d 100644
--- a/LunaHook/engine32/Yuris.h
+++ b/LunaHook/engine32/Yuris.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Yuris:public ENGINE{
     public:
diff --git a/LunaHook/engine32/akatombo.h b/LunaHook/engine32/akatombo.h
index 6bd4917..4032709 100644
--- a/LunaHook/engine32/akatombo.h
+++ b/LunaHook/engine32/akatombo.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class akatombo:public ENGINE{
     public:
diff --git a/LunaHook/engine32/cef.h b/LunaHook/engine32/cef.h
index 2a203f5..1065e8f 100644
--- a/LunaHook/engine32/cef.h
+++ b/LunaHook/engine32/cef.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class cef:public ENGINE{
     public:
diff --git a/LunaHook/engine32/hibiki.h b/LunaHook/engine32/hibiki.h
index 6fe9bb0..bf9ced1 100644
--- a/LunaHook/engine32/hibiki.h
+++ b/LunaHook/engine32/hibiki.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class hibiki:public ENGINE{
     public:
diff --git a/LunaHook/engine32/jukujojidai.h b/LunaHook/engine32/jukujojidai.h
index 58fb0f2..49ca6f4 100644
--- a/LunaHook/engine32/jukujojidai.h
+++ b/LunaHook/engine32/jukujojidai.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class jukujojidai:public ENGINE{
     public:
diff --git a/LunaHook/engine32/littlecheese.h b/LunaHook/engine32/littlecheese.h
index ca7f3ad..cd92834 100644
--- a/LunaHook/engine32/littlecheese.h
+++ b/LunaHook/engine32/littlecheese.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class littlecheese:public ENGINE{
     public:
diff --git a/LunaHook/engine32/lua51.h b/LunaHook/engine32/lua51.h
index 1a2744a..cc9b9b7 100644
--- a/LunaHook/engine32/lua51.h
+++ b/LunaHook/engine32/lua51.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class lua51:public ENGINE{
     public:
diff --git a/LunaHook/engine32/lucifen.cpp b/LunaHook/engine32/lucifen.cpp
index 2c78150..6cbb0c0 100644
--- a/LunaHook/engine32/lucifen.cpp
+++ b/LunaHook/engine32/lucifen.cpp
@@ -1,5 +1,4 @@
 #include"Lucifen.h"
- #include"embed_util.h"
 /********************************************************************************************
 Lucifen hook:
   Game folder contains *.lpk. Used by Navel games.
@@ -149,7 +148,6 @@ bool attach_navel(ULONG startAddress, ULONG stopAddress) // attach scenario
     hp.hook_font=F_GetGlyphOutlineA|F_GetTextExtentPoint32A;
     return NewHook(hp, "LucifenEmbed"); 
 }
-#include"dyncodec/dynsjis.h"
 namespace { // unnamed
 namespace ScenarioHook {
 
diff --git a/LunaHook/engine32/lucifen.h b/LunaHook/engine32/lucifen.h
index afe9d1a..fc033f2 100644
--- a/LunaHook/engine32/lucifen.h
+++ b/LunaHook/engine32/lucifen.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Lucifen:public ENGINE{
     public:
diff --git a/LunaHook/engine32/mono.h b/LunaHook/engine32/mono.h
index 118bbf7..b3efd09 100644
--- a/LunaHook/engine32/mono.h
+++ b/LunaHook/engine32/mono.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class mono:public ENGINE{
     public:
diff --git a/LunaHook/engine32/morning.h b/LunaHook/engine32/morning.h
index 515aa20..ec44569 100644
--- a/LunaHook/engine32/morning.h
+++ b/LunaHook/engine32/morning.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class morning:public ENGINE{
     public:
diff --git a/LunaHook/engine32/pchooks.h b/LunaHook/engine32/pchooks.h
index 1990171..8bc4239 100644
--- a/LunaHook/engine32/pchooks.h
+++ b/LunaHook/engine32/pchooks.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class pchooks:public ENGINE{
     public:
diff --git a/LunaHook/engine32/ransel.h b/LunaHook/engine32/ransel.h
index b812a03..10ebf2d 100644
--- a/LunaHook/engine32/ransel.h
+++ b/LunaHook/engine32/ransel.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 // FILEVERSION    1,1,2,42
 // PRODUCTVERSION 1,1,2,42
 // FILEFLAGSMASK  0x3F
diff --git a/LunaHook/engine32/sakanagl.h b/LunaHook/engine32/sakanagl.h
index da4f0ae..36efb17 100644
--- a/LunaHook/engine32/sakanagl.h
+++ b/LunaHook/engine32/sakanagl.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class sakanagl:public ENGINE{
     public:
diff --git a/LunaHook/engine32/sakusesu.h b/LunaHook/engine32/sakusesu.h
index 8a16b6f..13c3d90 100644
--- a/LunaHook/engine32/sakusesu.h
+++ b/LunaHook/engine32/sakusesu.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class sakusesu:public ENGINE{
     public:
diff --git a/LunaHook/engine32/shyakunage.h b/LunaHook/engine32/shyakunage.h
index c7236ea..56e85e5 100644
--- a/LunaHook/engine32/shyakunage.h
+++ b/LunaHook/engine32/shyakunage.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class shyakunage:public ENGINE{
     public:
diff --git a/LunaHook/engine32/solfasys.h b/LunaHook/engine32/solfasys.h
index 1f42dae..533c385 100644
--- a/LunaHook/engine32/solfasys.h
+++ b/LunaHook/engine32/solfasys.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 //https://vndb.org/v5183
 //朝っぱらから発情家族
 
diff --git a/LunaHook/engine32/splushwave.h b/LunaHook/engine32/splushwave.h
index 3a52878..f185718 100644
--- a/LunaHook/engine32/splushwave.h
+++ b/LunaHook/engine32/splushwave.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class splushwave:public ENGINE{
     public:
diff --git a/LunaHook/engine32/tamasoft.h b/LunaHook/engine32/tamasoft.h
index 51815a5..7bca340 100644
--- a/LunaHook/engine32/tamasoft.h
+++ b/LunaHook/engine32/tamasoft.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class tamasoft:public ENGINE{
     public:
diff --git a/LunaHook/engine32/utawarerumono.h b/LunaHook/engine32/utawarerumono.h
index 8e653ee..fb00510 100644
--- a/LunaHook/engine32/utawarerumono.h
+++ b/LunaHook/engine32/utawarerumono.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class utawarerumono:public ENGINE{
     public:
diff --git a/LunaHook/engine64/5pb.h b/LunaHook/engine64/5pb.h
index 9bcc566..0d16dff 100644
--- a/LunaHook/engine64/5pb.h
+++ b/LunaHook/engine64/5pb.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class _5pb:public ENGINE{
     public:
diff --git a/LunaHook/engine64/AGES7.h b/LunaHook/engine64/AGES7.h
index b2abb41..8ef5d6f 100644
--- a/LunaHook/engine64/AGES7.h
+++ b/LunaHook/engine64/AGES7.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class AGES7:public ENGINE{
     public:
diff --git a/LunaHook/engine64/Artemis.h b/LunaHook/engine64/Artemis.h
index e738efa..9100516 100644
--- a/LunaHook/engine64/Artemis.h
+++ b/LunaHook/engine64/Artemis.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Artemis:public ENGINE{
     public:
diff --git a/LunaHook/engine64/CMVS.h b/LunaHook/engine64/CMVS.h
index dba444a..9d4b3c0 100644
--- a/LunaHook/engine64/CMVS.h
+++ b/LunaHook/engine64/CMVS.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class CMVS:public ENGINE{
     public:
diff --git a/LunaHook/engine64/ENTERGRAM.h b/LunaHook/engine64/ENTERGRAM.h
index 34a9d42..206e71c 100644
--- a/LunaHook/engine64/ENTERGRAM.h
+++ b/LunaHook/engine64/ENTERGRAM.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class ENTERGRAM:public ENGINE{
     public:
diff --git a/LunaHook/engine64/Godot.h b/LunaHook/engine64/Godot.h
index f928dce..5f4c093 100644
--- a/LunaHook/engine64/Godot.h
+++ b/LunaHook/engine64/Godot.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Godot:public ENGINE{
     public:
diff --git a/LunaHook/engine64/KiriKiri.h b/LunaHook/engine64/KiriKiri.h
index 1888623..29600c2 100644
--- a/LunaHook/engine64/KiriKiri.h
+++ b/LunaHook/engine64/KiriKiri.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class KiriKiri:public ENGINE{
     public:
diff --git a/LunaHook/engine64/LightVN.h b/LunaHook/engine64/LightVN.h
index e36a3d6..866f98a 100644
--- a/LunaHook/engine64/LightVN.h
+++ b/LunaHook/engine64/LightVN.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class LightVN:public ENGINE{
     public:
diff --git a/LunaHook/engine64/PPSSPP.cpp b/LunaHook/engine64/PPSSPP.cpp
index dcd9577..27c91cc 100644
--- a/LunaHook/engine64/PPSSPP.cpp
+++ b/LunaHook/engine64/PPSSPP.cpp
@@ -1,7 +1,7 @@
 #include"PPSSPP.h"
 #include"ppsspp/psputils.hpp"
 
-bool PPSSPP::attach_function()
+bool PPSSPPengine::attach_function()
 {
 	return InsertPPSSPPcommonhooks();
 }
diff --git a/LunaHook/engine64/PPSSPP.h b/LunaHook/engine64/PPSSPP.h
index 4eeebd2..1ef6fb1 100644
--- a/LunaHook/engine64/PPSSPP.h
+++ b/LunaHook/engine64/PPSSPP.h
@@ -1,8 +1,8 @@
-#include"engine.h"
 
-class PPSSPP:public ENGINE{
+
+class PPSSPPengine:public ENGINE{
     public:
-    PPSSPP(){
+    PPSSPPengine(){
         
         check_by=CHECK_BY::FILE; 
         is_engine_certain=false;
diff --git a/LunaHook/engine64/Renpy.h b/LunaHook/engine64/Renpy.h
index 17dbbe5..9d96f56 100644
--- a/LunaHook/engine64/Renpy.h
+++ b/LunaHook/engine64/Renpy.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Renpy:public ENGINE{
     public:
diff --git a/LunaHook/engine64/Suika2.h b/LunaHook/engine64/Suika2.h
index bb75e2d..0f59fe0 100644
--- a/LunaHook/engine64/Suika2.h
+++ b/LunaHook/engine64/Suika2.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class Suika2:public ENGINE{
     public:
diff --git a/LunaHook/engine64/TYPEMOON.h b/LunaHook/engine64/TYPEMOON.h
index 170b50e..7ffd140 100644
--- a/LunaHook/engine64/TYPEMOON.h
+++ b/LunaHook/engine64/TYPEMOON.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class TYPEMOON:public ENGINE{
     public:
diff --git a/LunaHook/engine64/V8.h b/LunaHook/engine64/V8.h
index 10ecb9d..7c779f1 100644
--- a/LunaHook/engine64/V8.h
+++ b/LunaHook/engine64/V8.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class V8:public ENGINE{
     public:
diff --git a/LunaHook/engine64/YOX.h b/LunaHook/engine64/YOX.h
index 9899280..3ffde6b 100644
--- a/LunaHook/engine64/YOX.h
+++ b/LunaHook/engine64/YOX.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class YOX:public ENGINE{
     public:
diff --git a/LunaHook/engine64/lucasystem.h b/LunaHook/engine64/lucasystem.h
index eebb4fa..ddc0502 100644
--- a/LunaHook/engine64/lucasystem.h
+++ b/LunaHook/engine64/lucasystem.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class lucasystem:public ENGINE{
     public:
diff --git a/LunaHook/engine64/mono.h b/LunaHook/engine64/mono.h
index 118bbf7..b3efd09 100644
--- a/LunaHook/engine64/mono.h
+++ b/LunaHook/engine64/mono.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class mono:public ENGINE{
     public:
diff --git a/LunaHook/engine64/pchooks.h b/LunaHook/engine64/pchooks.h
index 1990171..8bc4239 100644
--- a/LunaHook/engine64/pchooks.h
+++ b/LunaHook/engine64/pchooks.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class pchooks:public ENGINE{
     public:
diff --git a/LunaHook/engine64/rpcs3.cpp b/LunaHook/engine64/rpcs3.cpp
index d8d273b..f1b2740 100644
--- a/LunaHook/engine64/rpcs3.cpp
+++ b/LunaHook/engine64/rpcs3.cpp
@@ -1,5 +1,4 @@
 #include"rpcs3.h"
-#include"engines/emujitarg.hpp"
 namespace{
     #if 0 //only support0.0.20-0.0.27
     int emoffset;
diff --git a/LunaHook/engine64/rpcs3.h b/LunaHook/engine64/rpcs3.h
index fee7494..945e7a8 100644
--- a/LunaHook/engine64/rpcs3.h
+++ b/LunaHook/engine64/rpcs3.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class rpcs3:public ENGINE{
     public:
diff --git a/LunaHook/engine64/vita3k.cpp b/LunaHook/engine64/vita3k.cpp
index 762f5cb..1de3f3a 100644
--- a/LunaHook/engine64/vita3k.cpp
+++ b/LunaHook/engine64/vita3k.cpp
@@ -1,5 +1,4 @@
 #include"vita3k.h"
-#include"engines/emujitarg.hpp"
 namespace{
     auto isVirtual = true;
     auto idxDescriptor = isVirtual == true ? 2 : 1;
diff --git a/LunaHook/engine64/vita3k.h b/LunaHook/engine64/vita3k.h
index 60b58c7..59269a5 100644
--- a/LunaHook/engine64/vita3k.h
+++ b/LunaHook/engine64/vita3k.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class vita3k:public ENGINE{
     public:
diff --git a/LunaHook/engine64/yuzusuyu.cpp b/LunaHook/engine64/yuzusuyu.cpp
index 3941200..09c2c50 100644
--- a/LunaHook/engine64/yuzusuyu.cpp
+++ b/LunaHook/engine64/yuzusuyu.cpp
@@ -1,7 +1,5 @@
 #include"yuzusuyu.h"
 #include"mages/mages.h"
-#include"hookfinder.h"
-#include"emujitarg.hpp"
 namespace{
     auto isFastMem = true;
 
diff --git a/LunaHook/engine64/yuzusuyu.h b/LunaHook/engine64/yuzusuyu.h
index af51030..455db7a 100644
--- a/LunaHook/engine64/yuzusuyu.h
+++ b/LunaHook/engine64/yuzusuyu.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 
 class yuzusuyu:public ENGINE{
     public:
diff --git a/LunaHook/enginecollection32.cpp b/LunaHook/enginecollection32.cpp
index 6831948..333a0be 100644
--- a/LunaHook/enginecollection32.cpp
+++ b/LunaHook/enginecollection32.cpp
@@ -167,7 +167,7 @@
 std::vector<ENGINE*> check_engines(){ 
     return  { 
         new LovaGame,
-        new PPSSPP,
+        new PPSSPPengine,
         new PCSX2,
         new VanillawareGC,
         new V8,
diff --git a/LunaHook/enginecollection64.cpp b/LunaHook/enginecollection64.cpp
index 1797f49..9e006ed 100644
--- a/LunaHook/enginecollection64.cpp
+++ b/LunaHook/enginecollection64.cpp
@@ -40,7 +40,7 @@ std::vector<ENGINE*> check_engines(){
         new TYPEMOON,
         new ENTERGRAM,
         new yuzusuyu,
-        new PPSSPP,
+        new PPSSPPengine,
         new vita3k,
         new rpcs3
     };
diff --git a/LunaHook/enginecontrol.cpp b/LunaHook/enginecontrol.cpp
index 1c6e5f1..1e9a169 100644
--- a/LunaHook/enginecontrol.cpp
+++ b/LunaHook/enginecontrol.cpp
@@ -1,7 +1,4 @@
 
-#include "util/util.h"
-#include"engine.h"
-#include"Lang/Lang.h"
 WCHAR* processName, // cached
 processPath[MAX_PATH]; // cached
 WCHAR processName_lower[MAX_PATH];
@@ -109,7 +106,7 @@ bool checkengine(){
     
     return false;
 }
-void Hijack(){
+void HIJACK(){
     static bool once = false;
     if(once)return;
     once=true;
diff --git a/LunaHook/engines/CMakeLists.txt b/LunaHook/engines/CMakeLists.txt
index f950ae6..d498587 100644
--- a/LunaHook/engines/CMakeLists.txt
+++ b/LunaHook/engines/CMakeLists.txt
@@ -1,4 +1,4 @@
 
 add_library(commonengine ppsspp/ppsspp.cpp mages/mages.cpp v8/v8.cpp python/python2.cpp python/python3.cpp python/python.cpp pchooks/pchooks.cpp)
-target_precompile_headers(commonengine REUSE_FROM pch)
+target_precompile_headers(commonengine REUSE_FROM pchhook)
 
diff --git a/LunaHook/engines/mages/mages.h b/LunaHook/engines/mages/mages.h
index f6117d7..33c27bb 100644
--- a/LunaHook/engines/mages/mages.h
+++ b/LunaHook/engines/mages/mages.h
@@ -1,4 +1,4 @@
-#include"engine.h"
+
 namespace mages{
   
     std::wstring readString(uintptr_t address,int _idx) ;
diff --git a/LunaHook/engines/mono/monocommon.hpp b/LunaHook/engines/mono/monocommon.hpp
index 33d9208..bc53232 100644
--- a/LunaHook/engines/mono/monocommon.hpp
+++ b/LunaHook/engines/mono/monocommon.hpp
@@ -1,6 +1,5 @@
 
 #include"il2cpp.hpp"
-#include "main.h"
 #include "monoobject.h"
 #include"monofuncinfo.h"
 namespace {
diff --git a/LunaHook/engines/pchooks/pchooks.cpp b/LunaHook/engines/pchooks/pchooks.cpp
index da73707..6094198 100644
--- a/LunaHook/engines/pchooks/pchooks.cpp
+++ b/LunaHook/engines/pchooks/pchooks.cpp
@@ -2,7 +2,6 @@
 // 8/1/2014 jichi
 
 #include "pchooks.h"
-#include "main.h"
 //#include <gdiplus.h>
 
 
diff --git a/LunaHook/engines/ppsspp/ppsspp.cpp b/LunaHook/engines/ppsspp/ppsspp.cpp
index 01d877e..936d359 100644
--- a/LunaHook/engines/ppsspp/ppsspp.cpp
+++ b/LunaHook/engines/ppsspp/ppsspp.cpp
@@ -1,6 +1,4 @@
 
-#include"engine.h"
-#include"util/util.h"
 #include"psputils.hpp"
 #include"specialgames.hpp"
 // See: https://github.com/hrydgard/ppsspp
diff --git a/LunaHook/engines/python/python.cpp b/LunaHook/engines/python/python.cpp
index 47d1a92..e60ad4b 100644
--- a/LunaHook/engines/python/python.cpp
+++ b/LunaHook/engines/python/python.cpp
@@ -1,11 +1,5 @@
 #include"python.h"
-#include"embed_util.h"
-#include"main.h"
-#include"stackoffset.hpp"
-#include <windows.h>
-#include <shlobj.h>
 #include <dwrite.h>
-#include <windowsx.h>
 extern "C" __declspec(dllexport) const wchar_t* internal_renpy_call_host(const wchar_t* text,int split){
     return text;
 }
diff --git a/LunaHook/engines/python/python2.cpp b/LunaHook/engines/python/python2.cpp
index 31b3b5c..0ec15e1 100644
--- a/LunaHook/engines/python/python2.cpp
+++ b/LunaHook/engines/python/python2.cpp
@@ -1,6 +1,4 @@
 #include"python.h"
-#include"main.h"
-#include"stackoffset.hpp"
 namespace {
     typedef wchar_t Py_UNICODE ;
     typedef size_t         Py_ssize_t;
diff --git a/LunaHook/engines/python/python3.cpp b/LunaHook/engines/python/python3.cpp
index 19d2c0a..84c30f7 100644
--- a/LunaHook/engines/python/python3.cpp
+++ b/LunaHook/engines/python/python3.cpp
@@ -1,5 +1,4 @@
 #include"python.h"
-#include"main.h"
 namespace {
 #define PyUnicode_IS_READY(op) 1
 #define PyUnicode_Check(op) 1
diff --git a/LunaHook/engines/v8/v8.cpp b/LunaHook/engines/v8/v8.cpp
index 3385d7c..cfea8af 100644
--- a/LunaHook/engines/v8/v8.cpp
+++ b/LunaHook/engines/v8/v8.cpp
@@ -1,7 +1,4 @@
-#include"main.h"
 #include"v8.h"
-#include"embed_util.h"
-#include"stackoffset.hpp"
 namespace{
     constexpr auto magicsend =L"\x01LUNAFROMJS\x01";
     constexpr auto magicrecv =L"\x01LUNAFROMHOST\x01";
diff --git a/LunaHook/hijackfuns.cc b/LunaHook/hijackfuns.cc
index a92eccd..fb2beb5 100644
--- a/LunaHook/hijackfuns.cc
+++ b/LunaHook/hijackfuns.cc
@@ -1,10 +1,4 @@
-// hijackfuns.cc
-// 6/3/2015 jichi
-#include "hijackfuns.h"
-#include"embed_util.h"
-//#define DEBUG "hijackfuns"
-#include"dyncodec/dynsjis.h"
-//#include "sakurakit/skdebug.h"
+
 #pragma intrinsic(_ReturnAddress)
 
 // Disable only for debugging purpose
@@ -461,7 +455,6 @@ UINT decodeChar(UINT ch, bool *dynamic)
       } \
     } \
 }
-#include<intrin.h>
 #define TRANSLATE_TEXT_A(lpString, cchString, ...) \
 { \
   if (auto q = EngineController::instance()) { \
diff --git a/LunaHook/hijackfuns.h b/LunaHook/hijackfuns.h
index 1ac7945..dd0d622 100644
--- a/LunaHook/hijackfuns.h
+++ b/LunaHook/hijackfuns.h
@@ -1,9 +1,5 @@
 #pragma once
 
-// hijackfuns.h
-// 6/3/2015 jichi
-
-#include <windows.h>
 
 namespace Hijack {
 
diff --git a/LunaHook/hookfinder.cc b/LunaHook/hookfinder.cc
index 9aafd6d..5bc7be3 100644
--- a/LunaHook/hookfinder.cc
+++ b/LunaHook/hookfinder.cc
@@ -1,10 +1,5 @@
-#include "hookfinder.h"
-#include "main.h"
-#include "util.h"
+
 #include "MinHook.h"
-#include"Lang/Lang.h"
-#include"veh_hook.h"
-#include"engines/emujitarg.hpp"
 namespace
 {
 	SearchParam sp;
diff --git a/LunaHook/main.cc b/LunaHook/main.cc
index 4f51331..0d03002 100644
--- a/LunaHook/main.cc
+++ b/LunaHook/main.cc
@@ -1,14 +1,6 @@
-// main.cc
-// 8/24/2013 jichi
-// Branch: LUNA_HOOK_DLL/main.cpp, rev 128
-// 8/24/2013 TODO: Clean up this file
 
-#include "main.h"
-#include "hookfinder.h"
-#include "util.h"
 #include "MinHook.h"
-#include"Lang/Lang.h"
-void Hijack();
+void HIJACK();
 void detachall();
 HMODULE hLUNAHOOKDLL;
 WinMutex viewMutex;
@@ -44,7 +36,7 @@ DWORD WINAPI Pipe(LPVOID)
 		WriteFile(hookPipe, buffer, sizeof(DWORD), &count, nullptr);
 
 		ConsoleOutput(PIPE_CONNECTED);
-		Hijack();
+		HIJACK();
 		host_connected=true;
 		while (running && ReadFile(hostPipe, buffer, PIPE_BUFFER_SIZE, &count, nullptr))
 			switch (*(HostCommandType*)buffer)
diff --git a/LunaHook/pchhook.cpp b/LunaHook/pchhook.cpp
new file mode 100644
index 0000000..e69de29
diff --git a/LunaHook/pchhook.h b/LunaHook/pchhook.h
new file mode 100644
index 0000000..0c95c94
--- /dev/null
+++ b/LunaHook/pchhook.h
@@ -0,0 +1,25 @@
+#include"../include/pch.h"
+
+#include"main.h"
+#include"stackoffset.hpp"
+#include"util/stringfilters.h"
+#include"memdbg/memsearch.h"
+#include "util/util.h"
+#include "ithsys/ithsys.h"
+#include"pchooks/pchooks.h"
+#include "cpputil/cppcstring.h"
+#include"dyncodec/dynsjiscodec.h"
+#include"dyncodec/dynsjis.h"
+#include "disasm/disasm.h"
+#include"engine.h"
+#include"embed_util.h"
+#include"detours.h"
+#include"hijackfuns.h"
+
+#include"Lang/Lang.h"
+#include"veh_hook.h"
+#include"engines/emujitarg.hpp"
+
+#include "hookfinder.h"
+#include"util/textunion.h"
+#include"util/ntxpundef.h"
\ No newline at end of file
diff --git a/LunaHook/stackoffset.hpp b/LunaHook/stackoffset.hpp
index 13c11e5..c857700 100644
--- a/LunaHook/stackoffset.hpp
+++ b/LunaHook/stackoffset.hpp
@@ -1,3 +1,4 @@
+#pragma once
 enum class regs
 {
 	_flags,
diff --git a/LunaHook/texthook.cc b/LunaHook/texthook.cc
index 4194241..ab9855e 100644
--- a/LunaHook/texthook.cc
+++ b/LunaHook/texthook.cc
@@ -1,14 +1,5 @@
-// texthook.cc
-// 8/24/2013 jichi
-// Branch: LUNA_HOOK_DLL/texthook.cpp, rev 128
-// 8/24/2013 TODO: Clean up this file
-#include"embed_util.h"
-#include "main.h"
-#include "ithsys/ithsys.h"
+
 #include "MinHook.h"
-#include"Lang/Lang.h"
-#include"veh_hook.h"
-#include"engines/emujitarg.hpp"
 extern WinMutex viewMutex;
 
 // - Unnamed helpers -
diff --git a/LunaHook/util/CMakeLists.txt b/LunaHook/util/CMakeLists.txt
index b6185eb..8d0044b 100644
--- a/LunaHook/util/CMakeLists.txt
+++ b/LunaHook/util/CMakeLists.txt
@@ -14,5 +14,5 @@ else()
   add_library(utils ${utils_src_common} disasm/disasm.cc)
 endif()
 
-target_precompile_headers(utils REUSE_FROM pch)
+target_precompile_headers(utils REUSE_FROM pchhook)
 
diff --git a/LunaHook/util/stringfilters.cpp b/LunaHook/util/stringfilters.cpp
index bafa055..5293e9e 100644
--- a/LunaHook/util/stringfilters.cpp
+++ b/LunaHook/util/stringfilters.cpp
@@ -1,5 +1,3 @@
-#include"stringfilters.h"
-#include"stringutils.h"
 
 inline char* str_chr(char *s, char c, size_t n){return (char*)::memchr(s, c, n);}
 inline wchar_t* str_chr(wchar_t *s, wchar_t c, size_t n){return  cpp_wcsnchr(s, c, n);}
diff --git a/LunaHook/util/stringfilters.h b/LunaHook/util/stringfilters.h
index cf1766c..8e916b6 100644
--- a/LunaHook/util/stringfilters.h
+++ b/LunaHook/util/stringfilters.h
@@ -1,4 +1,4 @@
-#include "cpputil/cppcstring.h"
+
 void CharReplacer(char *str, size_t *size, char fr, char to);
 void CharReplacer(wchar_t *str, size_t *size, wchar_t fr, wchar_t to);
 
diff --git a/LunaHook/util/textunion.h b/LunaHook/util/textunion.h
index 70b6f86..c1257c1 100644
--- a/LunaHook/util/textunion.h
+++ b/LunaHook/util/textunion.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include"embed_util.h"
  
 inline size_t str_len(const char *s){return strlen(s);}
 inline size_t str_len(const wchar_t *s){return wcslen(s);}
diff --git a/LunaHook/util/util.cc b/LunaHook/util/util.cc
index 963e75b..891f012 100644
--- a/LunaHook/util/util.cc
+++ b/LunaHook/util/util.cc
@@ -1,12 +1,4 @@
-// util/util.cc
-// 8/23/2013 jichi
-// Branch: ITH_Engine/engine.cpp, revision 133
-// See: http://ja.wikipedia.org/wiki/プロジェクト:美少女ゲーム系/ゲームエンジン
-
-#include "util/util.h"
-#include "ithsys/ithsys.h"
-#include "main.h"
-#include <Psapi.h>
+
 
 namespace { // unnamed
 
diff --git a/LunaHook/util/util.h b/LunaHook/util/util.h
index 3a56ae3..13dc957 100644
--- a/LunaHook/util/util.h
+++ b/LunaHook/util/util.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include"memdbg/memsearch.h"
 // util.h
 // 8/23/2013 jichi
 
diff --git a/include/pch.h b/include/pch.h
index 46e464b..e54ed47 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -2,6 +2,7 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#include <windowsx.h>
 #include <concrt.h>
 #include <string>
 #include <vector>
@@ -29,7 +30,8 @@
 #include <utility>
 #include <cassert>
 #include <variant>
-
+#include <shlobj.h>
+#include <Shlwapi.h>
 
 #include"stringutils.h"
 #include"utils.h"