3 files changed, 4 insertions, 14 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index f2da31eed6..18fc38031c 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -112,7 +112,6 @@ struct ipv4_addr {
 #include "smb_interfaces.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
-#include "lib/com/com.h"
 #include "auth/credentials/credentials.h"
 
 /***** automatically generated prototypes *****/
@@ -161,8 +160,4 @@ extern int DEBUGLEVEL;
 #define discard_const(ptr) ((void *)((intptr_t)(ptr)))
 #define discard_const_p(type, ptr) ((type *)discard_const(ptr))
 
-#ifndef UINT16_MAX
-#define UINT16_MAX 65535
-#endif
-
 #endif /* _INCLUDES_H */
diff --git a/source4/include/safe_string.h b/source4/include/safe_string.h
index 7c2b93270c..57c5d21429 100644
--- a/source4/include/safe_string.h
+++ b/source4/include/safe_string.h
@@ -57,13 +57,4 @@
 #define strlower(s) strlower_m(s)
 #define strupper(s) strupper_m(s)
 
-/* the addition of the DEVELOPER checks in safe_strcpy means we must
- * update a lot of code. To make this a little easier here are some
- * functions that provide the lengths with less pain */
-#define pstrcpy_base(dest, src, pstring_base) \
-    safe_strcpy(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1)
-
-#define push_pstring_base(dest, src, pstring_base) \
-    push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE)
-
 #endif
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 89b8bf9dcf..b6ccd0ce19 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -365,3 +365,7 @@ struct smb2_find;
 struct smb2_ioctl;
 struct smb2_flush;
 struct smb2_handle;
+
+struct com_context;
+struct IUnknown;
+struct IUnknown_vtable;