diff --git a/cython/_pocketsphinx.pxd b/cython/_pocketsphinx.pxd
index 4b105ec01..db538d365 100644
--- a/cython/_pocketsphinx.pxd
+++ b/cython/_pocketsphinx.pxd
@@ -275,7 +275,7 @@ cdef extern from "sphinxbase/jsgf.h":
                                 logmath_t *lmath, float lw)
 
 
-cdef extern from "pocketsphinx/ps_lattice.h":
+cdef extern from "pocketsphinx/lattice.h":
     ctypedef struct ps_lattice_t:
         pass
     ctypedef struct ps_latnode_t:
@@ -383,7 +383,7 @@ cdef extern from "pocketsphinx.h":
                      const char *format)
 
 
-cdef extern from "pocketsphinx/ps_search.h":
+cdef extern from "pocketsphinx/search.h":
     ctypedef struct ps_search_iter_t:
         pass
     int ps_set_search(ps_decoder_t *ps, const char *name)
@@ -407,7 +407,7 @@ cdef extern from "pocketsphinx/ps_search.h":
     int ps_set_allphone_file(ps_decoder_t *ps, const char *name, const char *path)
     int ps_set_align(ps_decoder_t *ps, const char *name, const char *words)
 
-cdef extern from "pocketsphinx/ps_vad.h":
+cdef extern from "pocketsphinx/vad.h":
     ctypedef struct ps_vad_t:
         pass
     cdef enum ps_vad_mode_e:
@@ -432,7 +432,7 @@ cdef extern from "pocketsphinx/ps_vad.h":
     double ps_vad_frame_length(ps_vad_t *vad)
     ps_vad_class_t ps_vad_classify(ps_vad_t *vad, const short *frame)
 
-cdef extern from "pocketsphinx/ps_endpointer.h":
+cdef extern from "pocketsphinx/endpointer.h":
     ctypedef struct ps_endpointer_t:
         pass
     cdef double PS_ENDPOINTER_DEFAULT_WINDOW
diff --git a/include/pocketsphinx.h b/include/pocketsphinx.h
index c1bad1f3c..95c17bf6a 100644
--- a/include/pocketsphinx.h
+++ b/include/pocketsphinx.h
@@ -53,9 +53,8 @@
 
 /* PocketSphinx headers */
 #include <pocketsphinx/export.h>
-#include <pocketsphinx/cmdln_macro.h>
-#include <pocketsphinx/ps_lattice.h>
-#include <pocketsphinx/ps_mllr.h>
+#include <pocketsphinx/lattice.h>
+#include <pocketsphinx/mllr.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,13 +69,13 @@ extern "C" {
 typedef struct ps_decoder_s ps_decoder_t;
 
 /* Voice activity detection. */
-#include <pocketsphinx/ps_vad.h>
+#include <pocketsphinx/vad.h>
 
 /* Endpointing. */
-#include <pocketsphinx/ps_endpointer.h>
+#include <pocketsphinx/endpointer.h>
 
 /* Search modules. */
-#include <pocketsphinx/ps_search.h>
+#include <pocketsphinx/search.h>
 
 /**
  * PocketSphinx N-best hypothesis iterator object.
diff --git a/include/pocketsphinx/ps_endpointer.h b/include/pocketsphinx/endpointer.h
similarity index 99%
rename from include/pocketsphinx/ps_endpointer.h
rename to include/pocketsphinx/endpointer.h
index 48ef12a99..83c1fa328 100644
--- a/include/pocketsphinx/ps_endpointer.h
+++ b/include/pocketsphinx/endpointer.h
@@ -48,7 +48,7 @@ extern "C" {
 #include <sphinxbase/prim_type.h>
 #include <pocketsphinx/export.h>
 
-#include <pocketsphinx/ps_vad.h>
+#include <pocketsphinx/vad.h>
 
 /**
  * Endpointer object.
diff --git a/include/pocketsphinx/ps_lattice.h b/include/pocketsphinx/lattice.h
similarity index 100%
rename from include/pocketsphinx/ps_lattice.h
rename to include/pocketsphinx/lattice.h
diff --git a/include/pocketsphinx/ps_mllr.h b/include/pocketsphinx/mllr.h
similarity index 100%
rename from include/pocketsphinx/ps_mllr.h
rename to include/pocketsphinx/mllr.h
diff --git a/include/pocketsphinx/ps_search.h b/include/pocketsphinx/search.h
similarity index 100%
rename from include/pocketsphinx/ps_search.h
rename to include/pocketsphinx/search.h
diff --git a/include/pocketsphinx/ps_vad.h b/include/pocketsphinx/vad.h
similarity index 100%
rename from include/pocketsphinx/ps_vad.h
rename to include/pocketsphinx/vad.h
diff --git a/programs/pocketsphinx_batch.c b/programs/pocketsphinx_batch.c
index 7b787d070..6659ad9c1 100644
--- a/programs/pocketsphinx_batch.c
+++ b/programs/pocketsphinx_batch.c
@@ -49,6 +49,7 @@
 #include <pocketsphinx.h>
 
 /* S3kr3t headerz. */
