diff --git a/psx/octoshock/docs/upstreaminfo.txt b/psx/octoshock/docs/upstreaminfo.txt
index 6f7e578058..1da05d06f4 100644
--- a/psx/octoshock/docs/upstreaminfo.txt
+++ b/psx/octoshock/docs/upstreaminfo.txt
@@ -98,3 +98,7 @@
 [OK] psx/dma : copyright header
 [OK] psx/frontio : copyright header and minor stuff
 [OK] psx/gpu : copyright, change ctor, member org changes, minor stuff
+[OK] psx/gte : (c), CR 30 change, add inlines
+[OK] psx/input/* : (c)
+[OK] psx/irq : (c)
+[OK] psx/masmem : (c)
\ No newline at end of file
diff --git a/psx/octoshock/psx/gte.cpp b/psx/octoshock/psx/gte.cpp
index 0f38aefae8..6d3577518e 100644
--- a/psx/octoshock/psx/gte.cpp
+++ b/psx/octoshock/psx/gte.cpp
@@ -1,19 +1,25 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* gte.cpp:
+**  Copyright (C) 2011-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+//#pragma GCC optimize ("no-unroll-loops,no-peel-loops")
 
 #include "psx.h"
 #include "gte.h"
@@ -285,7 +291,8 @@ void GTE_WriteCR(unsigned int which, uint32 value)
 	break;
 
   case 30:
-	ZSF4 = value;
+	LZCS = value;
+	LZCR = MDFN_lzcount32(value ^ ((int32)value >> 31));
 	break;
 
   case 31:
@@ -935,7 +942,7 @@ static INLINE void MultiplyMatrixByVector_PT(const gtematrix *matrix, const int1
  }
 
 
-static int32 SQR(uint32 instr)
+static INLINE int32 SQR(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -949,7 +956,7 @@ static int32 SQR(uint32 instr)
 }
 
 
-static int32 MVMVA(uint32 instr)
+static INLINE int32 MVMVA(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1009,7 +1016,7 @@ static INLINE void TransformDQ(int64 h_div_sz)
  IR0 = Lm_H(((int64)DQB + DQA * h_div_sz) >> 12);
 }
 
-static int32 RTPS(uint32 instr)
+static int32 INLINE RTPS(uint32 instr)
 {
  DECODE_FIELDS;
  int64 h_div_sz;
@@ -1023,7 +1030,7 @@ static int32 RTPS(uint32 instr)
  return(15);
 }
 
-static int32 RTPT(uint32 instr)
+static int32 INLINE RTPT(uint32 instr)
 {
  DECODE_FIELDS;
  int i;
@@ -1056,7 +1063,7 @@ static INLINE void NormColor(uint32 sf, int lm, uint32 v)
  MAC_to_RGB_FIFO();
 }
 
-static int32 NCS(uint32 instr)
+static INLINE int32 NCS(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1094,7 +1101,7 @@ static INLINE void NormColorColor(uint32 v, uint32 sf, int lm)
  MAC_to_RGB_FIFO();
 }
 
-static int32 NCCS(uint32 instr)
+static INLINE int32 NCCS(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1103,7 +1110,7 @@ static int32 NCCS(uint32 instr)
 }
 
 
-static int32 NCCT(uint32 instr)
+static INLINE int32 NCCT(uint32 instr)
 {
  int i;
  DECODE_FIELDS;
@@ -1158,7 +1165,7 @@ static INLINE void DepthCue(int mult_IR123, int RGB_from_FIFO, uint32 sf, int lm
 }
 
 
-static int32 DCPL(uint32 instr)
+static INLINE int32 DCPL(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1168,7 +1175,7 @@ static int32 DCPL(uint32 instr)
 }
 
 
-static int32 DPCS(uint32 instr)
+static INLINE int32 DPCS(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1177,7 +1184,7 @@ static int32 DPCS(uint32 instr)
  return(8);
 }
 
-static int32 DPCT(uint32 instr)
+static INLINE int32 DPCT(uint32 instr)
 {
  int i;
  DECODE_FIELDS;
@@ -1190,7 +1197,7 @@ static int32 DPCT(uint32 instr)
  return(17);
 }
 
-static int32 INTPL(uint32 instr)
+static INLINE int32 INTPL(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1222,7 +1229,7 @@ static INLINE void NormColorDepthCue(uint32 v, uint32 sf, int lm)
  DepthCue(TRUE, FALSE, sf, lm);
 }
 
-static int32 NCDS(uint32 instr)
+static INLINE int32 NCDS(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1231,7 +1238,7 @@ static int32 NCDS(uint32 instr)
  return(19);
 }
 
-static int32 NCDT(uint32 instr)
+static INLINE int32 NCDT(uint32 instr)
 {
  int i;
  DECODE_FIELDS;
@@ -1244,7 +1251,7 @@ static int32 NCDT(uint32 instr)
  return(44);
 }
 
-static int32 CC(uint32 instr)
+static INLINE int32 CC(uint32 instr)
 {
  DECODE_FIELDS;
  int16 tmp_vector[3];
@@ -1263,7 +1270,7 @@ static int32 CC(uint32 instr)
  return(11);
 }
 
-static int32 CDP(uint32 instr)
+static INLINE int32 CDP(uint32 instr)
 {
  DECODE_FIELDS;
  int16 tmp_vector[3];
@@ -1276,7 +1283,7 @@ static int32 CDP(uint32 instr)
  return(13);
 }
 
-static int32 NCLIP(uint32 instr)
+static INLINE int32 NCLIP(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1286,7 +1293,7 @@ static int32 NCLIP(uint32 instr)
  return(8);
 }
 
-static int32 AVSZ3(uint32 instr)
+static INLINE int32 AVSZ3(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1297,7 +1304,7 @@ static int32 AVSZ3(uint32 instr)
  return(5);
 }
 
-static int32 AVSZ4(uint32 instr)
+static INLINE int32 AVSZ4(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1311,7 +1318,7 @@ static int32 AVSZ4(uint32 instr)
 
 // -32768 * -32768 - 32767 * -32768 = 2147450880
 // (2 ^ 31) - 1 =		      2147483647
-static int32 OP(uint32 instr)
+static INLINE int32 OP(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1324,7 +1331,7 @@ static int32 OP(uint32 instr)
  return(6);
 }
 
-static int32 GPF(uint32 instr)
+static INLINE int32 GPF(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1339,7 +1346,7 @@ static int32 GPF(uint32 instr)
  return(5);
 }
 
-static int32 GPL(uint32 instr)
+static INLINE int32 GPL(uint32 instr)
 {
  DECODE_FIELDS;
 
@@ -1492,9 +1499,7 @@ int32 GTE_Instruction(uint32 instr)
 	break;
 */
 
