2 files changed, 8 insertions, 23 deletions
diff --git a/winsup/cygwin/include/search.h b/winsup/cygwin/include/search.h
index 36a335ed9..f532eae55 100644
--- a/winsup/cygwin/include/search.h
+++ b/winsup/cygwin/include/search.h
@@ -31,6 +31,14 @@ typedef	enum
   leaf
 } VISIT;
 
+#ifdef _SEARCH_PRIVATE
+typedef	struct node
+{
+  char *key;
+  struct node *llink, *rlink;
+} node_t;
+#endif
+
 struct hsearch_data
 {
   struct internal_head *htable;
diff --git a/winsup/cygwin/include/sys/cdefs.h b/winsup/cygwin/include/sys/cdefs.h
deleted file mode 100644
index c401ce794..000000000
--- a/winsup/cygwin/include/sys/cdefs.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* sys/cdefs.h
-
-   Copyright 1998, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef	_SYS_CDEFS_H
-#define _SYS_CDEFS_H
-#ifdef	__cplusplus
-#define	__BEGIN_DECLS	extern "C" {
-#define	__END_DECLS	}
-#else
-#define	__BEGIN_DECLS
-#define	__END_DECLS
-#endif
-#define __P(protos)     protos		/* full-blown ANSI C */
-#define  __CONCAT(__x,__y)   __x##__y
-#endif
-