+#include "cmdln_macro.h"
 #include "pocketsphinx_internal.h"
 
 /* Silvio Moioli: setbuf doesn't exist in Windows CE */
diff --git a/src/acmod.c b/src/acmod.c
index 5986159ca..7ea693f63 100644
--- a/src/acmod.c
+++ b/src/acmod.c
@@ -55,8 +55,10 @@
 #include <sphinxbase/feat.h>
 #include <sphinxbase/bio.h>
 
+/* PocketSphinx headers. */
+#include <pocketsphinx.h>
+
 /* Local headers. */
-#include "cmdln_macro.h"
 #include "acmod.h"
 #include "s2_semi_mgau.h"
 #include "ptm_mgau.h"
diff --git a/src/acmod.h b/src/acmod.h
index 00067f3b1..b83e04d23 100644
--- a/src/acmod.h
+++ b/src/acmod.h
@@ -56,7 +56,7 @@
 #include <sphinxbase/prim_type.h>
 
 /* Local headers. */
-#include <pocketsphinx/ps_mllr.h>
+#include <pocketsphinx/mllr.h>
 #include <pocketsphinx/export.h>
 #include "bin_mdef.h"
 #include "tmat.h"
diff --git a/include/pocketsphinx/cmdln_macro.h b/src/cmdln_macro.h
similarity index 100%
rename from include/pocketsphinx/cmdln_macro.h
rename to src/cmdln_macro.h
diff --git a/src/pocketsphinx.c b/src/pocketsphinx.c
index 06ae5c8b2..d68fe332c 100644
--- a/src/pocketsphinx.c
+++ b/src/pocketsphinx.c
@@ -51,9 +51,11 @@
 #include <sphinxbase/jsgf.h>
 #include <sphinxbase/hash_table.h>
 
+/* PocketSphinx headers. */
+#include <pocketsphinx.h>
+
 /* Local headers. */
 #include "cmdln_macro.h"
-#include "pocketsphinx.h"
 #include "pocketsphinx_internal.h"
 #include "ps_lattice_internal.h"
 #include "phone_loop_search.h"
diff --git a/src/ps_endpointer.c b/src/ps_endpointer.c
index ba9c2581c..caeb0d1fd 100644
--- a/src/ps_endpointer.c
+++ b/src/ps_endpointer.c
@@ -30,7 +30,7 @@
 
 #include <sphinxbase/ckd_alloc.h>
 #include <sphinxbase/err.h>
-#include <pocketsphinx/ps_endpointer.h>
+#include <pocketsphinx/endpointer.h>
 
 #include <string.h>
 #include <assert.h>
diff --git a/src/ps_vad.c b/src/ps_vad.c
index 24b9b155b..669083137 100644
--- a/src/ps_vad.c
+++ b/src/ps_vad.c
@@ -33,7 +33,7 @@
 
 #include <sphinxbase/ckd_alloc.h>
 #include <sphinxbase/err.h>
-#include <pocketsphinx/ps_vad.h>
+#include <pocketsphinx/vad.h>
 
 #include "common_audio/vad/include/webrtc_vad.h"
 #include "common_audio/vad/vad_core.h"