diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index a0b0ed6..9c935aa 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2006 The Android Open Source Project
+ * Copyright (C) 2018 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -420,8 +421,10 @@ typedef struct {
 
 typedef struct {
     RIL_CallState   state;
-    char            index;      /* Connection Index for use with, eg, AT+CHLD */
-    char            call_id;    /* Samsung call_id */
+    unsigned char   index;      /* Connection Index for use with, eg, AT+CHLD */
+    unsigned char   call_id;    /* Samsung field */
+    unsigned char   pad;        /* Unsigned gap padding */
+    char            pad1;       /* Signed gap padding */
     int             toa;        /* type of address, eg 145 = intl */
     char            isMpty;     /* nonzero if is mpty call */
     char            isMT;       /* nonzero if call is mobile terminated */
@@ -433,11 +436,7 @@ typedef struct {
     int             numberPresentation; /* 0=Allowed, 1=Restricted, 2=Not Specified/Unknown 3=Payphone */
     char *          name;       /* Remote party name */
     int             namePresentation; /* 0=Allowed, 1=Restricted, 2=Not Specified/Unknown 3=Payphone */
-    union {
-       char         call_type;  /* Samsung call details */
-       char *       csv;        /* Samsung call details */
-    };
-    char            call_domain;/* Samsung call details */
+    long            call_details; /* Samsung call detail additions. Just padding, do not use */
     RIL_UUS_Info *  uusInfo;    /* NULL or Pointer to User-User Signaling Information */
 } RIL_Call;
 
@@ -1128,7 +1127,6 @@ typedef struct
   int              pin2_num_retries;
   int              puk2_num_retries;
   int              perso_unblock_retries;
-  /* End of Samsung SIM PIN/Unlock fields */
 } RIL_AppStatus;
 
 /* Deprecated, use RIL_CardStatus_v6 */
@@ -6338,44 +6336,6 @@ typedef struct {
 
 #define RIL_RESPONSE_ACKNOWLEDGEMENT 800
 
-/**********************************************************
- * SAMSUNG REQUESTS
- **********************************************************/
-
-#define SAMSUNG_REQUEST_BASE 10000
-#define RIL_REQUEST_DIAL_EMERGENCY_CALL 10001
-#define RIL_REQUEST_CALL_DEFLECTION 10002
-#define RIL_REQUEST_MODIFY_CALL_INITIATE 10003
-#define RIL_REQUEST_MODIFY_CALL_CONFIRM 10004
-#define RIL_REQUEST_SET_VOICE_DOMAIN_PREF 10005
-#define RIL_REQUEST_SAFE_MODE 10006
-#define RIL_REQUEST_SET_TRANSMIT_POWER 10007
-#define RIL_REQUEST_GET_CELL_BROADCAST_CONFIG 10008
-#define RIL_REQUEST_GET_PHONEBOOK_STORAGE_INFO 10009
-#define RIL_REQUEST_GET_PHONEBOOK_ENTRY 10010
-#define RIL_REQUEST_ACCESS_PHONEBOOK_ENTRY 10011
-#define RIL_REQUEST_USIM_PB_CAPA 10012
-#define RIL_REQUEST_LOCK_INFO 10013
-#define RIL_REQUEST_STK_SIM_INIT_EVENT 10014
-#define RIL_REQUEST_SET_PREFERRED_NETWORK_LIST 10015
-#define RIL_REQUEST_GET_PREFERRED_NETWORK_LIST 10016
-#define RIL_REQUEST_CHANGE_SIM_PERSO 10017
-#define RIL_REQUEST_ENTER_SIM_PERSO 10018
-#define RIL_REQUEST_SEND_ENCODED_USSD 10019
-#define RIL_REQUEST_CDMA_SEND_SMS_EXPECT_MORE 10020
-#define RIL_REQUEST_HANGUP_VT 10021
-#define RIL_REQUEST_HOLD 10022
-#define RIL_REQUEST_SET_SIM_POWER 10023
-#define RIL_REQUEST_UICC_GBA_AUTHENTICATE_BOOTSTRAP 10025
-#define RIL_REQUEST_UICC_GBA_AUTHENTICATE_NAF 10026
-#define RIL_REQUEST_GET_INCOMING_COMMUNICATION_BARRING 10027
-#define RIL_REQUEST_SET_INCOMING_COMMUNICATION_BARRING 10028
-#define RIL_REQUEST_QUERY_CNAP 10029
-#define RIL_REQUEST_SET_TRANSFER_CALL 10030
-#define RIL_REQUEST_GET_DISABLE_2G 10031
-#define RIL_REQUEST_SET_DISABLE_2G 10032
-#define RIL_REQUEST_REFRESH_NITZ_TIME 10033
-
 /***********************************************************************/
 
 
@@ -7044,43 +7004,6 @@ typedef struct {
  */
 #define RIL_UNSOL_KEEPALIVE_STATUS 1050
 
-/**********************************************************
- * SAMSUNG UNSOLS
- **********************************************************/
-
-#define SAMSUNG_UNSOL_BASE 11000
-#define RIL_UNSOL_RELEASE_COMPLETE_MESSAGE 11001
-#define RIL_UNSOL_STK_SEND_SMS_RESULT 11002
-#define RIL_UNSOL_STK_CALL_CONTROL_RESULT 11003
-#define RIL_UNSOL_DEVICE_READY_NOTI 11008
-#define RIL_UNSOL_GPS_NOTI 11009
-#define RIL_UNSOL_AM 11010
-#define RIL_UNSOL_SAP 11013
-#define RIL_UNSOL_UART 11020
-#define RIL_UNSOL_SIM_PB_READY 11021
-#define RIL_UNSOL_VE 11024
-#define RIL_UNSOL_FACTORY_AM 11026
-#define RIL_UNSOL_IMS_REGISTRATION_STATE_CHANGED 11027
-#define RIL_UNSOL_MODIFY_CALL 11028
-#define RIL_UNSOL_CS_FALLBACK 11030
-#define RIL_UNSOL_VOICE_SYSTEM_ID 11032
-#define RIL_UNSOL_IMS_RETRYOVER 11034
-#define RIL_UNSOL_PB_INIT_COMPLETE 11035
-#define RIL_UNSOL_HYSTERESIS_DCN 11037
-#define RIL_UNSOL_CP_POSITION 11038
-#define RIL_UNSOL_HOME_NETWORK_NOTI 11043
-#define RIL_UNSOL_STK_CALL_STATUS 11054
-#define RIL_UNSOL_MODEM_CAP 11056
-#define RIL_UNSOL_SIM_SWAP_STATE_CHANGED 11057
-#define RUL_UNSOL_SIM_COUNT_MISMATCHED 11058
-#define RIL_UNSOL_DUN 11060
-#define RIL_UNSOL_IMS_PREFERENCE_CHANGED 11061
-#define RIL_UNSOL_SIM_APPLICATION_REFRESH 11062
-#define RIL_UNSOL_UICC_APPLICATION_STATUS 11063
-#define RIL_UNSOL_VOICE_RADIO_BEARER_HO_STATUS 11064
-#define RIL_UNSOL_CLM_NOTI 11065
-#define RIL_UNSOL_SIM_ICCID_NOTI 11066
-
 /***********************************************************************/