-  case 0x1A:	// Alternate for 0x29?
-	ret = DCPL(instr);
-	break;
+// case 0x1A handled next to case 0x29
 
   case 0x1B:
 	ret = NCCS(instr);
@@ -1548,6 +1553,7 @@ int32 GTE_Instruction(uint32 instr)
 	ret = SQR(instr);
 	break;
 
+	case 0x1A:	// Alternate for 0x29?
   case 0x29:
 	ret = DCPL(instr);
 	break;
diff --git a/psx/octoshock/psx/gte.h b/psx/octoshock/psx/gte.h
index 44eedbfe7e..90e7696dd7 100644
--- a/psx/octoshock/psx/gte.h
+++ b/psx/octoshock/psx/gte.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* gte.h:
+**  Copyright (C) 2011-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #pragma once
 
 namespace MDFN_IEN_PSX
diff --git a/psx/octoshock/psx/input/dualanalog.cpp b/psx/octoshock/psx/input/dualanalog.cpp
index 5bc1358938..181d6a3324 100644
--- a/psx/octoshock/psx/input/dualanalog.cpp
+++ b/psx/octoshock/psx/input/dualanalog.cpp
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* dualanalog.cpp:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #include "../psx.h"
 #include "../frontio.h"
 #include "dualanalog.h"
diff --git a/psx/octoshock/psx/input/dualanalog.h b/psx/octoshock/psx/input/dualanalog.h
index 9bcb8cdef4..47d897be16 100644
--- a/psx/octoshock/psx/input/dualanalog.h
+++ b/psx/octoshock/psx/input/dualanalog.h
@@ -1,3 +1,25 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* dualanalog.h:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+
 #ifndef __MDFN_PSX_INPUT_DUALANALOG_H
 #define __MDFN_PSX_INPUT_DUALANALOG_H
 
