diff --git a/platformio.ini b/platformio.ini
index 91fbac79..4231e43c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -49,8 +49,9 @@ build_flags =
 ; override lora settings from LMiC library in lmic/config.h and use main.h instead
     -D_lmic_config_h_
     -include "src/paxcounter.conf"
+    -include "src/hal/${PIOENV}.h"
     -w
-
+ 
 [env:heltec]
 platform = ${common_env_data.platform_espressif32}
 framework = arduino
@@ -63,7 +64,6 @@ lib_deps =
     ${common_env_data.lib_deps_display}
 build_flags = 
     ${common_env_data.build_flags}
-    -include "src/hal/heltec.h"
 
 [env:ttgov1]
 platform = ${common_env_data.platform_espressif32}
@@ -77,7 +77,6 @@ lib_deps =
     ${common_env_data.lib_deps_display}
 build_flags = 
     ${common_env_data.build_flags}
-    -include "src/hal/ttgov1.h"
 
 [env:ttgov2]
 platform = ${common_env_data.platform_espressif32}
@@ -91,7 +90,6 @@ lib_deps =
     ${common_env_data.lib_deps_display}
 build_flags = 
     ${common_env_data.build_flags}
-    -include "src/hal/ttgov2.h"
 
 [env:ttgov21]
 platform = ${common_env_data.platform_espressif32}
@@ -105,7 +103,6 @@ lib_deps =
     ${common_env_data.lib_deps_display}
 build_flags = 
     ${common_env_data.build_flags}
-    -include "src/hal/ttgov21.h"
 
 [env:ttgobeam]
 platform = ${common_env_data.platform_espressif32}
@@ -119,8 +116,6 @@ lib_deps =
     ${common_env_data.lib_deps_gps}
 build_flags = 
     ${common_env_data.build_flags}
-    -include "src/hal/ttgobeam.h"
-    -include 
 
 [env:fipy]
 platform = ${common_env_data.platform_espressif32}
@@ -134,7 +129,6 @@ lib_deps =
     ${common_env_data.lib_deps_rgbled}
 build_flags = 
     ${common_env_data.build_flags}
-    -include "src/hal/fipy.h"
 
 [env:lopy]
 platform = ${common_env_data.platform_espressif32}
@@ -149,7 +143,6 @@ lib_deps =
     ${common_env_data.lib_deps_gps}
 build_flags = 
     ${common_env_data.build_flags}
-    -include "src/hal/lopy.h"
 
 [env:lopy4]
 platform = ${common_env_data.platform_espressif32}
@@ -164,7 +157,6 @@ lib_deps =
     ${common_env_data.lib_deps_gps}
 build_flags =
     ${common_env_data.build_flags}
-    -include "src/hal/lopy4.h"
 
 [env:lolin32lite]
 platform = ${common_env_data.platform_espressif32}
@@ -178,7 +170,6 @@ lib_deps =
     ${common_env_data.lib_deps_rgbled}
 build_flags =
     ${common_env_data.build_flags}
-    -include "src/hal/lolin32lite_lora.h"
 
 [env:lolin32]
 platform = ${common_env_data.platform_espressif32}
@@ -191,5 +182,4 @@ lib_deps =
     ${common_env_data.lib_deps_all}
     ${common_env_data.lib_deps_rgbled}
 build_flags =
-    ${common_env_data.build_flags}
-    -include "src/hal/lolin32_lora.h"
+    ${common_env_data.build_flags}
\ No newline at end of file
diff --git a/src/hal/lolin32_lora.h b/src/hal/lolin32.h
similarity index 100%
rename from src/hal/lolin32_lora.h
rename to src/hal/lolin32.h
diff --git a/src/hal/lolin32lite_lora.h b/src/hal/lolin32lite.h
similarity index 100%
rename from src/hal/lolin32lite_lora.h
rename to src/hal/lolin32lite.h