diff --git a/Nextion.h b/Nextion.h
index 6086d39..65145c8 100644
--- a/Nextion.h
+++ b/Nextion.h
@@ -19,19 +19,19 @@
 #define __NEXTION_H__
 
 #include "Arduino.h"
-#include "NexSerialConfig"
-#include "NexTouch"
-#include "NexHardware"
+#include "NexSerialConfig.h"
+#include "NexTouch.h"
+#include "NexHardware.h"
 
-#include "NexButton"
-#include "NexCrop"
-#include "NexGauge"
-#include "NexHotspot"
-#include "NexPage"
-#include "NexPicture"
-#include "NexProgressBar"
-#include "NexSlider"
-#include "NexText"
-#include "NexWaveform"
+#include "NexButton.h"
+#include "NexCrop.h"
+#include "NexGauge.h"
+#include "NexHotspot.h"
+#include "NexPage.h"
+#include "NexPicture.h"
+#include "NexProgressBar.h"
+#include "NexSlider.h"
+#include "NexText.h"
+#include "NexWaveform.h"
 
 #endif /* #ifndef __NEXTION_H__ */
diff --git a/examples/CompButton/CompButton.ino b/examples/CompButton/CompButton.ino
index 40d734e..a04cec7 100644
--- a/examples/CompButton/CompButton.ino
+++ b/examples/CompButton/CompButton.ino
@@ -13,9 +13,10 @@
  * the License, or (at your option) any later version.
  */
 
-#include "NexButton.h"
+#include "Nextion.h"
 
 NexButton b0 = NexButton(0, 1, "b0");
+
 char buffer[100] = {0};
 
 NexTouch *nex_listen_list[] = 
diff --git a/examples/CompCrop/CompCrop.ino b/examples/CompCrop/CompCrop.ino
index 58b5182..cce85c7 100644
--- a/examples/CompCrop/CompCrop.ino
+++ b/examples/CompCrop/CompCrop.ino
@@ -13,7 +13,7 @@
  * the License, or (at your option) any later version.
  */
 
-#include "NexCrop.h"
+#include "Nextion.h"
 
 NexCrop q0 = NexCrop(0, 1, "q0");
 
diff --git a/examples/CompGauge/CompGauge.ino b/examples/CompGauge/CompGauge.ino
index efe6798..0f68aba 100644
--- a/examples/CompGauge/CompGauge.ino
+++ b/examples/CompGauge/CompGauge.ino
@@ -13,8 +13,7 @@
  * the License, or (at your option) any later version.
  */
 
-#include "NexGauge.h"
-#include "NexButton.h"
+#include "Nextion.h"
 
 NexGauge pointer  = NexGauge(0, 1, "pointer");
 NexButton btn_up   = NexButton(0, 2, "btn_up");
diff --git a/examples/CompHotspot/CompHotspot.ino b/examples/CompHotspot/CompHotspot.ino
index 436cca3..7369672 100644
--- a/examples/CompHotspot/CompHotspot.ino
+++ b/examples/CompHotspot/CompHotspot.ino
@@ -13,7 +13,7 @@
  * the License, or (at your option) any later version.
  */
 
-#include "NexHotspot.h"
+#include "Nextion.h"
 
 NexHotspot hot0    = NexHotspot(0, 1, "hot0");
 NexHotspot hot1    = NexHotspot(0, 2, "hot1");
diff --git a/examples/CompPage/CompPage.ino b/examples/CompPage/CompPage.ino
index 0b3d05d..e93a162 100644
--- a/examples/CompPage/CompPage.ino
+++ b/examples/CompPage/CompPage.ino
@@ -13,7 +13,7 @@
  * the License, or (at your option) any later version.
  */
  
-#include "NexPage.h"
+#include "Nextion.h"
 
 NexPage page0    = NexPage(0, 0, "page0");
 NexPage page1    = NexPage(1, 0, "page1");
diff --git a/examples/CompPicture/CompPicture.ino b/examples/CompPicture/CompPicture.ino
index 2e8918b..987fde8 100644
--- a/examples/CompPicture/CompPicture.ino
+++ b/examples/CompPicture/CompPicture.ino
@@ -13,7 +13,7 @@
  * the License, or (at your option) any later version.
  */
  
-#include "NexPicture.h"
+#include "Nextion.h"
 
 NexPicture p0 = NexPicture(0, 1, "p0");
 
diff --git a/examples/CompProgressBar/CompProgressBar.ino b/examples/CompProgressBar/CompProgressBar.ino
index a7bd22c..446dbef 100644
--- a/examples/CompProgressBar/CompProgressBar.ino
+++ b/examples/CompProgressBar/CompProgressBar.ino
@@ -13,8 +13,7 @@
  * the License, or (at your option) any later version.
  */
 
-#include "NexProgressBar.h"
-#include "NexButton.h"
+#include "Nextion.h"
 
 NexProgressBar j0  = NexProgressBar(0, 3, "j0");
 NexButton btn_up   = NexButton(0, 1, "btn_up");
diff --git a/examples/CompSlider/CompSlider.ino b/examples/CompSlider/CompSlider.ino
index 3e7b530..cb13aa9 100644
--- a/examples/CompSlider/CompSlider.ino
+++ b/examples/CompSlider/CompSlider.ino
@@ -13,8 +13,7 @@
  * the License, or (at your option) any later version.
  */
  
-#include "NexText.h"
-#include "NexSlider.h"
+#include "Nextion.h"
 
 
 NexText t0 = NexText(0, 2, "t0");
diff --git a/examples/CompText/CompText.ino b/examples/CompText/CompText.ino
index 24e2429..75d21b0 100644
--- a/examples/CompText/CompText.ino
+++ b/examples/CompText/CompText.ino
@@ -13,8 +13,7 @@
  * the License, or (at your option) any later version.
  */
 
-#include "NexButton.h"
-#include "NexText.h"
+#include "Nextion.h"
 
 void t0PopCallback(void *ptr);
 void b0PopCallback(void *ptr);
diff --git a/examples/CompWaveform/CompWaveform.ino b/examples/CompWaveform/CompWaveform.ino
index b05cbc8..2b691fc 100644
--- a/examples/CompWaveform/CompWaveform.ino
+++ b/examples/CompWaveform/CompWaveform.ino
@@ -13,8 +13,7 @@
  * the License, or (at your option) any later version.
  */
  
-#include "NexText.h"
-#include "NexWaveform.h"
+#include "Nextion.h"
 
 #define LEVEL_HIGH      (30)
 #define LEVEL_LOW       (0)