diff --git a/src/TinyGsmClient.h b/src/TinyGsmClient.h
index 0c791ad..0ba7ca3 100644
--- a/src/TinyGsmClient.h
+++ b/src/TinyGsmClient.h
@@ -9,37 +9,40 @@
 #ifndef TinyGsmClient_h
 #define TinyGsmClient_h
 
-#if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM868) || defined(TINY_GSM_MODEM_UBLOX) || defined(TINY_GSM_MODEM_ESP8266)
+#if defined(TINY_GSM_MODEM_SIM800)
+  #define TINY_GSM_MODEM_HAS_GPRS
   #define TINY_GSM_MODEM_HAS_SSL
-#endif
+  #include <TinyGsmClientSIM800.h>
+  typedef TinyGsmSim800 TinyGsm;
+  typedef TinyGsmSim800::GsmClient TinyGsmClient;
+  typedef TinyGsmSim800::GsmClientSecure TinyGsmClientSecure;
 
-#if defined(TINY_GSM_MODEM_SIM808) || defined(TINY_GSM_MODEM_SIM868) || defined(TINY_GSM_MODEM_A7) || defined(TINY_GSM_MODEM_MC60) || defined(TINY_GSM_MODEM_MC60E) || defined(TINY_GSM_MODEM_SIM7000)
+#elif defined(TINY_GSM_MODEM_SIM808) || defined(TINY_GSM_MODEM_SIM868)
+  #define TINY_GSM_MODEM_HAS_GPRS
+  #define TINY_GSM_MODEM_HAS_SSL
   #define TINY_GSM_MODEM_HAS_GPS
-#endif
+  #include <TinyGsmClientSIM808.h>
+  typedef TinyGsmSim808 TinyGsm;
+  typedef TinyGsmSim808::GsmClient TinyGsmClient;
+  typedef TinyGsmSim808::GsmClientSecure TinyGsmClientSecure;
 
-#if   defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM900)
+#elif defined(TINY_GSM_MODEM_SIM900)
   #define TINY_GSM_MODEM_HAS_GPRS
   #include <TinyGsmClientSIM800.h>
   typedef TinyGsmSim800 TinyGsm;
   typedef TinyGsmSim800::GsmClient TinyGsmClient;
-  typedef TinyGsmSim800::GsmClientSecure TinyGsmClientSecure;
 
-#elif   defined(TINY_GSM_MODEM_SIM7000)
+#elif defined(TINY_GSM_MODEM_SIM7000)
   #define TINY_GSM_MODEM_HAS_GPRS
+  #define TINY_GSM_MODEM_HAS_GPS
   #include <TinyGsmClientSIM7000.h>
   typedef TinyGsmSim7000 TinyGsm;
   typedef TinyGsmSim7000::GsmClient TinyGsmClient;
   typedef TinyGsmSim7000::GsmClientSecure TinyGsmClientSecure;
 
-#elif defined(TINY_GSM_MODEM_SIM808) || defined(TINY_GSM_MODEM_SIM868)
-  #define TINY_GSM_MODEM_HAS_GPRS
-  #include <TinyGsmClientSIM808.h>
-  typedef TinyGsmSim808 TinyGsm;
-  typedef TinyGsmSim808::GsmClient TinyGsmClient;
-  typedef TinyGsmSim808::GsmClientSecure TinyGsmClientSecure;
-
 #elif defined(TINY_GSM_MODEM_UBLOX)
   #define TINY_GSM_MODEM_HAS_GPRS
+  #define TINY_GSM_MODEM_HAS_SSL
   #include <TinyGsmClientUBLOX.h>
   typedef TinyGsmUBLOX TinyGsm;
   typedef TinyGsmUBLOX::GsmClient TinyGsmClient;
@@ -71,11 +74,14 @@
 
 #elif defined(TINY_GSM_MODEM_MC60) || defined(TINY_GSM_MODEM_MC60E)
   #include <TinyGsmClientMC60.h>
+  #define TINY_GSM_MODEM_HAS_GPRS
+  #define TINY_GSM_MODEM_HAS_GPS
   typedef TinyGsmMC60 TinyGsm;
   typedef TinyGsmMC60::GsmClient TinyGsmClient;
 
 #elif defined(TINY_GSM_MODEM_ESP8266)
   #define TINY_GSM_MODEM_HAS_WIFI
+  #define TINY_GSM_MODEM_HAS_SSL
   #include <TinyGsmClientESP8266.h>
   typedef TinyGsmESP8266 TinyGsm;
   typedef TinyGsmESP8266::GsmClient TinyGsmClient;
@@ -84,6 +90,7 @@
 #elif defined(TINY_GSM_MODEM_XBEE)
   #define TINY_GSM_MODEM_HAS_GPRS
   #define TINY_GSM_MODEM_HAS_WIFI
+  #define TINY_GSM_MODEM_HAS_SSL
   #include <TinyGsmClientXBee.h>
   typedef TinyGsmXBee TinyGsm;
   typedef TinyGsmXBee::GsmClient TinyGsmClient;