diff --git a/psx/octoshock/psx/input/dualshock.cpp b/psx/octoshock/psx/input/dualshock.cpp
index 7a95b5c2ef..3dbbefe5d2 100644
--- a/psx/octoshock/psx/input/dualshock.cpp
+++ b/psx/octoshock/psx/input/dualshock.cpp
@@ -1,19 +1,23 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* dualshock.cpp:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include "../psx.h"
 #include "../frontio.h"
diff --git a/psx/octoshock/psx/input/dualshock.h b/psx/octoshock/psx/input/dualshock.h
index 08d3ea6a5b..c8f3010760 100644
--- a/psx/octoshock/psx/input/dualshock.h
+++ b/psx/octoshock/psx/input/dualshock.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* dualshock.h:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_INPUT_DUALSHOCK_H
 #define __MDFN_PSX_INPUT_DUALSHOCK_H
 
diff --git a/psx/octoshock/psx/input/gamepad.cpp b/psx/octoshock/psx/input/gamepad.cpp
index 63f4df98a0..e388adc5b5 100644
--- a/psx/octoshock/psx/input/gamepad.cpp
+++ b/psx/octoshock/psx/input/gamepad.cpp
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* gamepad.cpp:
+**  Copyright (C) 2011-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #include "../psx.h"
 #include "../frontio.h"
 #include "gamepad.h"
diff --git a/psx/octoshock/psx/input/gamepad.h b/psx/octoshock/psx/input/gamepad.h
index 0669be863d..7c1059f501 100644
--- a/psx/octoshock/psx/input/gamepad.h
+++ b/psx/octoshock/psx/input/gamepad.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* gamepad.h:
+**  Copyright (C) 2011-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_INPUT_GAMEPAD_H
 #define __MDFN_PSX_INPUT_GAMEPAD_H
 
diff --git a/psx/octoshock/psx/input/guncon.cpp b/psx/octoshock/psx/input/guncon.cpp
index e8e987a214..8adce75f71 100644
--- a/psx/octoshock/psx/input/guncon.cpp
+++ b/psx/octoshock/psx/input/guncon.cpp
@@ -1,19 +1,23 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* guncon.cpp:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include "../psx.h"
 #include "../frontio.h"
diff --git a/psx/octoshock/psx/input/guncon.h b/psx/octoshock/psx/input/guncon.h
index 4578466b38..0f04814fee 100644
--- a/psx/octoshock/psx/input/guncon.h
+++ b/psx/octoshock/psx/input/guncon.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* guncon.h:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_INPUT_GUNCON_H
 #define __MDFN_PSX_INPUT_GUNCON_H
 
diff --git a/psx/octoshock/psx/input/justifier.cpp b/psx/octoshock/psx/input/justifier.cpp
index 76f6ad2465..c4542e4a01 100644
--- a/psx/octoshock/psx/input/justifier.cpp
+++ b/psx/octoshock/psx/input/justifier.cpp
@@ -1,19 +1,23 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* justifier.cpp:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include "../psx.h"
 #include "../frontio.h"
diff --git a/psx/octoshock/psx/input/justifier.h b/psx/octoshock/psx/input/justifier.h
index a412f2748b..acd7d94469 100644
--- a/psx/octoshock/psx/input/justifier.h
+++ b/psx/octoshock/psx/input/justifier.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* justifier.h:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_INPUT_JUSTIFIER_H
 #define __MDFN_PSX_INPUT_JUSTIFIER_H
 
diff --git a/psx/octoshock/psx/input/memcard.cpp b/psx/octoshock/psx/input/memcard.cpp
index b98fa9de58..eb15e2aac8 100644
--- a/psx/octoshock/psx/input/memcard.cpp
+++ b/psx/octoshock/psx/input/memcard.cpp
@@ -1,19 +1,23 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* memcard.cpp:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 // I could find no other commands than 'R', 'W', and 'S' (not sure what 'S' is for, however)
 
diff --git a/psx/octoshock/psx/input/memcard.h b/psx/octoshock/psx/input/memcard.h
index 05627661c4..58dbc45d9d 100644
--- a/psx/octoshock/psx/input/memcard.h
+++ b/psx/octoshock/psx/input/memcard.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* memcard.h:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_INPUT_MEMCARD_H
 #define __MDFN_PSX_INPUT_MEMCARD_H
 
