Index: uspace/lib/posix/include/posix/getopt.h
===================================================================
--- uspace/lib/posix/include/posix/getopt.h	(revision 7f9df7b96a72566de47074ddcc443093aa8aa3e8)
+++ uspace/lib/posix/include/posix/getopt.h	(revision 7a08c7001fc1391d07dde670df09e80afa0dbc03)
@@ -36,21 +36,5 @@
 
 #include "unistd.h"
-
-/* Option Arguments */
-#define no_argument        0
-#define required_argument  1
-#define optional_argument  2
-
-#ifndef LIBPOSIX_INTERNAL
-struct option {
-	const char *name;
-	int has_arg;
-	int *flag;
-	int val;
-};
-#endif
-
-extern int getopt_long(int, char * const [], const char *, const struct option *, int *);
-
+#include "libc/getopt.h"
 
 #endif
Index: uspace/lib/posix/include/posix/locale.h
===================================================================
--- uspace/lib/posix/include/posix/locale.h	(revision 7f9df7b96a72566de47074ddcc443093aa8aa3e8)
+++ uspace/lib/posix/include/posix/locale.h	(revision 7a08c7001fc1391d07dde670df09e80afa0dbc03)
@@ -41,7 +41,4 @@
 	#define __locale_t_defined
 	typedef struct __posix_locale *locale_t;
-	#ifndef LIBPOSIX_INTERNAL
-		#define locale_t locale_t
-	#endif
 #endif
 
Index: uspace/lib/posix/include/posix/time.h
===================================================================
--- uspace/lib/posix/include/posix/time.h	(revision 7f9df7b96a72566de47074ddcc443093aa8aa3e8)
+++ uspace/lib/posix/include/posix/time.h	(revision 7a08c7001fc1391d07dde670df09e80afa0dbc03)
@@ -48,14 +48,8 @@
 	#define __locale_t_defined
 	typedef struct __posix_locale *locale_t;
-	#ifndef LIBPOSIX_INTERNAL
-		#define locale_t locale_t
-	#endif
 #endif
 
 #ifndef POSIX_SIGNAL_H_
 	struct sigevent;
-	#ifndef LIBPOSIX_INTERNAL
-		#define sigevent sigevent
-	#endif
 #endif