diff --git a/core/pbhttp_digest.c b/core/pbhttp_digest.c
index 67f282c3..1eb88ba9 100644
--- a/core/pbhttp_digest.c
+++ b/core/pbhttp_digest.c
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #include "pubnub_internal.h"
 
 #include "core/pubnub_proxy_core.h"
@@ -319,3 +322,5 @@ int pbhttp_digest_prep_header_to_send(struct pbhttp_digest_context* ctx,
 
     return 0;
 }
+
+#endif /* PUBNUB_PROXY_API */
diff --git a/core/pbhttp_digest.h b/core/pbhttp_digest.h
index 6de5219d..2d5c0571 100644
--- a/core/pbhttp_digest.h
+++ b/core/pbhttp_digest.h
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #if !defined INC_PBHTTP_DIGEST
 #define      INC_PBHTTP_DIGEST
 
@@ -152,3 +155,5 @@ char const* pbhttp_digest_algorithm2str(enum pbhttp_digest_algorithm e);
 
 
 #endif /* !defined INC_PBHTTP_DIGEST */
+#endif /* PUBNUB_PROXY_API */
+
diff --git a/core/pbntlm_core.c b/core/pbntlm_core.c
index b100aa92..465e1a07 100644
--- a/core/pbntlm_core.c
+++ b/core/pbntlm_core.c
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #include "core/pbntlm_core.h"
 
 #include "core/pbntlm_packer.h"
@@ -81,3 +84,5 @@ int pbntlm_core_prep_msg_to_send(pubnub_t *pb, pubnub_bymebl_t* data)
     }
 }
 
+#endif /* PUBNUB_PROXY_API */
+
diff --git a/core/pbntlm_core.h b/core/pbntlm_core.h
index 5c246fe0..2630e7a3 100644
--- a/core/pbntlm_core.h
+++ b/core/pbntlm_core.h
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #if !defined INC_PBNTLM_CORE
 #define      INC_PBNTLM_CORE
 
@@ -16,3 +19,4 @@ int pbntlm_core_prep_msg_to_send(pubnub_t *pb, pubnub_bymebl_t* data);
 
 
 #endif /* !defined INC_PBNTLM_CORE */
+#endif /* PUBNUB_PROXY_API */
diff --git a/core/pbntlm_packer.h b/core/pbntlm_packer.h
index 2d546a94..6d315077 100644
--- a/core/pbntlm_packer.h
+++ b/core/pbntlm_packer.h
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #if !defined INC_PBNTLM_PACKER
 #define      INC_PBNTLM_PACKER
 
@@ -19,3 +22,5 @@ void pbntlm_packer_deinit(pbntlm_ctx_t *pb);
 
 
 #endif /* !defined INC_PBNTLM_PACKER */
+#endif /* PUBNUB_PROXY_API */
+
diff --git a/core/pbntlm_packer_sspi.c b/core/pbntlm_packer_sspi.c
index ef946018..e09c6de3 100644
--- a/core/pbntlm_packer_sspi.c
+++ b/core/pbntlm_packer_sspi.c
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #include "pbntlm_packer.h"
 
 #include "pubnub_log.h"
@@ -212,3 +215,6 @@ void pbntlm_packer_deinit(pbntlm_ctx_t *pb)
         SecInvalidateHandle(&pb->hcreds);
     }
 }
+
+#endif /* PUBNUB_PROXY_API */
+
diff --git a/core/pbntlm_packer_std.c b/core/pbntlm_packer_std.c
index 39a73525..2835b933 100644
--- a/core/pbntlm_packer_std.c
+++ b/core/pbntlm_packer_std.c
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #include "pbntlm_packer.h"
 
 #include "pubnub_log.h"
@@ -51,3 +54,5 @@ void pbntlm_packer_deinit(pbntlm_ctx_t *pb)
 {
     PUBNUB_UNUSED(pb);
 }
+
+#endif /* PUBNUB_PROXY_API */
diff --git a/core/pubnub_proxy.c b/core/pubnub_proxy.c
index 7f6b66a7..1d7c4447 100644
--- a/core/pubnub_proxy.c
+++ b/core/pubnub_proxy.c
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #include "pubnub_internal.h"
 
 #include "pubnub_proxy.h"
@@ -144,3 +147,5 @@ int pubnub_set_proxy_authentication_username_password(pubnub_t*   p,
 
     return 0;
 }
+
+#endif /* PUBNUB_PROXY_API */
diff --git a/core/pubnub_proxy.h b/core/pubnub_proxy.h
index d475dbbb..f63afc83 100644
--- a/core/pubnub_proxy.h
+++ b/core/pubnub_proxy.h
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #if !defined INC_PUBNUB_PROXY
 #define INC_PUBNUB_PROXY
 
@@ -221,3 +224,5 @@ PUBNUB_EXTERN int pubnub_proxy_get_config(pubnub_t*               pb,
 
 
 #endif /* defined INC_PUBNUB_PROXY */
+
+#endif /* PUBNUB_PROXY_API */
diff --git a/core/pubnub_proxy_core.c b/core/pubnub_proxy_core.c
index 4964a083..b3dad0b0 100644
--- a/core/pubnub_proxy_core.c
+++ b/core/pubnub_proxy_core.c
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #include "core/pubnub_proxy_core.h"
 
 #include "core/pubnub_assert.h"
@@ -378,3 +381,5 @@ enum pbproxyFinInstruction pbproxy_handle_finish(pubnub_t* pb)
 
     return pbproxyFinGoOn;
 }
+
+#endif /* PUBNUB_PROXY_API */
diff --git a/core/pubnub_proxy_core.h b/core/pubnub_proxy_core.h
index 508ff9d9..e819f455 100644
--- a/core/pubnub_proxy_core.h
+++ b/core/pubnub_proxy_core.h
@@ -1,4 +1,7 @@
 /* -*- c-file-style:"stroustrup"; indent-tabs-mode: nil -*- */
+
+#if PUBNUB_PROXY_API
+
 #if !defined INC_PUBNUB_PROXY_CORE
 #define      INC_PUBNUB_PROXY_CORE
 
@@ -81,3 +84,5 @@ enum pbproxyFinInstruction pbproxy_handle_finish(pubnub_t *pb);
 
 
 #endif /* !defined INC_PUBNUB_PROXY_CORE */
+#endif /* PUBNUB_PROXY_API */
+