diff --git a/psx/octoshock/psx/input/mouse.cpp b/psx/octoshock/psx/input/mouse.cpp
index 9cb4a30efb..d7bb7179ce 100644
--- a/psx/octoshock/psx/input/mouse.cpp
+++ b/psx/octoshock/psx/input/mouse.cpp
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* mouse.cpp:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #include "../psx.h"
 #include "../frontio.h"
 #include "mouse.h"
diff --git a/psx/octoshock/psx/input/mouse.h b/psx/octoshock/psx/input/mouse.h
index d84dc5f9b2..71a7b9412b 100644
--- a/psx/octoshock/psx/input/mouse.h
+++ b/psx/octoshock/psx/input/mouse.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* mouse.h:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_INPUT_MOUSE_H
 #define __MDFN_PSX_INPUT_MOUSE_H
 
diff --git a/psx/octoshock/psx/input/multitap.cpp b/psx/octoshock/psx/input/multitap.cpp
index 2b66aa1b1b..6b5a825a6a 100644
--- a/psx/octoshock/psx/input/multitap.cpp
+++ b/psx/octoshock/psx/input/multitap.cpp
@@ -1,19 +1,23 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* multitap.cpp:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include <assert.h>
 #include "../psx.h"
diff --git a/psx/octoshock/psx/input/multitap.h b/psx/octoshock/psx/input/multitap.h
index f9467dfbac..b2a6491fd9 100644
--- a/psx/octoshock/psx/input/multitap.h
+++ b/psx/octoshock/psx/input/multitap.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* multitap.h:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_INPUT_MULTITAP_H
 #define __MDFN_PSX_INPUT_MULTITAP_H
 
diff --git a/psx/octoshock/psx/input/negcon.cpp b/psx/octoshock/psx/input/negcon.cpp
index 0ade32ec80..0187be427e 100644
--- a/psx/octoshock/psx/input/negcon.cpp
+++ b/psx/octoshock/psx/input/negcon.cpp
@@ -1,19 +1,23 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* negcon.cpp:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include "../psx.h"
 #include "../frontio.h"
diff --git a/psx/octoshock/psx/input/negcon.h b/psx/octoshock/psx/input/negcon.h
index 52425010e4..003396e0e3 100644
--- a/psx/octoshock/psx/input/negcon.h
+++ b/psx/octoshock/psx/input/negcon.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* negcon.h:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_INPUT_NEGCON_H
 #define __MDFN_PSX_INPUT_NEGCON_H
 
diff --git a/psx/octoshock/psx/irq.cpp b/psx/octoshock/psx/irq.cpp
index 0d7919cc00..9bd7237c6c 100644
--- a/psx/octoshock/psx/irq.cpp
+++ b/psx/octoshock/psx/irq.cpp
@@ -1,19 +1,23 @@
-/* Mednafen - Multi-system Emulator
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* irq.cpp:
+**  Copyright (C) 2011-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
 
 #include "psx.h"
 
diff --git a/psx/octoshock/psx/irq.h b/psx/octoshock/psx/irq.h
index d6f21f90e5..a9d74f459e 100644
--- a/psx/octoshock/psx/irq.h
+++ b/psx/octoshock/psx/irq.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* irq.h:
+**  Copyright (C) 2011-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_IRQ_H
 #define __MDFN_PSX_IRQ_H
 
diff --git a/psx/octoshock/psx/masmem.h b/psx/octoshock/psx/masmem.h
index 4f5ba08929..667f79a67e 100644
--- a/psx/octoshock/psx/masmem.h
+++ b/psx/octoshock/psx/masmem.h
@@ -1,3 +1,24 @@
+/******************************************************************************/
+/* Mednafen Sony PS1 Emulation Module                                         */
+/******************************************************************************/
+/* masmem.h:
+**  Copyright (C) 2012-2016 Mednafen Team
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License
+** as published by the Free Software Foundation; either version 2
+** of the License, or (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software Foundation, Inc.,
+** 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
 #ifndef __MDFN_PSX_MASMEM_H
 #define __MDFN_PSX_MASMEM_H