30 files changed, 77 insertions, 77 deletions

diff --git a/lib/ext/alpn.c b/lib/ext/alpn.c
index 9fc946582e..96d3cf0dc7 100644
--- a/lib/ext/alpn.c
+++ b/lib/ext/alpn.c
@@ -19,9 +19,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "auth.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/alpn.h>
 
 static int _gnutls_alpn_recv_params(gnutls_session_t session,
diff --git a/lib/ext/alpn.h b/lib/ext/alpn.h
index 739879a2d1..b79ecdd961 100644
--- a/lib/ext/alpn.h
+++ b/lib/ext/alpn.h
@@ -20,7 +20,7 @@
 #ifndef EXT_ALPN_H
 #define EXT_ALPN_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 #define MAX_ALPN_PROTOCOLS 8
 #define MAX_ALPN_PROTOCOL_NAME 32
diff --git a/lib/ext/cert_type.c b/lib/ext/cert_type.c
index f9f5e8ab93..408ac07764 100644
--- a/lib/ext/cert_type.c
+++ b/lib/ext/cert_type.c
@@ -25,11 +25,11 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/cert_type.h>
-#include <gnutls_state.h>
-#include <gnutls_num.h>
+#include <state.h>
+#include <num.h>
 
 #ifdef ENABLE_OPENPGP
 
diff --git a/lib/ext/cert_type.h b/lib/ext/cert_type.h
index 0eb521a447..b78cc13adc 100644
--- a/lib/ext/cert_type.h
+++ b/lib/ext/cert_type.h
@@ -23,7 +23,7 @@
 #ifndef EXT_CERT_TYPE_H
 #define EXT_CERT_TYPE_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_cert_type;
 
diff --git a/lib/ext/dumbfw.c b/lib/ext/dumbfw.c
index 0a66f1a994..b4c850e212 100644
--- a/lib/ext/dumbfw.c
+++ b/lib/ext/dumbfw.c
@@ -19,9 +19,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "auth.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/dumbfw.h>
 
 /* This extension adds additional padding data in the TLS client hello.
diff --git a/lib/ext/dumbfw.h b/lib/ext/dumbfw.h
index bf0a49f9d7..e6a14fc886 100644
--- a/lib/ext/dumbfw.h
+++ b/lib/ext/dumbfw.h
@@ -20,7 +20,7 @@
 #ifndef EXT_DUMBFW_H
 #define EXT_DUMBFW_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_dumbfw;
 
diff --git a/lib/ext/ecc.c b/lib/ext/ecc.c
index 68b3f89542..2d785353cb 100644
--- a/lib/ext/ecc.c
+++ b/lib/ext/ecc.c
@@ -25,11 +25,11 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/ecc.h>
-#include <gnutls_state.h>
-#include <gnutls_num.h>
+#include <state.h>
+#include <num.h>
 #include <algorithms.h>
 
 static int _gnutls_supported_ecc_recv_params(gnutls_session_t session,
diff --git a/lib/ext/ecc.h b/lib/ext/ecc.h
index 268ca8e1f8..357fa87c4d 100644
--- a/lib/ext/ecc.h
+++ b/lib/ext/ecc.h
@@ -22,7 +22,7 @@
 #ifndef EXT_ECC_H
 #define EXT_ECC_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_supported_ecc;
 extern extension_entry_st ext_mod_supported_ecc_pf;
diff --git a/lib/ext/etm.c b/lib/ext/etm.c
index d77db63eb1..69474ddd60 100644
--- a/lib/ext/etm.c
+++ b/lib/ext/etm.c
@@ -24,9 +24,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
-#include <gnutls_extensions.h>
+#include "errors.h"
+#include "num.h"
+#include <extensions.h>
 #include <ext/etm.h>
 
 static int _gnutls_ext_etm_recv_params(gnutls_session_t session,
diff --git a/lib/ext/etm.h b/lib/ext/etm.h
index 23a35a6d9b..fcbf94751d 100644
--- a/lib/ext/etm.h
+++ b/lib/ext/etm.h
@@ -23,7 +23,7 @@
 #ifndef EXT_ETM_H
 #define EXT_ETM_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_etm;
 
diff --git a/lib/ext/ext_master_secret.c b/lib/ext/ext_master_secret.c
index 9610f1207b..30b26d3864 100644
--- a/lib/ext/ext_master_secret.c
+++ b/lib/ext/ext_master_secret.c
@@ -24,9 +24,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
-#include <gnutls_extensions.h>
+#include "errors.h"
+#include "num.h"
+#include <extensions.h>
 #include <ext/ext_master_secret.h>
 
 static int _gnutls_ext_master_secret_recv_params(gnutls_session_t session,
diff --git a/lib/ext/ext_master_secret.h b/lib/ext/ext_master_secret.h
index 2cdb29538b..12f07fb66b 100644
--- a/lib/ext/ext_master_secret.h
+++ b/lib/ext/ext_master_secret.h
@@ -23,7 +23,7 @@
 #ifndef EXT_EXT_MASTER_SECRET_H
 #define EXT_EXT_MASTER_SECRET_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_ext_master_secret;
 
diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c
index f847a53f96..e137f7e1a8 100644
--- a/lib/ext/heartbeat.c
+++ b/lib/ext/heartbeat.c
@@ -26,12 +26,12 @@
  * and later rewritten by Nikos Mavrogiannopoulos.
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
-#include <gnutls_dtls.h>
-#include <gnutls_record.h>
+#include "errors.h"
+#include "gnutls_int.h"
+#include <dtls.h>
+#include <record.h>
 #include <ext/heartbeat.h>
-#include <gnutls_extensions.h>
+#include <extensions.h>
 #include <random.h>
 
 #ifdef ENABLE_HEARTBEAT
diff --git a/lib/ext/heartbeat.h b/lib/ext/heartbeat.h
index ceb09bb737..5851435293 100644
--- a/lib/ext/heartbeat.h
+++ b/lib/ext/heartbeat.h
@@ -24,7 +24,7 @@
 #ifndef EXT_HEARTBEAT_H
 #define EXT_HEARTBEAT_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 #define HEARTBEAT_REQUEST 1
 #define HEARTBEAT_RESPONSE 2
diff --git a/lib/ext/max_record.c b/lib/ext/max_record.c
index cd636ea2ef..607222680c 100644
--- a/lib/ext/max_record.c
+++ b/lib/ext/max_record.c
@@ -24,9 +24,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
-#include <gnutls_extensions.h>
+#include "errors.h"
+#include "num.h"
+#include <extensions.h>
 #include <ext/max_record.h>
 
 static int _gnutls_max_record_recv_params(gnutls_session_t session,
diff --git a/lib/ext/max_record.h b/lib/ext/max_record.h
index 82c7ab7bc4..536b9da749 100644
--- a/lib/ext/max_record.h
+++ b/lib/ext/max_record.h
@@ -23,7 +23,7 @@
 #ifndef EXT_MAX_RECORD_H
 #define EXT_MAX_RECORD_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_max_record_size;
 
diff --git a/lib/ext/safe_renegotiation.c b/lib/ext/safe_renegotiation.c
index ea8208c508..3bc0bf363f 100644
--- a/lib/ext/safe_renegotiation.c
+++ b/lib/ext/safe_renegotiation.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <ext/safe_renegotiation.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 
 
 static int _gnutls_sr_recv_params(gnutls_session_t state,
diff --git a/lib/ext/safe_renegotiation.h b/lib/ext/safe_renegotiation.h
index cd334158a3..52e3fcd733 100644
--- a/lib/ext/safe_renegotiation.h
+++ b/lib/ext/safe_renegotiation.h
@@ -23,7 +23,7 @@
 #ifndef EXT_SAFE_RENEGOTIATION_H
 #define EXT_SAFE_RENEGOTIATION_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 typedef struct {
 	uint8_t client_verify_data[MAX_VERIFY_DATA_SIZE];
diff --git a/lib/ext/server_name.c b/lib/ext/server_name.c
index 2dd86930da..800f4de8f9 100644
--- a/lib/ext/server_name.c
+++ b/lib/ext/server_name.c
@@ -21,9 +21,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "auth.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/server_name.h>
 #ifdef HAVE_LIBIDN
 # include <idna.h>
diff --git a/lib/ext/server_name.h b/lib/ext/server_name.h
index fbc52177dc..f25d28051f 100644
--- a/lib/ext/server_name.h
+++ b/lib/ext/server_name.h
@@ -22,7 +22,7 @@
 #ifndef EXT_SERVER_NAME_H
 #define EXT_SERVER_NAME_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 typedef struct {
 	uint8_t name[MAX_SERVER_NAME_SIZE];
diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index 585544b4eb..799f009ed9 100644
--- a/lib/ext/session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -20,20 +20,20 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <datum.h>
 #include <algorithms.h>
-#include <gnutls_handshake.h>
-#include <gnutls_num.h>
-#include <gnutls_constate.h>
-#include <gnutls_session_pack.h>
+#include <handshake.h>
+#include <num.h>
+#include <constate.h>
+#include <session_pack.h>
 #include <random.h>
 #include <ext/session_ticket.h>
-#include <gnutls_mbuffers.h>
-#include <gnutls_extensions.h>
-#include <gnutls_constate.h>
-#include <gnutls_dtls.h>
+#include <mbuffers.h>
+#include <extensions.h>
+#include <constate.h>
+#include <dtls.h>
 
 #ifdef ENABLE_SESSION_TICKETS
 
diff --git a/lib/ext/session_ticket.h b/lib/ext/session_ticket.h
index 8c76a7a271..3bb90f875a 100644
--- a/lib/ext/session_ticket.h
+++ b/lib/ext/session_ticket.h
@@ -23,7 +23,7 @@
 #ifndef EXT_SESSION_TICKET_H
 #define EXT_SESSION_TICKET_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_session_ticket;
 
diff --git a/lib/ext/signature.c b/lib/ext/signature.c
index 3e2fa2be37..03dd4a07da 100644
--- a/lib/ext/signature.c
+++ b/lib/ext/signature.c
@@ -25,12 +25,12 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "errors.h"
+#include "num.h"
 #include <gnutls/gnutls.h>
 #include <ext/signature.h>
-#include <gnutls_state.h>
-#include <gnutls_num.h>
+#include <state.h>
+#include <num.h>
 #include <algorithms.h>
 #include <abstract_int.h>
 
diff --git a/lib/ext/signature.h b/lib/ext/signature.h
index 93858ef725..ad2815a51c 100644
--- a/lib/ext/signature.h
+++ b/lib/ext/signature.h
@@ -25,7 +25,7 @@
 #ifndef EXT_SIGNATURE_H
 #define EXT_SIGNATURE_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_sig;
 
diff --git a/lib/ext/srp.c b/lib/ext/srp.c
index ca9baaeddc..cd1b54fe93 100644
--- a/lib/ext/srp.c
+++ b/lib/ext/srp.c
@@ -20,17 +20,17 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <ext/srp.h>
 
 #ifdef ENABLE_SRP
 
-#include "gnutls_auth.h"
-#include <auth/srp.h>
-#include "gnutls_errors.h"
+#include "auth.h"
+#include <auth/srp_kx.h>
+#include "errors.h"
 #include "algorithms.h"
-#include <gnutls_num.h>
-#include <gnutls_extensions.h>
+#include <num.h>
+#include <extensions.h>
 
 static int _gnutls_srp_unpack(gnutls_buffer_st * ps,
 			      extension_priv_data_t * _priv);
diff --git a/lib/ext/srp.h b/lib/ext/srp.h
index 77e275dfc1..ae9a03c1a4 100644
--- a/lib/ext/srp.h
+++ b/lib/ext/srp.h
@@ -23,7 +23,7 @@
 #ifndef EXT_SRP_H
 #define EXT_SRP_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 #ifdef ENABLE_SRP
 
diff --git a/lib/ext/srtp.c b/lib/ext/srtp.c
index 23bdc54ca0..0f5d3c0ff8 100644
--- a/lib/ext/srtp.c
+++ b/lib/ext/srtp.c
@@ -21,9 +21,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "auth.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/srtp.h>
 
 static int _gnutls_srtp_recv_params(gnutls_session_t session,
diff --git a/lib/ext/srtp.h b/lib/ext/srtp.h
index 46ecfd7f02..bed8fc3963 100644
--- a/lib/ext/srtp.h
+++ b/lib/ext/srtp.h
@@ -22,7 +22,7 @@
 #ifndef EXT_SRTP_H
 #define EXT_SRTP_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 #define MAX_SRTP_PROFILES 4
 
diff --git a/lib/ext/status_request.c b/lib/ext/status_request.c
index 4209f42ea0..e3226b2dd7 100644
--- a/lib/ext/status_request.c
+++ b/lib/ext/status_request.c
@@ -26,13 +26,13 @@
 */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include <gnutls_extensions.h>
+#include "errors.h"
+#include <extensions.h>
 #include <ext/status_request.h>
-#include <gnutls_mbuffers.h>
-#include <gnutls_auth.h>
+#include <mbuffers.h>
+#include <auth.h>
 #include <auth/cert.h>
-#include <gnutls_handshake.h>
+#include <handshake.h>
 
 #ifdef ENABLE_OCSP
 
diff --git a/lib/ext/status_request.h b/lib/ext/status_request.h
index cd1aaeea46..604c39248e 100644
--- a/lib/ext/status_request.h
+++ b/lib/ext/status_request.h
@@ -23,7 +23,7 @@
 #ifndef EXT_STATUS_REQUEST_H
 #define EXT_STATUS_REQUEST_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_status_request;