6 files changed, 17 insertions, 3 deletions
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.in b/c/src/exec/posix/include/rtems/posix/Makefile.in
index 543917d7ed..3c75974208 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.in
+++ b/c/src/exec/posix/include/rtems/posix/Makefile.in
@@ -8,9 +8,13 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-H_PIECES= cond condmp config key mutex mutexmp posixapi \
-    priority psignal pthread pthreadmp seterr threadsup time
-#H_PIECES= cancel cond condmp intr key mqueue mqueuemp mutex \
+# We only build multiprocessing related files if HAS_MP was defined
+MP_PIECES_yes_V = condmp mutexmp pthreadmp 
+MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
+
+H_PIECES= cond config key mutex posixapi \
+    priority psignal pthread seterr threadsup time
+#H_PIECES= cancel cond intr key mqueue mqueuemp mutex \
 #    mutexmp pthread pthreadmp priority semaphore semaphoremp threadsup \
 #    time
 H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
diff --git a/c/src/exec/posix/include/rtems/posix/cond.h b/c/src/exec/posix/include/rtems/posix/cond.h
index 92c2e453ae..0fb44d8042 100644
--- a/c/src/exec/posix/include/rtems/posix/cond.h
+++ b/c/src/exec/posix/include/rtems/posix/cond.h
@@ -119,7 +119,9 @@ RTEMS_INLINE_ROUTINE boolean _POSIX_Condition_variables_Is_null (
 );
 
 #include <rtems/posix/cond.inl>
+#if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/posix/condmp.h>
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/c/src/exec/posix/include/rtems/posix/mqueue.h b/c/src/exec/posix/include/rtems/posix/mqueue.h
index 8e2851bfb5..f73cb509ce 100644
--- a/c/src/exec/posix/include/rtems/posix/mqueue.h
+++ b/c/src/exec/posix/include/rtems/posix/mqueue.h
@@ -175,7 +175,9 @@ RTEMS_INLINE_ROUTINE Priority_Control _POSIX_Message_queue_Priority_to_core(
 );
 
 #include <rtems/posix/mqueue.inl>
+#if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/posix/mqueuemp.h>
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/c/src/exec/posix/include/rtems/posix/mutex.h b/c/src/exec/posix/include/rtems/posix/mutex.h
index e6c5c44d39..b0d9526dd5 100644
--- a/c/src/exec/posix/include/rtems/posix/mutex.h
+++ b/c/src/exec/posix/include/rtems/posix/mutex.h
@@ -109,7 +109,9 @@ RTEMS_INLINE_ROUTINE boolean _POSIX_Mutex_Is_null (
 );
 
 #include <rtems/posix/mutex.inl>
+#if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/posix/mutexmp.h>
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/c/src/exec/posix/include/rtems/posix/pthread.h b/c/src/exec/posix/include/rtems/posix/pthread.h
index abf5933fc2..46e5834385 100644
--- a/c/src/exec/posix/include/rtems/posix/pthread.h
+++ b/c/src/exec/posix/include/rtems/posix/pthread.h
@@ -112,7 +112,9 @@ RTEMS_INLINE_ROUTINE boolean _POSIX_Threads_Is_null(
 );
 
 #include <rtems/posix/pthread.inl>
+#if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/posix/pthreadmp.h>
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/c/src/exec/posix/include/rtems/posix/semaphore.h b/c/src/exec/posix/include/rtems/posix/semaphore.h
index cc658ee32b..aaf0c4b898 100644
--- a/c/src/exec/posix/include/rtems/posix/semaphore.h
+++ b/c/src/exec/posix/include/rtems/posix/semaphore.h
@@ -124,7 +124,9 @@ int _POSIX_Semaphore_Name_to_id(
 );
 
 #include <rtems/posix/semaphore.inl>
+#if defined(RTEMS_MULTIPROCESSING)
 #include <rtems/posix/semaphoremp.h>
+#endif
 
 #ifdef __cplusplus
 }